Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 25807: Merge 25805.
by fireball＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: fireball Date: Thu Feb 15 21:24:19 2007 New Revision: 25807 URL: http://svn.reactos.org/svn/reactos?rev=25807&view=rev Log: Merge 25805. Modified: branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf Modified: branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/media/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf (original) +++ branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf Thu Feb 15 21:24:19 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 02/15/2001,1.02 [DestinationDirs] DefaultDestDir = 12 @@ -27,6 +27,7 @@ CopyFiles = PCNet_CopyFiles.NT [PCNet_AddReg.NT] +HKR,,Characteristics,0x00010001,0x0000000 HKR,,BUS_TO_SCAN,,"ALL" HKR,,BUSTIMER,,"0" HKR,,BUSTYPE,,"5" Modified: branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/media/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf (original) +++ branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf Thu Feb 15 21:24:19 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 02/15/2007,1.01.0.0 [DestinationDirs] DefaultDestDir = 12 @@ -27,6 +27,7 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] +HKR,,Characteristics,0x00010001,0x0000000 HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" HKR,,NetworkAddress,0x00000000,"001122334455"

1 0

[ion] 25806: - Small placeholder change for future Cm code: - Added newcm.c which will contain some new Cm code part of the Cm Rewrite but not in the rewrite branch (used solely for supporting CmGetSystemControlValues). - Added System Control Vector which supports all the registry flags that Windows 2003 SP1 supports as well. - The most important part of this support, at least for us, is to get boot-time time zone support working properly. We can worry about the other options later. - Update Krn
by ion＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: ion Date: Thu Feb 15 20:44:04 2007 New Revision: 25806 URL: http://svn.reactos.org/svn/reactos?rev=25806&view=rev Log: - Small placeholder change for future Cm code: - Added newcm.c which will contain some new Cm code part of the Cm Rewrite but not in the rewrite branch (used solely for supporting CmGetSystemControlValues). - Added System Control Vector which supports all the registry flags that Windows 2003 SP1 supports as well. - The most important part of this support, at least for us, is to get boot-time time zone support working properly. We can worry about the other options later. - Update KrnlFun for previous DPC/HAL fixes. Added: trunk/reactos/ntoskrnl/cm/cmdata.c trunk/reactos/ntoskrnl/cm/newcm.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=258… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Feb 15 20:44:04 2007 @@ -9,12 +9,10 @@ // Failure to respect this will *ACHIEVE NOTHING*. // // Hal: -// - Use APC and DPC Interrupt Dispatchers. // - CMOS Initialization and CMOS Spinlock. // // Global: // - TODO: Complete the list of bufxies -// - Fix DPCs interrupting code at DISPATCH_LEVEL // - Fix atapi.sys or serial.sys loading one more time at each boot. // /////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=25806… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Thu Feb 15 20:44:04 2007 @@ -447,4 +447,24 @@ #define ObGetObjectPointerCount(x) OBJECT_TO_OBJECT_HEADER(x)->PointerCount #define ObGetObjectHandleCount(x) OBJECT_TO_OBJECT_HEADER(x)->HandleCount +// +// System Control Vector +// +typedef struct _CM_SYSTEM_CONTROL_VECTOR +{ + PWCHAR KeyPath; + PWCHAR ValueName; + PVOID Buffer; + PULONG BufferLength; + PULONG Type; +} CM_SYSTEM_CONTROL_VECTOR, *PCM_SYSTEM_CONTROL_VECTOR; + +VOID +NTAPI +CmGetSystemControlValues( + IN PVOID SystemHiveData, + IN PCM_SYSTEM_CONTROL_VECTOR ControlVector +); + +extern CM_SYSTEM_CONTROL_VECTOR CmControlVector[]; #endif /*__INCLUDE_CM_H*/ Added: trunk/reactos/ntoskrnl/cm/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cmdata.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cmdata.c (added) +++ trunk/reactos/ntoskrnl/cm/cmdata.c Thu Feb 15 20:44:04 2007 @@ -1,0 +1,710 @@ +#include "ntoskrnl.h" +#include "cm.h" + +/* SYSTEM CONFIGURATION VECTOR ***********************************************/ + +ULONG DummyData; +ULONG CmNtGlobalFlag; +ULONG CmNtCSDVersion; + +WCHAR CmDefaultLanguageId[12]; +ULONG CmDefaultLanguageIdLength = sizeof(CmDefaultLanguageId); +ULONG CmDefaultLanguageIdType; + +WCHAR CmInstallUILanguageId[12]; +ULONG CmInstallUILanguageIdLength = sizeof(CmInstallUILanguageId); +ULONG CmInstallUILanguageIdType; + +WCHAR CmSuiteBuffer[128]; +ULONG CmSuiteBufferLength = sizeof(CmSuiteBuffer); +ULONG CmSuiteBufferType; + +extern LANGID PsInstallUILanguageId; +extern LANGID PsDefaultUILanguageId; + +//CMHIVE CmControlHive; + +CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = +{ + { + L"Session Manager", + L"ProtectionMode", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"ObjectSecurityMode", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"LUIDDeviceMapsDisabled", + &DummyData, + NULL, + NULL + }, + + { + L"LSA", + L"AuditBaseDirectories", + &DummyData, + NULL, + NULL + }, + + { + L"LSA", + L"AuditBaseObjects", + &DummyData, + NULL, + NULL + }, + + { + L"LSA\\audit", + L"ProcessAccessesToAudit", + &DummyData, + NULL, + NULL + }, + + { + L"TimeZoneInformation", + L"ActiveTimeBias", + &DummyData, + NULL, + NULL + }, + + { + L"TimeZoneInformation", + L"Bias", + &DummyData, + NULL, + NULL + }, + + { + L"TimeZoneInformation", + L"RealTimeIsUniversal", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"GlobalFlag", + &CmNtGlobalFlag, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PagedPoolQuota", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"NonPagedPoolQuota", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PagingFileQuota", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"AllocationPreference", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"DynamicMemory", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"Mirroring", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"Mirroring", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SystemViewSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SessionViewSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SessionImageSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SessionPoolSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolUsageMaximum", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"MapAllocationFragment", + &DummyData, + NULL, + NULL + }, + +{ + L"Session Manager\\Memory Management", + L"PagedPoolSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"NonPagedPoolSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"NonPagedPoolMaximumPercent", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LargeSystemCache", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LargeStackSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SystemPages", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LowMemoryThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"HighMemoryThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"DisablePagingExecutive", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"ModifiedPageLife", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SecondLevelDataCache", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"ClearPageFileAtShutdown", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTagSmallTableSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTagBigTableSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTag", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTagOverruns", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SnapUnloads", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"ProtectNonPagedPool", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"TrackLockedPages", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"TrackPtes", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"VerifyDrivers", + &DummyData, + &DummyData, + &DummyData + }, + + { + L"Session Manager\\Memory Management", + L"VerifyDriverLevel", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"VerifyMode", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LargePageMinimum", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"EnforceWriteProtection", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"MakeLowMemory", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"WriteWatch", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"AdditionalCriticalWorkerThreads", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"AdditionalDelayedWorkerThreads", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"PriorityQuantumMatrix", + &DummyData, + &DummyData, + NULL + }, + + { + L"Session Manager\\Kernel", + L"DpcQueueDepth", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Kernel", + L"MinimumDpcRate", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Kernel", + L"AdjustDpcThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Kernel", + L"IdealDpcRate", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\I/O System", + L"CountOperations", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\I/O System", + L"LargeIrpStackLocations", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\I/O System", + L"IoVerifierLevel", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"ResourceTimeoutCount", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"CriticalSectionTimeout", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapSegmentReserve", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapSegmentCommit", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapDeCommitTotalFreeThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapDeCommitFreeBlockThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"ProductOptions", + L"ProductType", + &DummyData, + NULL, + NULL + }, + + { + L"Terminal Server", + L"TSEnabled", + &DummyData, + NULL, + NULL + }, + + { + L"Terminal Server", + L"TSAppCompat", + &DummyData, + NULL, + NULL + }, + + + { + L"ProductOptions", + L"ProductSuite", + CmSuiteBuffer, + &CmSuiteBufferLength, + &CmSuiteBufferType + }, + + { + L"Windows", + L"CSDVersion", + &CmNtCSDVersion, + NULL, + NULL + }, + + { + L"Nls\\Language", + L"Default", + CmDefaultLanguageId, + &CmDefaultLanguageIdLength, + &CmDefaultLanguageIdType + }, + + { + L"Nls\\Language", + L"InstallLanguage", + CmInstallUILanguageId, + &CmInstallUILanguageIdLength, + &CmInstallUILanguageIdType + }, + + { + L"\0\0", + L"RegistrySizeLimit", + &DummyData, + &DummyData, + &DummyData + }, + + { + L"Session Manager", + L"ForceNpxEmulation", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"PowerPolicySimulate", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"MaxTimeSeparationBeforeCorrect", + &DummyData, + NULL, + NULL + }, + + { + L"Windows", + L"ShutdownTime", + &DummyData, + &DummyData, + NULL + }, + + { + L"PriorityControl", + L"Win32PrioritySeparation", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"EnableTimerWatchdog", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"Debugger Retries", + &DummyData, + NULL, + NULL + }, + + { + L"WMI", + L"MaxEventSize", + &DummyData, + NULL, + NULL + }, + + { + L"WMI\\Trace", + L"UsePerformanceClock", + &DummyData, + NULL, + NULL + }, + + { + L"WMI\\Trace", + L"TraceAlignment", + &DummyData, + NULL, + NULL + }, + + { + NULL, + NULL, + NULL, + NULL, + NULL +} +}; + Added: trunk/reactos/ntoskrnl/cm/newcm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/newcm.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/cm/newcm.c (added) +++ trunk/reactos/ntoskrnl/cm/newcm.c Thu Feb 15 20:44:04 2007 @@ -1,0 +1,12 @@ +#include "ntoskrnl.h" +#include "cm.h" +#include "debug.h" + +VOID +NTAPI +CmGetSystemControlValues(IN PVOID SystemHiveData, + IN PCM_SYSTEM_CONTROL_VECTOR ControlVector) +{ + return; +} + Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=258… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Feb 15 20:44:04 2007 @@ -11,7 +11,9 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> +//#include <ntoskrnl/cm/newcm.h> +#include "ntoskrnl/cm/cm.h" /* DATA **********************************************************************/ @@ -889,7 +891,7 @@ KiInitializeBugCheck(); /* Setup initial system settings (FIXME: Needs Cm Rewrite) */ - //CmGetSystemControlValues(CommandLine, &CmControlVector); + CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector); /* Initialize the executive at phase 0 */ if (!ExInitSystem()) KEBUGCHECK(PHASE0_INITIALIZATION_FAILED); Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu Feb 15 20:44:04 2007 @@ -86,6 +86,8 @@ <file>regfile.c</file> <file>registry.c</file> <file>regobj.c</file> + <file>newcm.c</file> + <file>cmdata.c</file> </directory> <directory name="kdbg"> <if property="ARCH" value="i386">

1 0

[hpoussin] 25805: Add missing 'Characterists' registry key for netcards. Fixes part of bug 2034
by hpoussin＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: hpoussin Date: Thu Feb 15 20:34:26 2007 New Revision: 25805 URL: http://svn.reactos.org/svn/reactos?rev=25805&view=rev Log: Add missing 'Characterists' registry key for netcards. Fixes part of bug 2034 Modified: trunk/reactos/media/inf/netamd.inf trunk/reactos/media/inf/netisa.inf Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netamd.inf (original) +++ trunk/reactos/media/inf/netamd.inf Thu Feb 15 20:34:26 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 02/15/2001,1.02 [DestinationDirs] DefaultDestDir = 12 @@ -27,6 +27,7 @@ CopyFiles = PCNet_CopyFiles.NT [PCNet_AddReg.NT] +HKR,,Characteristics,0x00010001,0x0000000 HKR,,BUS_TO_SCAN,,"ALL" HKR,,BUSTIMER,,"0" HKR,,BUSTYPE,,"5" Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netisa.inf (original) +++ trunk/reactos/media/inf/netisa.inf Thu Feb 15 20:34:26 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 02/15/2007,1.01.0.0 [DestinationDirs] DefaultDestDir = 12 @@ -27,6 +27,7 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] +HKR,,Characteristics,0x00010001,0x0000000 HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" HKR,,NetworkAddress,0x00000000,"001122334455"

1 0

[ekohl] 25804: - Enable/disable the size updown control when another window item is selected. - Remove the text when the size edit control gets disabled. - Disable the secondary color for the window item.
by ekohl＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: ekohl Date: Thu Feb 15 17:12:36 2007 New Revision: 25804 URL: http://svn.reactos.org/svn/reactos?rev=25804&view=rev Log: - Enable/disable the size updown control when another window item is selected. - Remove the text when the size edit control gets disabled. - Disable the secondary color for the window item. Modified: trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/appearance.c Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c Thu Feb 15 17:12:36 2007 @@ -309,6 +309,7 @@ /* First enable / disable the controls */ EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E), (g_Assignment[iElement].Size != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD), (g_Assignment[iElement].Size != -1)); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_T), (g_Assignment[iElement].Size != -1)); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_T), (g_Assignment[iElement].Color1 != -1)); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_T), (g_Assignment[iElement].Color2 != -1)); @@ -325,7 +326,10 @@ UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_B, 1, g_Assignment[iElement].Color2); UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_FONTCOLOR_B, 2, g_Assignment[iElement].FontColor); - SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, g_Assignment[iElement].Size == -1 ? 0 : g->ThemeAdv.Size[g_Assignment[iElement].Size], FALSE); + if (g_Assignment[iElement].Size != -1) + SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, g->ThemeAdv.Size[g_Assignment[iElement].Size], FALSE); + else + SetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, TEXT("")); HDC hdcDlg = GetDC(hwndDlg); if (g_Assignment[iElement].Font != -1) Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c (original) +++ trunk/reactos/dll/cpl/desk/appearance.c Thu Feb 15 17:12:36 2007 @@ -25,7 +25,7 @@ {SIZE_BORDER_X, SIZE_BORDER_Y, COLOR_ACTIVEBORDER, -1, -1, -1}, /* active window border */ {SIZE_MENU_X, SIZE_MENU_Y, COLOR_MENU, -1, FONT_MENU, COLOR_MENUTEXT}, /* menu */ {SIZE_MENU_X, SIZE_MENU_Y, COLOR_HIGHLIGHT, -1, FONT_HILIGHT, COLOR_HIGHLIGHTTEXT},/* marked element */ - {-1, -1, COLOR_WINDOW, COLOR_WINDOWFRAME, -1, COLOR_WINDOWTEXT}, /* window */ + {-1, -1, COLOR_WINDOW, -1 /*COLOR_WINDOWFRAME*/, -1, COLOR_WINDOWTEXT}, /* window */ {SIZE_SCROLL_X, SIZE_SCROLL_Y, COLOR_SCROLLBAR, -1, -1, -1}, /* scroll bar */ {-1, -1, COLOR_3DFACE, -1, -1, COLOR_BTNTEXT}, /* 3d objects */ {SIZE_SMCAPTION_Y,-1, -1, -1, FONT_SMCAPTION, -1}, /* palette window caption */

1 0

[dgorbachev] 25803: - fix "keyboard does not respond" bug on Biostar board (thanks to Peter Krawies) - fix printf()
by dgorbachev＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: dgorbachev Date: Thu Feb 15 13:57:38 2007 New Revision: 25803 URL: http://svn.reactos.org/svn/reactos?rev=25803&view=rev Log: - fix "keyboard does not respond" bug on Biostar board (thanks to Peter Krawies) - fix printf() Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/ui/tui.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 (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Thu Feb 15 13:57:38 2007 @@ -1621,58 +1621,69 @@ { UCHAR Status; UCHAR Scancode; - + ULONG Loops; + BOOLEAN Result = TRUE; + + /* Identify device */ WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA, 0xF2); - StallExecutionProcessor(10000); - - Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); - if ((Status & 0x01) != 0x01) + /* Wait for reply */ + for (Loops = 0; Loops < 100; Loops++) + { + StallExecutionProcessor(10000); + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) != 0) + break; + } + + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0) { /* PC/XT keyboard or no keyboard */ - return FALSE; + Result = FALSE; } Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0xFA) { /* No ACK received */ - return FALSE; + Result = FALSE; } StallExecutionProcessor(10000); + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); - if ((Status & 0x01) != 0x01) + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0) { /* Found AT keyboard */ - return TRUE; + return Result; } Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0xAB) { /* No 0xAB received */ - return FALSE; + Result = FALSE; } StallExecutionProcessor(10000); + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); - if ((Status & 0x01) != 0x01) + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0) { /* No byte in buffer */ - return FALSE; + Result = FALSE; } Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0x41) { /* No 0x41 received */ - return FALSE; + Result = FALSE; } /* Found MF-II keyboard */ - return TRUE; + return Result; } @@ -1880,7 +1891,6 @@ DetectPS2AuxPort(VOID) { ULONG Loops; - UCHAR Scancode; UCHAR Status; /* Put the value 0x5A in the output buffer using the @@ -1901,22 +1911,15 @@ for (Loops = 0; Loops < 10; Loops++) { + StallExecutionProcessor(10000); Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); - if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) != 0) - { - Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); - if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) != 0) - { - return TRUE; - } - break; - } - - StallExecutionProcessor(10000); - } - - return FALSE; + break; + } + + READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); + + return (Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL); } @@ -1938,7 +1941,7 @@ 0xF2); /* Wait for reply */ - for (Loops = 0; Loops < 10; Loops++) + for (Loops = 0; Loops < 100; Loops++) { StallExecutionProcessor(10000); Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); @@ -1963,15 +1966,6 @@ Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0x00) Result = FALSE; - - /* Flush output buffer */ - for (Loops = 0; Loops < 10; Loops++) - { - Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); - if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0) - break; - StallExecutionProcessor(10000); - } return Result; } Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c Thu Feb 15 13:57:38 2007 @@ -45,9 +45,9 @@ { case 'd': case 'u': case 'x': if (c == 'x') - *_itoa(va_arg(ap, unsigned long), str, 16) = 0; + _itoa(va_arg(ap, unsigned long), str, 16); else - *_itoa(va_arg(ap, unsigned long), str, 10) = 0; + _itoa(va_arg(ap, unsigned long), str, 10); ptr = str;

1 0

[ion] 25802: - You all s^H^H^H^H^H^H^H^H^H Fix build error.
by ion＠svn.reactos.org 14 Feb '07

14 Feb '07

Author: ion Date: Wed Feb 14 23:50:46 2007 New Revision: 25802 URL: http://svn.reactos.org/svn/reactos?rev=25802&view=rev Log: - You all s^H^H^H^H^H^H^H^H^H Fix build error. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Wed Feb 14 23:50:46 2007 @@ -932,7 +932,7 @@ * Now boot the kernel */ DiskStopFloppyMotor(); - MachVideoPrepareForReactOS(FrLdrBootType); + MachVideoPrepareForReactOS(FALSE); FrLdrStartup(0x2badb002); } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Wed Feb 14 23:50:46 2007 @@ -633,7 +633,7 @@ /* Now boot the kernel */ DiskStopFloppyMotor(); - MachVideoPrepareForReactOS(); + MachVideoPrepareForReactOS(TRUE); FrLdrStartup(0x2badb002); }

1 0

[ion] 25801: - Linux sucks
by ion＠svn.reactos.org 14 Feb '07

14 Feb '07

Author: ion Date: Wed Feb 14 23:47:43 2007 New Revision: 25801 URL: http://svn.reactos.org/svn/reactos?rev=25801&view=rev Log: - Linux sucks Modified: trunk/reactos/hal/halx86/generic/generic.rbuild Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Wed Feb 14 23:47:43 2007 @@ -25,7 +25,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <define name="__USE_W32API" /> - <file>irq.s</file> + <file>irq.S</file> <file>halinit.c</file> <file>processor.c</file> <file>spinlock.c</file>

1 0

[ion] 25800: - Fixup and enable my new HAL IRQL implementation from a couple of months ago, and remove the temporary Mm hacks from Dmitry Gorbachev, since DPCs don't interrupt DISPATCH_LEVEL Code anymore. - This fixes a critical system malfunction and architectural bug, as well as speeds up ReactOS incredibly -- setup takes seconds again, and boot is almost instantenous (except the Explorer loading bug). - Proper fix for bootvid regression that Aleksey "Fixed". Video mode is now properly setup w
by ion＠svn.reactos.org 14 Feb '07

14 Feb '07

Author: ion Date: Wed Feb 14 23:30:33 2007 New Revision: 25800 URL: http://svn.reactos.org/svn/reactos?rev=25800&view=rev Log: - Fixup and enable my new HAL IRQL implementation from a couple of months ago, and remove the temporary Mm hacks from Dmitry Gorbachev, since DPCs don't interrupt DISPATCH_LEVEL Code anymore. - This fixes a critical system malfunction and architectural bug, as well as speeds up ReactOS incredibly -- setup takes seconds again, and boot is almost instantenous (except the Explorer loading bug). - Proper fix for bootvid regression that Aleksey "Fixed". Video mode is now properly setup wether in setup or non-setup mode, so bootvid works again. - Enable bootvid in freeldr.ini, currently using only /SOS mode since full-screen logo isn't implemented yet. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mdl.c trunk/reactos/ntoskrnl/mm/npool.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/pageop.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c (original) +++ trunk/reactos/base/setup/usetup/bootsup.c Wed Feb 14 23:30:33 2007 @@ -398,6 +398,13 @@ L"SystemPath", ArcPath); + /* Options=/SOS*/ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"Options", + L"/SOS"); + /* Create "ReactOS_Debug" section */ IniSection = IniCacheAppendSection(IniCache, L"ReactOS_Debug"); @@ -421,7 +428,7 @@ NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=COM1 /NOGUIBOOT /SOS"); + L"/DEBUGPORT=COM1 /SOS"); /* Save the ini file */ IniCacheSave(IniCache, IniPath); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Wed Feb 14 23:30:33 2007 @@ -1106,9 +1106,16 @@ } VOID -PcVideoPrepareForReactOS(VOID) -{ - PcVideoSetMode80x50_80x43(); +PcVideoPrepareForReactOS(IN BOOLEAN Setup) +{ + if (Setup) + { + PcVideoSetMode80x50_80x43(); + } + else + { + PcVideoSetBiosMode(0x12); + } PcVideoHideShowTextCursor(FALSE); } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c Wed Feb 14 23:30:33 2007 @@ -234,7 +234,7 @@ } VOID -XboxVideoPrepareForReactOS(VOID) +XboxVideoPrepareForReactOS(IN BOOLEAN Setup) { XboxVideoClearScreenColor(MAKE_COLOR(0, 0, 0), TRUE); } Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h Wed Feb 14 23:30:33 2007 @@ -44,7 +44,7 @@ VOID PcVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID PcVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID PcVideoSync(VOID); -VOID PcVideoPrepareForReactOS(VOID); +VOID PcVideoPrepareForReactOS(IN BOOLEAN Setup); ULONG PcMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h Wed Feb 14 23:30:33 2007 @@ -45,7 +45,7 @@ VOID XboxVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID XboxVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID XboxVideoSync(VOID); -VOID XboxVideoPrepareForReactOS(VOID); +VOID XboxVideoPrepareForReactOS(IN BOOLEAN Setup); VOID XboxMemInit(VOID); PVOID XboxMemReserveMemory(ULONG MbToReserve); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h Wed Feb 14 23:30:33 2007 @@ -52,7 +52,7 @@ VOID (*VideoSetPaletteColor)(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID (*VideoGetPaletteColor)(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID (*VideoSync)(VOID); - VOID (*VideoPrepareForReactOS)(VOID); + VOID (*VideoPrepareForReactOS)(IN BOOLEAN Setup); ULONG (*GetMemoryMap)(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); @@ -91,7 +91,7 @@ VOID MachVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID MachVideoGetPaletteColor(UCHAR Color, UCHAR *Red, UCHAR *Green, UCHAR *Blue); VOID MachVideoSync(VOID); -VOID MachVideoPrepareForReactOS(VOID); +VOID MachVideoPrepareForReactOS(IN BOOLEAN Setup); ULONG MachGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); BOOLEAN MachDiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); BOOLEAN @@ -128,7 +128,7 @@ #define MachVideoSetPaletteColor(Col, R, G, B) MachVtbl.VideoSetPaletteColor((Col), (R), (G), (B)) #define MachVideoGetPaletteColor(Col, R, G, B) MachVtbl.VideoGetPaletteColor((Col), (R), (G), (B)) #define MachVideoSync() MachVtbl.VideoSync() -#define MachVideoPrepareForReactOS() MachVtbl.VideoPrepareForReactOS() +#define MachVideoPrepareForReactOS(a) MachVtbl.VideoPrepareForReactOS(a) #define MachGetMemoryMap(MMap, Size) MachVtbl.GetMemoryMap((MMap), (Size)) #define MachDiskGetBootVolume(Drv, Start, Cnt, FsType) MachVtbl.DiskGetBootVolume((Drv), (Start), (Cnt), (FsType)) #define MachDiskGetSystemVolume(SysPath, RemPath, Dev, Drv, Start, Cnt, FsType) MachVtbl.DiskGetSystemVolume((SysPath), (RemPath), (Dev), (Drv), (Start), (Cnt), (FsType)) Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c Wed Feb 14 23:30:33 2007 @@ -142,9 +142,9 @@ } VOID -MachVideoPrepareForReactOS(VOID) -{ - MachVtbl.VideoPrepareForReactOS(); +MachVideoPrepareForReactOS(IN BOOLEAN Setup) +{ + MachVtbl.VideoPrepareForReactOS(Setup); } ULONG Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Wed Feb 14 23:30:33 2007 @@ -932,7 +932,7 @@ * Now boot the kernel */ DiskStopFloppyMotor(); - MachVideoPrepareForReactOS(); + MachVideoPrepareForReactOS(FrLdrBootType); FrLdrStartup(0x2badb002); } Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Wed Feb 14 23:30:33 2007 @@ -25,7 +25,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <define name="__USE_W32API" /> - <file>irql.c</file> + <file>irq.s</file> <file>halinit.c</file> <file>processor.c</file> <file>spinlock.c</file> Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Feb 14 23:30:33 2007 @@ -282,7 +282,7 @@ and PCR[KPCR_IDR], eax /* Get the current IRQL and mask the IRQs in the PIC */ - movzx eax, byte ptr PCR[KPCR_IRQL] + mov eax, PCR[KPCR_IRQL] mov eax, KiI8259MaskTable[eax*4] or eax, PCR[KPCR_IDR] out 0x21, al @@ -309,9 +309,9 @@ _HalBeginSystemInterrupt@12: /* Convert to IRQ and call the handler */ - movzx edx, byte ptr [esp+8] - sub edx, PRIMARY_VECTOR_BASE - jmp HalpSysIntHandler[edx*4] + movzx ebx, byte ptr [esp+8] + sub ebx, PRIMARY_VECTOR_BASE + jmp HalpSysIntHandler[ebx*4] IRQ15: /* This is IRQ 15, check if it's spurious */ @@ -344,12 +344,12 @@ GenericIRQ: /* Return the current IRQL */ mov eax, [esp+12] - movzx ecx, byte ptr PCR[KPCR_IRQL] + mov ecx, PCR[KPCR_IRQL] mov [eax], cl /* Set the new IRQL */ movzx eax, byte ptr [esp+4] - mov PCR[KPCR_IRQL], al + mov PCR[KPCR_IRQL], eax /* Set IRQ mask in the PIC */ mov eax, KiI8259MaskTable[eax*4] @@ -359,7 +359,7 @@ out 0xA1, al /* Check to which PIC the EOI was sent */ - mov eax, edx + mov eax, ebx cmp eax, 8 jnb Pic1 @@ -396,7 +396,7 @@ /* Get the IRQL and check if it's a software interrupt */ movzx ecx, byte ptr [esp+4] - cmp byte ptr PCR[KPCR_IRQL], DISPATCH_LEVEL + cmp dword ptr PCR[KPCR_IRQL], DISPATCH_LEVEL jbe SkipMask2 /* Hardware interrupt, mask the appropriate IRQs in the PIC */ @@ -409,7 +409,7 @@ SkipMask2: /* Set IRQL and check if there are pending software interrupts */ - mov PCR[KPCR_IRQL], cl + mov PCR[KPCR_IRQL], ecx mov eax, PCR[KPCR_IRR] mov al, SoftIntByteTable[eax] cmp al, cl @@ -439,7 +439,7 @@ #endif /* Disable interrupts and check if IRQL is below DISPATCH_LEVEL */ - cmp byte ptr PCR[KPCR_IRQL], DISPATCH_LEVEL + cmp dword ptr PCR[KPCR_IRQL], DISPATCH_LEVEL cli jbe SkipMask @@ -453,7 +453,7 @@ SkipMask: /* Set the new IRQL and check if there's a pending software interrupt */ - mov PCR[KPCR_IRQL], cl + mov PCR[KPCR_IRQL], ecx mov eax, PCR[KPCR_IRR] mov al, SoftIntByteTable[eax] cmp al, cl @@ -466,8 +466,8 @@ #if DBG InvalidIrql: /* Set HIGH_LEVEL */ - movzx eax, byte ptr PCR[KPCR_IRQL] - mov byte ptr PCR[KPCR_IRQL], HIGH_LEVEL + mov eax, PCR[KPCR_IRQL] + mov dword ptr PCR[KPCR_IRQL], HIGH_LEVEL /* Bugcheck the system */ push 3 @@ -493,8 +493,7 @@ @KfRaiseIrql@4: /* Get the IRQL */ - xor eax, eax - mov al, PCR[KPCR_IRQL] + mov eax, PCR[KPCR_IRQL] movzx ecx, cl #if DBG @@ -532,13 +531,13 @@ SetIrql: /* Set the IRQL and return */ - mov PCR[KPCR_IRQL], cl + mov PCR[KPCR_IRQL], ecx ret #if DBG InvalidKfRaise: /* Set to passive */ - mov byte ptr PCR[KPCR_IRQL], PASSIVE_LEVEL + mov dword ptr PCR[KPCR_IRQL], PASSIVE_LEVEL /* Bugcheck the system */ push 9 @@ -555,7 +554,7 @@ _KeGetCurrentIrql@0: /* Return the IRQL */ - movzx eax, byte ptr PCR[KPCR_IRQL] + mov eax, PCR[KPCR_IRQL] ret .endfunc @@ -564,15 +563,14 @@ _KeRaiseIrqlToDpcLevel@0: /* Get the current IRQL */ - xor eax, eax - mov al, PCR[KPCR_IRQL] + mov eax, PCR[KPCR_IRQL] /* Set DISPATCH_LEVEL */ - mov byte ptr PCR[KPCR_IRQL], DISPATCH_LEVEL + mov dword ptr PCR[KPCR_IRQL], DISPATCH_LEVEL #if DBG /* Make sure we were not higher then dispatch */ - cmp al, DISPATCH_LEVEL + cmp eax, DISPATCH_LEVEL ja InvalidRaise #endif ret @@ -605,13 +603,13 @@ out 0xA1, al /* Return the old IRQL, enable interrupts and set to DISPATCH */ - mov al, PCR[KPCR_IRQL] - mov byte ptr PCR[KPCR_IRQL], DISPATCH_LEVEL + mov eax, PCR[KPCR_IRQL] + mov dword ptr PCR[KPCR_IRQL], DISPATCH_LEVEL popf #if DBG /* Validate raise */ - cmp al, DISPATCH_LEVEL + cmp eax, DISPATCH_LEVEL ja InvalidSyRaise #endif @@ -632,6 +630,8 @@ .globl _HalpApcInterrupt .func HalpApcInterrupt +Dr_hapc: DR_TRAP_FIXUP +V86_hapc: V86_TRAP_FIXUP _HalpApcInterrupt: /* Create fake interrupt stack */ @@ -679,6 +679,8 @@ .globl _HalpDispatchInterrupt .func HalpDispatchInterrupt +Dr_hdpc: DR_TRAP_FIXUP +V86_hdpc: V86_TRAP_FIXUP _HalpDispatchInterrupt: /* Create fake interrupt stack */ @@ -688,7 +690,7 @@ push eax /* Enter interrupt */ - INT_PROLOG hapc, DoPushFakeErrorCode + INT_PROLOG hdpc, DoPushFakeErrorCode .endfunc .globl _HalpDispatchInterrupt2ndEntry 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 (original) +++ trunk/reactos/ntoskrnl/mm/balance.c Wed Feb 14 23:30:33 2007 @@ -13,9 +13,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -#undef KeAcquireSpinLock -#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializeBalancer) 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 (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Wed Feb 14 23:30:33 2007 @@ -14,9 +14,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -#undef KeAcquireSpinLock -#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePageList) Modified: trunk/reactos/ntoskrnl/mm/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdl.c?rev=2580… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdl.c (original) +++ trunk/reactos/ntoskrnl/mm/mdl.c Wed Feb 14 23:30:33 2007 @@ -13,9 +13,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -#undef KeAcquireSpinLock -#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializeMdlImplementation) Modified: trunk/reactos/ntoskrnl/mm/npool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/npool.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/mm/npool.c (original) +++ trunk/reactos/ntoskrnl/mm/npool.c Wed Feb 14 23:30:33 2007 @@ -15,9 +15,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -#undef KeAcquireSpinLock -#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MiInitializeNonPagedPool) Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c Wed Feb 14 23:30:33 2007 @@ -31,9 +31,6 @@ #define NDEBUG #include <internal/debug.h> -#undef KeAcquireSpinLock -#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } - #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitPagingFile) #endif Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c Wed Feb 14 23:30:33 2007 @@ -13,9 +13,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -#undef KeAcquireSpinLock -#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePageOp)

1 0

[ion] 25799: Object Manager fixes based on bug reports from Aleksey Bragin: - ObpReferenceProcessObjectByHandle: - Remove PAGED_CODE - Use InterlockedIncrement instead of InterlockedExchangeAdd. - ObpInsertHandleCount: Fix calculation of the handle database size, fixing potential pool corruption/overwrite situations. - ObpChargeQuotaForObject: Write proper code for charging the quota. - ObpDecrementHandleCount: - Get ObjectType from caller instead of doing the extra operation. - If there's no ha
by ion＠svn.reactos.org 14 Feb '07

14 Feb '07

Author: ion Date: Wed Feb 14 20:51:48 2007 New Revision: 25799 URL: http://svn.reactos.org/svn/reactos?rev=25799&view=rev Log: Object Manager fixes based on bug reports from Aleksey Bragin: - ObpReferenceProcessObjectByHandle: - Remove PAGED_CODE - Use InterlockedIncrement instead of InterlockedExchangeAdd. - ObpInsertHandleCount: Fix calculation of the handle database size, fixing potential pool corruption/overwrite situations. - ObpChargeQuotaForObject: Write proper code for charging the quota. - ObpDecrementHandleCount: - Get ObjectType from caller instead of doing the extra operation. - If there's no handle database, then don't setup a handle entry. - ObpIncrementHandleCount is PAGED_CODE. - ObpCloseHandle: Do proper logic for determining if we should raise an exception, fail, or bugcheck the system when an invalid handle is being closed. - ObpSetHandleAttributes: - Not PAGED_CODE. - Allow operations on kernel objects. - Use the Access Protect Close Bit in the GrantedAccess instead of an OBJ_PROTECT flag in the ObAttributes. - ObpCloseHandleCallback: Sweep/Enumerate Routines are BOOLEAN, not VOID. - ObDuplicateObject: - Clear the audit mask if auditing isn't set. - Always duplicate OBJ_AUDIT_OBJECT_CLOSE if it's set. - Clear the handle entry before writing it. - Always propagate ACCESS_SYSTEM_SECURITY as a desired access. - ObFindHandleForObject: Use ObReferenceProcessHandleTable instead of directly accessing the pointer. - ObInsertObject: Dereference symbolic links when they collide during an insert, since a reference was already added. - NtDuplicateObject: Clear out the TargetHandle to assume failure. - ObpCaptureObjectName: Use RtlCopyMemory which is faster. - ObpAllocateObject: Fix check for quota usage. - ObCreateObjectType: - Make sure that the object type name is wchar-aligned. - Add support for LPC Waitable Ports. - Initialize Object Locks. Modified: trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Wed Feb 14 20:51:48 2007 @@ -336,7 +336,7 @@ /* HANDLE TABLE FUNCTIONS ***************************************************/ -typedef VOID +typedef BOOLEAN (NTAPI *PEX_SWEEP_HANDLE_CALLBACK)( PHANDLE_TABLE_ENTRY HandleTableEntry, HANDLE Handle, Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Wed Feb 14 20:51:48 2007 @@ -15,9 +15,10 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> PHANDLE_TABLE ObpKernelHandleTable = NULL; +ULONG ObpAccessProtectCloseBit = MAXIMUM_ALLOWED; #define TAG_OB_HANDLE TAG('O', 'b', 'H', 'd') @@ -69,7 +70,6 @@ ULONG Attributes; PETHREAD Thread = PsGetCurrentThread(); NTSTATUS Status; - PAGED_CODE(); /* Assume failure */ *Object = NULL; @@ -86,7 +86,7 @@ /* Reference ourselves */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Process); - InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); + InterlockedIncrement(&ObjectHeader->PointerCount); /* Return the pointer */ *Object = Process; @@ -249,7 +249,7 @@ /* Now we'll have two entries, and an entire DB */ i = 2; Size = sizeof(OBJECT_HANDLE_COUNT_DATABASE) + - sizeof(OBJECT_HANDLE_COUNT_ENTRY); + ((i - 1) * sizeof(OBJECT_HANDLE_COUNT_ENTRY)); } else { @@ -261,7 +261,7 @@ /* Add 4 more entries */ i += 4; - Size = OldSize += (4 * sizeof(OBJECT_HANDLE_COUNT_ENTRY)); + Size = OldSize += ((i - 1) * sizeof(OBJECT_HANDLE_COUNT_ENTRY)); } /* Allocate the DB */ @@ -395,7 +395,6 @@ { POBJECT_HEADER_QUOTA_INFO ObjectQuota; ULONG PagedPoolCharge, NonPagedPoolCharge; - PEPROCESS Process; /* Get quota information */ ObjectQuota = OBJECT_HEADER_TO_QUOTA_INFO(ObjectHeader); @@ -404,9 +403,6 @@ /* Check if this is a new object */ if (ObjectHeader->Flags & OB_FLAG_CREATE_INFO) { - /* Set the flag */ - *NewObject = TRUE; - /* Remove the flag */ ObjectHeader->Flags &= ~ OB_FLAG_CREATE_INFO; if (ObjectQuota) @@ -422,14 +418,19 @@ NonPagedPoolCharge = ObjectType->TypeInfo.DefaultNonPagedPoolCharge; } - /* - * Charge the quota - * FIXME: This is a *COMPLETE* guess and probably defintely not the way to do this. - */ - Process = PsGetCurrentProcess(); - Process->QuotaBlock->QuotaEntry[PagedPool].Usage += PagedPoolCharge; - Process->QuotaBlock->QuotaEntry[NonPagedPool].Usage += NonPagedPoolCharge; - ObjectHeader->QuotaBlockCharged = Process->QuotaBlock; + /* Charge the quota */ + ObjectHeader->QuotaBlockCharged = (PVOID)1; +#if 0 + PsChargeSharedPoolQuota(PsGetCurrentProcess(), + PagedPoolCharge, + NonPagedPoolCharge); +#endif + + /* Check if we don't have a quota block */ + if (!ObjectHeader->QuotaBlockCharged) return STATUS_QUOTA_EXCEEDED; + + /* Now set the flag */ + *NewObject = TRUE; } /* Return success */ @@ -459,10 +460,10 @@ NTAPI ObpDecrementHandleCount(IN PVOID ObjectBody, IN PEPROCESS Process, - IN ACCESS_MASK GrantedAccess) + IN ACCESS_MASK GrantedAccess, + IN POBJECT_TYPE ObjectType) { POBJECT_HEADER ObjectHeader; - POBJECT_TYPE ObjectType; LONG SystemHandleCount, ProcessHandleCount; LONG NewCount; KIRQL CalloutIrql; @@ -474,7 +475,6 @@ /* Get the object type and header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); - ObjectType = ObjectHeader->Type; OBTRACE(OB_HANDLE_DEBUG, "%s - Decrementing count for: %p. HC LC %lx %lx\n", __FUNCTION__, @@ -540,6 +540,11 @@ i--; } } + else + { + /* No database, so no entry */ + HandleEntry = NULL; + } } /* Check if this is the last handle */ @@ -686,7 +691,10 @@ ExDestroyHandle(HandleTable, Handle, HandleEntry); /* Now decrement the handle count */ - ObpDecrementHandleCount(Body, PsGetCurrentProcess(), GrantedAccess); + ObpDecrementHandleCount(Body, + PsGetCurrentProcess(), + GrantedAccess, + ObjectType); /* Dereference the object as well */ ObDereferenceObject(Body); @@ -749,6 +757,7 @@ KIRQL CalloutIrql; KPROCESSOR_MODE ProbeMode; ULONG Total; + PAGED_CODE(); /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -1359,7 +1368,8 @@ /* Decrement the handle count and detach */ ObpDecrementHandleCount(&ObjectHeader->Body, PsGetCurrentProcess(), - GrantedAccess); + GrantedAccess, + ObjectType); /* Detach and fail */ if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); @@ -1596,7 +1606,8 @@ /* Decrement the handle count and detach */ ObpDecrementHandleCount(&ObjectHeader->Body, PsGetCurrentProcess(), - GrantedAccess); + GrantedAccess, + ObjectType); /* Handle extra references */ if (AdditionalReferences) @@ -1644,6 +1655,7 @@ KAPC_STATE ApcState; PHANDLE_TABLE_ENTRY HandleTableEntry; NTSTATUS Status; + PEPROCESS Process = PsGetCurrentProcess(); PAGED_CODE(); OBTRACE(OB_HANDLE_DEBUG, "%s - Closing handle: %lx\n", __FUNCTION__, Handle); @@ -1656,7 +1668,7 @@ Handle = ObKernelHandleToHandle(Handle); /* Check if we're not in the system process */ - if (PsGetCurrentProcess() != PsInitialSystemProcess) + if (Process != PsInitialSystemProcess) { /* Attach to the system process */ KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); @@ -1666,7 +1678,7 @@ else { /* Use the process's handle table */ - HandleTable = PsGetCurrentProcess()->ObjectTable; + HandleTable = Process->ObjectTable; } /* Enter a critical region to protect handle access */ @@ -1698,18 +1710,43 @@ /* Detach */ if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); - /* Check if this was a user-mode caller with a valid debug port */ - if ((AccessMode != KernelMode) && - (PsGetCurrentProcess()->DebugPort)) - { - /* Raise an exception */ - Status = KeRaiseUserException(STATUS_INVALID_HANDLE); - } - else - { - /* Just return the status */ - Status = STATUS_INVALID_HANDLE; - } + /* Check if we have a valid handle that's not the process or thread */ + if ((Handle) && + (Handle != NtCurrentProcess()) && + (Handle != NtCurrentThread())) + { + /* Check if we came from user mode */ + if (AccessMode != KernelMode) + { + /* Check if we have no debug port */ + if (Process->DebugPort) + { + /* Make sure we're not attached */ + if (!KeIsAttachedProcess()) + { + /* Raise an exception */ + return KeRaiseUserException(STATUS_INVALID_HANDLE); + } + } + } + else + { + /* This is kernel mode. Check if we're exiting */ + if (!(PsIsThreadTerminating(PsGetCurrentThread())) && + (Process->Peb)) + { + /* Check if the debugger is enabled */ + if (KdDebuggerEnabled) + { + /* Bugcheck */ + KeBugCheckEx(0, (ULONG_PTR)Handle, 1, 0, 0); + } + } + } + } + + /* Set invalid status */ + Status = STATUS_INVALID_HANDLE; } /* Return status */ @@ -1742,15 +1779,6 @@ { POBP_SET_HANDLE_ATTRIBUTES_CONTEXT SetHandleInfo = (PVOID)Context; POBJECT_HEADER ObjectHeader = ObpGetHandleObject(HandleTableEntry); - PAGED_CODE(); - - /* Don't allow operations on kernel objects */ - if ((ObjectHeader->Flags & OB_FLAG_KERNEL_MODE) && - (SetHandleInfo->PreviousMode != KernelMode)) - { - /* Fail */ - return FALSE; - } /* Check if making the handle inheritable */ if (SetHandleInfo->Information.Inherit) @@ -1775,12 +1803,12 @@ if (SetHandleInfo->Information.ProtectFromClose) { /* Set the flag */ - HandleTableEntry->ObAttributes |= OBJ_PROTECT_CLOSE; + HandleTableEntry->GrantedAccess |= ObpAccessProtectCloseBit; } else { /* Otherwise, remove it */ - HandleTableEntry->ObAttributes &= ~OBJ_PROTECT_CLOSE; + HandleTableEntry->GrantedAccess &= ~ObpAccessProtectCloseBit; } /* Return success */ @@ -1809,7 +1837,7 @@ * @remarks None. * *--*/ -VOID +BOOLEAN NTAPI ObpCloseHandleCallback(IN PHANDLE_TABLE_ENTRY HandleTableEntry, IN HANDLE Handle, @@ -1823,6 +1851,7 @@ Handle, CloseContext->AccessMode, TRUE); + return TRUE; } /*++ @@ -2078,6 +2107,15 @@ ObDereferenceProcessHandleTable(SourceProcess); return Status; } + else + { + /* Check if we have to don't have to audit object close */ + if (!(HandleInformation.HandleAttributes & OBJ_AUDIT_OBJECT_CLOSE)) + { + /* Then there is no audit mask */ + AuditMask = 0; + } + } /* Check if there's no target process */ if (!TargetProcess) @@ -2142,6 +2180,12 @@ /* Duplicate them */ HandleAttributes = HandleInformation.HandleAttributes; } + else + { + /* Don't allow caller to bypass auditing */ + HandleAttributes |= HandleInformation.HandleAttributes & + OBJ_AUDIT_OBJECT_CLOSE; + } /* Check if we're duplicating the access */ if (Options & DUPLICATE_SAME_ACCESS) DesiredAccess = SourceAccess; @@ -2151,6 +2195,7 @@ ObjectType = ObjectHeader->Type; /* Fill out the entry */ + RtlZeroMemory(&NewHandleEntry, sizeof(HANDLE_TABLE_ENTRY)); NewHandleEntry.Object = ObjectHeader; NewHandleEntry.ObAttributes |= HandleAttributes & OBJ_HANDLE_ATTRIBUTES; @@ -2162,8 +2207,9 @@ &ObjectType->TypeInfo.GenericMapping); } - /* Set the target access */ - TargetAccess = DesiredAccess; + /* Set the target access, always propagate ACCESS_SYSTEM_SECURITY */ + TargetAccess = DesiredAccess & (ObjectType->TypeInfo.ValidAccessMask | + ACCESS_SYSTEM_SECURITY); NewHandleEntry.GrantedAccess = TargetAccess; /* Check if we're asking for new access */ @@ -2242,7 +2288,8 @@ /* Undo the increment */ ObpDecrementHandleCount(SourceObject, TargetProcess, - TargetAccess); + TargetAccess, + ObjectType); /* Deference the object and set failure status */ ObDereferenceObject(SourceObject); @@ -2623,9 +2670,11 @@ { OBP_FIND_HANDLE_DATA FindData; BOOLEAN Result = FALSE; + PVOID ObjectTable; /* Make sure we have an object table */ - if (Process->ObjectTable) + ObjectTable = ObReferenceProcessHandleTable(Process); + if (ObjectTable) { /* Check if we have an object */ if (Object) @@ -2652,6 +2701,9 @@ /* Set success */ Result = TRUE; } + + /* Let go of the table */ + ObDereferenceProcessHandleTable(Process); } /* Return the result */ @@ -2859,6 +2911,14 @@ } else { + /* Check if this was a symbolic link */ + if (OBJECT_TO_OBJECT_HEADER(InsertObject)->Type == + ObSymbolicLinkType) + { + /* Dereference it */ + ObDereferenceObject(InsertObject); + } + /* Caller wanted to create a new object, fail */ Status = STATUS_OBJECT_NAME_COLLISION; } @@ -3094,7 +3154,6 @@ HANDLE hTarget; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); OBTRACE(OB_HANDLE_DEBUG, "%s - Duplicating handle: %lx for %lx into %lx.\n", __FUNCTION__, @@ -3108,8 +3167,9 @@ /* Enter SEH */ _SEH_TRY { - /* Probe the handle */ + /* Probe the handle and assume failure */ ProbeForWriteHandle(TargetHandle); + *TargetHandle = NULL; } _SEH_HANDLE { Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Wed Feb 14 20:51:48 2007 @@ -398,7 +398,7 @@ else { /* Copy the name */ - RtlMoveMemory(StringBuffer, LocalName.Buffer, StringLength); + RtlCopyMemory(StringBuffer, LocalName.Buffer, StringLength); StringBuffer[StringLength / sizeof(WCHAR)] = UNICODE_NULL; } } @@ -603,11 +603,12 @@ else { /* Check if we have quota */ - if ((ObjectCreateInfo->PagedPoolCharge != - ObjectType->TypeInfo.DefaultPagedPoolCharge) || - (ObjectCreateInfo->NonPagedPoolCharge != - ObjectType->TypeInfo.DefaultNonPagedPoolCharge) || - (ObjectCreateInfo->SecurityDescriptorCharge > 2048) || + if ((((ObjectCreateInfo->PagedPoolCharge != + ObjectType->TypeInfo.DefaultPagedPoolCharge) || + (ObjectCreateInfo->NonPagedPoolCharge != + ObjectType->TypeInfo.DefaultNonPagedPoolCharge) || + (ObjectCreateInfo->SecurityDescriptorCharge > 2048)) && + (PsGetCurrentProcess() != PsInitialSystemProcess)) || (ObjectCreateInfo->Attributes & OBJ_EXCLUSIVE)) { /* Set quota size */ @@ -1010,6 +1011,7 @@ /* Verify parameters */ if (!(TypeName) || !(TypeName->Length) || + (TypeName->Length % sizeof(WCHAR)) || !(ObjectTypeInitializer) || (ObjectTypeInitializer->Length != sizeof(*ObjectTypeInitializer)) || (ObjectTypeInitializer->InvalidAttributes & ~OBJ_VALID_ATTRIBUTES) || @@ -1167,7 +1169,12 @@ LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(FILE_OBJECT, Event); } - /* FIXME: When LPC stops sucking, add a hack for Waitable Ports */ + else if ((TypeName->Length == 24) && !(wcscmp(TypeName->Buffer, L"WaitablePort"))) + { + /* Wait on the LPC Port's object directly */ + LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(LPCP_PORT_OBJECT, + WaitEvent); + } else { /* No default Object */ @@ -1176,6 +1183,11 @@ /* Initialize Object Type components */ ExInitializeResourceLite(&LocalObjectType->Mutex); + for (i = 0; i < 4; i++) + { + /* Initialize the object locks */ + ExInitializeResourceLite(&LocalObjectType->ObjectLocks[i]); + } InitializeListHead(&LocalObjectType->TypeList); /* Lock the object type */

1 0

[tretiakov] 25798: Post WM_INPUTLANGCHANGE to thread's focus windows when keyboard layout is changed.
by tretiakov＠svn.reactos.org 14 Feb '07

14 Feb '07

Author: tretiakov Date: Wed Feb 14 16:00:38 2007 New Revision: 25798 URL: http://svn.reactos.org/svn/reactos?rev=25798&view=rev Log: Post WM_INPUTLANGCHANGE to thread's focus windows when keyboard layout is changed. Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c Wed Feb 14 16:00:38 2007 @@ -240,7 +240,10 @@ SubclassWnd(GetDlgItem(hDlg, IDC_EDIT2), L"Edit2"); SubclassWnd(GetDlgItem(hDlg, IDC_KLID), L"Klid"); SubclassWnd(GetDlgItem(hDlg, IDC_HANDLE), L"Handle"); - SubclassWnd(GetDlgItem(hDlg, ID_CANCEL), L"Button"); + SubclassWnd(GetDlgItem(hDlg, ID_CANCEL), L"CancelB"); + SubclassWnd(GetDlgItem(hDlg, IDC_ACTIVATE), L"ActivateB"); + SubclassWnd(GetDlgItem(hDlg, IDC_REFRESH), L"RefreshB"); + SubclassWnd(GetDlgItem(hDlg, IDC_UNLOAD), L"UnloadB"); CheckRadioButton(hDlg, IDC_FROMLIST, IDC_FROMEDIT, IDC_FROMLIST); SetWindowText(GetDlgItem(hDlg, IDC_KLID), L"00000419"); @@ -262,10 +265,12 @@ { if((hKl = GetActivateHandle(hDlg)) != INVALID_HANDLE_VALUE) { - if(!ActivateKeyboardLayout(hKl, GetActivateFlags(hDlg))) + if(!(hKl = ActivateKeyboardLayout(hKl, GetActivateFlags(hDlg)))) FormatBox(hDlg, MB_ICONERROR, L"Error", L"ActivateKeyboardLayout() failed. %d", GetLastError()); else UpdateData(hDlg); + //FormatBox(hDlg, 0, L"Activated", L"Prev - %x, err - %d.", hKl, + // GetLastError()); } else MessageBox(hDlg, L"No item selected", L"Error", MB_ICONERROR); break; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Wed Feb 14 16:00:38 2007 @@ -321,12 +321,22 @@ static PKBL UserActivateKbl(PW32THREAD Thread, PKBL pKbl) { PKBL Prev; + MSG Msg; Prev = Thread->KeyboardLayout; Prev->RefCount--; Thread->KeyboardLayout = pKbl; pKbl->RefCount++; + // Post WM_INPUTLANGCHANGE to thread's focus window + + Msg.hwnd = Thread->MessageQueue->FocusWindow; + Msg.message = WM_INPUTLANGCHANGE; + Msg.wParam = 0; // Charset. FIXME: what is this? + Msg.lParam = (LPARAM)pKbl->hkl; // klid + + MsqPostMessage(Thread->MessageQueue, &Msg, FALSE, QS_POSTMESSAGE); + return Prev; } @@ -419,9 +429,9 @@ _SEH_TRY { - ProbeForWrite(lpszName, 9*sizeof(WCHAR), 1); + ProbeForWrite(lpszName, KL_NAMELENGTH*sizeof(WCHAR), 1); pKbl = PsGetCurrentThreadWin32Thread()->KeyboardLayout; - RtlCopyMemory(lpszName, pKbl->Name, 9*sizeof(WCHAR)); + RtlCopyMemory(lpszName, pKbl->Name, KL_NAMELENGTH*sizeof(WCHAR)); ret = TRUE; } _SEH_HANDLE @@ -488,17 +498,27 @@ { PKBL pKbl; HKL Ret = NULL; + PW32THREAD pWThread; UserEnterExclusive(); pKbl = UserHklToKbl(hKl); + //FIXME: Respect flags! + if(pKbl) { - pKbl = UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl); - Ret = pKbl->hkl; - - //FIXME: Respect flags! + pWThread = PsGetCurrentThreadWin32Thread(); + + if(pWThread->KeyboardLayout->hkl == hKl) + { + Ret = hKl; + } + else + { + pKbl = UserActivateKbl(pWThread, pKbl); + Ret = pKbl->hkl; + } } UserLeave();

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