Ros-diffs September 2006

ros-diffs@reactos.org

16 participants
146 discussions

[greatlrd] 24316: adding back __readcr4 and __readcr3 to winddk.h for gcc does not have it. come bit futer build trunk
by greatlrd＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: greatlrd Date: Sat Sep 30 18:43:41 2006 New Revision: 24316 URL: http://svn.reactos.org/svn/reactos?rev=24316&view=rev Log: adding back __readcr4 and __readcr3 to winddk.h for gcc does not have it. come bit futer build trunk Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sat Sep 30 18:43:41 2006 @@ -35,6 +35,23 @@ /* Available as intrinsics on MSVC */ static __inline void _disable(void) {__asm__ __volatile__("cli\n");} static __inline void _enable(void) {__asm__ __volatile__("sti\n");} + + +static __inline ULONG64 __readcr3(void) +{ + ULONG_PTR Ret; + __asm__ __volatile__("movl %%cr3, %0;\n" + :"=r"(Ret)); + return (ULONG64)Ret; +} + +static __inline ULONG64 __readcr4(void) +{ + ULONG_PTR Ret; + __asm__ __volatile__("movl %%cr4, %0; \n" + :"=r"(Ret)); + return (ULONG64)Ret; +} #endif /*

1 0

[hyperion] 24315: Corrected DWORD operand typo (%l -> %k)
by hyperion＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: hyperion Date: Sat Sep 30 18:40:12 2006 New Revision: 24315 URL: http://svn.reactos.org/svn/reactos?rev=24315&view=rev Log: Corrected DWORD operand typo (%l -> %k) Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Sat Sep 30 18:40:12 2006 @@ -204,7 +204,7 @@ static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) { long retval = Comperand; - __asm__("lock; cmpxchgl %l[Exchange], %[Destination]" : "a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange): "memory"); + __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : "a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange): "memory"); return retval; } @@ -247,7 +247,7 @@ static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) { void * retval; - __asm__("lock; cmpxchgl %l[Exchange], %[Destination]" : "a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange), "a" (Comperand) : "memory"); + __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : "a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange), "a" (Comperand) : "memory"); return retval; } @@ -563,7 +563,7 @@ static __inline__ __attribute__((always_inline)) unsigned long __readfsdword(const unsigned long Offset) { unsigned long value; - __asm__("movl %%fs:%a[Offset], %l[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); + __asm__("movl %%fs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); return value; }

1 0

[weiden] 24314: Fix GCC4 warnings
by weiden＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: weiden Date: Sat Sep 30 15:54:37 2006 New Revision: 24314 URL: http://svn.reactos.org/svn/reactos?rev=24314&view=rev Log: Fix GCC4 warnings Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/enumdevices.c (original) +++ trunk/reactos/base/applications/devmgmt/enumdevices.c Sat Sep 30 15:54:37 2006 @@ -105,7 +105,7 @@ if (KeyClass != INVALID_HANDLE_VALUE) { - DWORD dwSize = MAX_CLASS_NAME_LEN; + LONG dwSize = MAX_CLASS_NAME_LEN; if (RegQueryValue(KeyClass, NULL, @@ -292,14 +292,14 @@ if (!TreeView_GetChild(Info->hTreeView, hDevItem)) { - TreeView_DeleteItem(Info->hTreeView, - hDevItem); + (void)TreeView_DeleteItem(Info->hTreeView, + hDevItem); } else { - TreeView_SortChildren(Info->hTreeView, - hDevItem, - 0); + (void)TreeView_SortChildren(Info->hTreeView, + hDevItem, + 0); } } @@ -307,13 +307,13 @@ } while (ClassRet != -1); - TreeView_Expand(Info->hTreeView, - hRoot, - TVE_EXPAND); - - TreeView_SortChildren(Info->hTreeView, + (void)TreeView_Expand(Info->hTreeView, hRoot, - 0); + TVE_EXPAND); + + (void)TreeView_SortChildren(Info->hTreeView, + hRoot, + 0); } @@ -326,7 +326,7 @@ DWORD dwSize = MAX_PATH; INT RootImage; - TreeView_DeleteAllItems(Info->hTreeView); + (void)TreeView_DeleteAllItems(Info->hTreeView); /* get the device image List */ ImageListData.cbSize = sizeof(ImageListData); @@ -341,9 +341,9 @@ DeleteObject(hComp); - TreeView_SetImageList(Info->hTreeView, - ImageListData.ImageList, - TVSIL_NORMAL); + (void)TreeView_SetImageList(Info->hTreeView, + ImageListData.ImageList, + TVSIL_NORMAL); if (!GetComputerName(ComputerName, &dwSize))

1 0

[greatlrd] 24313: hopply this will fix hal_xbox build not tested.
by greatlrd＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: greatlrd Date: Sat Sep 30 15:33:21 2006 New Revision: 24313 URL: http://svn.reactos.org/svn/reactos?rev=24313&view=rev Log: hopply this will fix hal_xbox build not tested. Modified: trunk/reactos/hal/halx86/xbox/display_xbox.c Modified: trunk/reactos/hal/halx86/xbox/display_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/display_xb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/display_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/display_xbox.c Sat Sep 30 15:33:21 2006 @@ -284,7 +284,7 @@ } VOID FASTCALL -HalInitializeDisplay (PROS_LOADER_PARAMETER_BLOCK LoaderBlock) +HalInitializeDisplay (PLOADER_PARAMETER_BLOCK LoaderBlock) /* * FUNCTION: Initalize the display * ARGUMENTS:

1 0

[greatlrd] 24312: fix build of blue again gcc does not have _disable and _enable, but MSVC have it.
by greatlrd＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: greatlrd Date: Sat Sep 30 14:52:41 2006 New Revision: 24312 URL: http://svn.reactos.org/svn/reactos?rev=24312&view=rev Log: fix build of blue again gcc does not have _disable and _enable, but MSVC have it. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sat Sep 30 14:52:41 2006 @@ -29,6 +29,12 @@ #ifdef __cplusplus extern "C" { +#endif + +#ifdef __GNUC__ +/* Available as intrinsics on MSVC */ +static __inline void _disable(void) {__asm__ __volatile__("cli\n");} +static __inline void _enable(void) {__asm__ __volatile__("sti\n");} #endif /*

1 0

[gedmurphy] 24311: implement refresh, although it runs at a snails pace until the multiple SetupDiGetClassDevs call issue is fixed
by gedmurphy＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: gedmurphy Date: Sat Sep 30 14:39:36 2006 New Revision: 24311 URL: http://svn.reactos.org/svn/reactos?rev=24311&view=rev Log: implement refresh, although it runs at a snails pace until the multiple SetupDiGetClassDevs call issue is fixed Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Sat Sep 30 14:39:36 2006 @@ -243,7 +243,9 @@ case IDC_REFRESH: { - // refresh treeview + HTREEITEM hRoot = InitTreeView(Info); + if (hRoot) + ListDevicesByType(Info, hRoot); } break;

1 0

[gedmurphy] 24310: stop icon from changing when selected. This change doesn't seem quite right to me, but it works for now
by gedmurphy＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: gedmurphy Date: Sat Sep 30 14:31:28 2006 New Revision: 24310 URL: http://svn.reactos.org/svn/reactos?rev=24310&view=rev Log: stop icon from changing when selected. This change doesn't seem quite right to me, but it works for now Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/enumdevices.c (original) +++ trunk/reactos/base/applications/devmgmt/enumdevices.c Sat Sep 30 14:31:28 2006 @@ -24,7 +24,7 @@ ZeroMemory(&tvi, sizeof(tvi)); ZeroMemory(&tvins, sizeof(tvins)); - tvi.mask = TVIF_TEXT | TVIF_IMAGE; + tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE; tvi.pszText = lpLabel; tvi.cchTextMax = lstrlen(lpLabel); tvi.iImage = DevImage;

1 0

[gedmurphy] 24309: add a line at the root of the tree for user ergonomics :)
by gedmurphy＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: gedmurphy Date: Sat Sep 30 14:18:04 2006 New Revision: 24309 URL: http://svn.reactos.org/svn/reactos?rev=24309&view=rev Log: add a line at the root of the tree for user ergonomics :) Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Sat Sep 30 14:18:04 2006 @@ -154,7 +154,7 @@ WC_TREEVIEW, NULL, WS_CHILD | WS_VISIBLE | WS_BORDER | - TVS_HASLINES | TVS_HASBUTTONS | TVS_SHOWSELALWAYS, + TVS_HASLINES | TVS_HASBUTTONS | TVS_SHOWSELALWAYS | TVS_LINESATROOT, 0, 0, 0, 0, Info->hMainWnd, (HMENU) IDC_TREEVIEW,

1 0

[ion] 24308: - Save processor state in the PKPRCB in KiInitializeKernel. - Set the booting CPU as idle if no next thread was scheduled. - Raise IRQL to HIGH_LEVEL upon exiting KiInitializeKernel to match the re-lowering to DISPATCH_LEVEL in KiSystemStartup (and subsequent interrupt flush).
by ion＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: ion Date: Sat Sep 30 11:04:49 2006 New Revision: 24308 URL: http://svn.reactos.org/svn/reactos?rev=24308&view=rev Log: - Save processor state in the PKPRCB in KiInitializeKernel. - Set the booting CPU as idle if no next thread was scheduled. - Raise IRQL to HIGH_LEVEL upon exiting KiInitializeKernel to match the re-lowering to DISPATCH_LEVEL in KiSystemStartup (and subsequent interrupt flush). Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/kiinit.c 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 (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Sat Sep 30 11:04:49 2006 @@ -65,6 +65,16 @@ ); VOID +NTAPI +KiSaveProcessorControlState( + IN PKPROCESSOR_STATE ProcessorState +); + +VOID +FASTCALL +KiIdleLoop(VOID); + +VOID KiGdtPrepareForApplicationProcessorInit(ULONG Id); VOID Ki386InitializeLdt(VOID); Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sat Sep 30 11:04:49 2006 @@ -14,10 +14,6 @@ #include <intrin.h> /* GLOBALS *******************************************************************/ - -VOID -FASTCALL -KiIdleLoop(VOID); /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; @@ -111,6 +107,9 @@ /* Save feature bits */ Prcb->FeatureBits = FeatureBits; + /* Save CPU state */ + KiSaveProcessorControlState(&Prcb->ProcessorState); + /* Get cache line information for this CPU */ KiGetCacheInformation(); @@ -226,10 +225,17 @@ /* Set the Idle Priority to 0. This will jump into Phase 1 */ KeSetPriorityThread(InitThread, 0); + + /* If there's no thread scheduled, put this CPU in the Idle summary */ + if (!Prcb->NextThread) KiIdleSummary |= 1 << Number; + + /* Raise back to HIGH_LEVEL and clear the PRCB for the loader block */ + KfRaiseIrql(HIGH_LEVEL); + LoaderBlock->Prcb = 0; } VOID -NTAPI +FASTCALL KiGetMachineBootPointers(IN PKGDTENTRY *Gdt, IN PKIDTENTRY *Idt, IN PKIPCR *Pcr,

1 0

[ion] 24307: - Add loop around the KiFreezeExecutionLock before continuing OS boot. - Only check for break-in on the Boot CPU. - Set priority to 0 *Before* lowering to DISPATCH_LEVEL. - Also force interrupts to be enabled before lowering IRQL. - Also set the idle thread's wait irql to DISPATCH_LEVEL (might fix some odd crashes) and set it as Running on UP builds (on SMP builds this is done in other code).
by ion＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: ion Date: Sat Sep 30 10:18:45 2006 New Revision: 24307 URL: http://svn.reactos.org/svn/reactos?rev=24307&view=rev Log: - Add loop around the KiFreezeExecutionLock before continuing OS boot. - Only check for break-in on the Boot CPU. - Set priority to 0 *Before* lowering to DISPATCH_LEVEL. - Also force interrupts to be enabled before lowering IRQL. - Also set the idle thread's wait irql to DISPATCH_LEVEL (might fix some odd crashes) and set it as Running on UP builds (on SMP builds this is done in other code). Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sat Sep 30 10:18:45 2006 @@ -335,8 +335,15 @@ Ke386SetDs(KGDT_R3_DATA | RPL_MASK); Ke386SetEs(KGDT_R3_DATA | RPL_MASK); +AppCpuInit: + /* Loop until we can release the freeze lock */ + do + { + /* Loop until execution can continue */ + while (KiFreezeExecutionLock == 1); + } while(InterlockedBitTestAndSet(&KiFreezeExecutionLock, 0)); + /* Setup CPU-related fields */ -AppCpuInit: __writefsdword(KPCR_NUMBER, Cpu); __writefsdword(KPCR_SET_MEMBER, 1 << Cpu); __writefsdword(KPCR_SET_MEMBER_COPY, 1 << Cpu); @@ -349,11 +356,15 @@ KeActiveProcessors |= Pcr->SetMember; KeNumberProcessors++; - /* Initialize the Debugger for the Boot CPU */ - if (!Cpu) KdInitSystem (0, KeLoaderBlock); - - /* Check for break-in */ - if (KdPollBreakIn()) DbgBreakPointWithStatus(1); + /* Check if this is the boot CPU */ + if (!Cpu) + { + /* Initialize debugging system */ + KdInitSystem (0, KeLoaderBlock); + + /* Check for break-in */ + if (KdPollBreakIn()) DbgBreakPointWithStatus(1); + } /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); @@ -366,11 +377,20 @@ Cpu, LoaderBlock); - /* Lower IRQL back to DISPATCH_LEVEL */ - KfLowerIrql(DISPATCH_LEVEL); - /* Set the priority of this thread to 0 */ KeGetCurrentThread()->Priority = 0; + + /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ + _enable(); + KfLowerIrql(DISPATCH_LEVEL); + + /* Set the right wait IRQL */ + KeGetCurrentThread()->WaitIrql = DISPATCH_LEVEL; + + /* Set idle thread as running on UP builds */ +#ifndef CONFIG_SMP + KeGetCurrentThread()->State = Running; +#endif /* Jump into the idle loop */ KiIdleLoop();

1 0

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 September 2006