Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[cfinck] 34086: Create a branch for Pierre (and maybe other developers) for working on file system drivers

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jun 25 16:03:38 2008 New Revision: 34086 URL: http://svn.reactos.org/svn/reactos?rev=34086&view=rev Log: Create a branch for Pierre (and maybe other developers) for working on file system drivers Added: branches/pierre-fsd/ - copied from r34085, trunk/reactos/

16 years, 2 months

[fireball] 34085: - MAKELONG takes (loword, hiword), not (hiword, loword) as was used in wordpad.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jun 25 14:59:10 2008 New Revision: 34085 URL: http://svn.reactos.org/svn/reactos?rev=34085&view=rev Log: - MAKELONG takes (loword, hiword), not (hiword,loword) as was used in wordpad. Modified: trunk/reactos/base/applications/wordpad/wordpad.c Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Wed Jun 25 14:59:10 2008 @@ -558,7 +558,7 @@ GetWindowRect(hMainWnd, &rect); - (void) OnSize(hMainWnd, SIZE_RESTORED, MAKELONG(rect.bottom, rect.right)); + (void) OnSize(hMainWnd, SIZE_RESTORED, MAKELONG(rect.right, rect.bottom)); } static BOOL is_bar_visible(int bandId)

16 years, 2 months

[ros-arm-bringup] 34084: - We now implement the KeUpdateSystemTime routine and the HalpClockInterrupt. - We do not yet handle all cases, most notably, timer expiration. - There may still be some bugs to work out in the code, but it's a start. - This regresses progress, but does not ignore time anymore.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Wed Jun 25 11:10:14 2008 New Revision: 34084 URL: http://svn.reactos.org/svn/reactos?rev=34084&view=rev Log: - We now implement the KeUpdateSystemTime routine and the HalpClockInterrupt. - We do not yet handle all cases, most notably, timer expiration. - There may still be some bugs to work out in the code, but it's a start. - This regresses progress, but does not ignore time anymore. Modified: trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/ntoskrnl/ke/arm/stubs.c Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Wed Jun 25 11:10:14 2008 @@ -16,7 +16,6 @@ #undef ExReleaseFastMutex #undef ExTryToAcquireFastMutex #undef KeAcquireSpinLock -#undef KeGetCurrentIrql #undef KeLowerIrql #undef KeRaiseIrql #undef KeReleaseSpinLock @@ -26,6 +25,7 @@ /* DATA **********************************************************************/ +ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; ULONG _KdComPortInUse = 0; ULONG HalpIrqlTable[HIGH_LEVEL + 1] = @@ -471,9 +471,25 @@ // // Clear the interrupt // - //DPRINT1("CLOCK INTERRUPT!!!\n"); - WRITE_REGISTER_ULONG(TIMER0_INT_CLEAR, 1); - //while (TRUE); + ASSERT(KeGetCurrentIrql() == CLOCK2_LEVEL); + WRITE_REGISTER_ULONG(TIMER0_INT_CLEAR, 1); + + // + // FIXME: Update HAL Perf counters + // + + // + // FIXME: Check if someone changed the clockrate + // + + // + // Call the kernel + // + KeUpdateSystemTime(NULL, CLOCK2_LEVEL, HalpCurrentTimeIncrement); + + // + // We're done + // } VOID @@ -526,9 +542,6 @@ WRITE_REGISTER_ULONG(TIMER0_LOAD, ClockInterval); WRITE_REGISTER_ULONG(TIMER0_CONTROL, ControlRegister.AsUlong); } - -ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; - /* * @implemented @@ -1345,6 +1358,7 @@ /* * @implemented */ +#undef KeGetCurrentIrql KIRQL NTAPI KeGetCurrentIrql(VOID) Modified: trunk/reactos/ntoskrnl/ke/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] Wed Jun 25 11:10:14 2008 @@ -9,6 +9,10 @@ ULONG KeProcessorLevel; ULONG KeProcessorRevision; ULONG KeFeatureBits; + + +extern LONG KiTickOffset; +extern ULONG KeTimeAdjustment; ULONG KiComputeTimerTableIndex(IN LONGLONG DueTime) @@ -32,8 +36,121 @@ IN KIRQL Irql, IN ULONG Increment) { - UNIMPLEMENTED; - while (TRUE); + PKPRCB Prcb = KeGetPcr()->Prcb; + LARGE_INTEGER SystemTime, InterruptTime; + ULONG Hand; + + // + // Do nothing if this tick is being skipped + // + if (Prcb->SkipTick) + { + // + // Handle it next time + // + Prcb->SkipTick = FALSE; + return; + } + + // + // Add the increment time to the shared data + // + InterruptTime.HighPart = SharedUserData->InterruptTime.High1Time; + InterruptTime.LowPart = SharedUserData->InterruptTime.LowPart; + InterruptTime.QuadPart += Increment; + SharedUserData->InterruptTime.High1Time = InterruptTime.HighPart; + SharedUserData->InterruptTime.LowPart = InterruptTime.LowPart; + SharedUserData->InterruptTime.High2Time = InterruptTime.HighPart; + + // + // Update tick count + // + KiTickOffset -= Increment; + + // + // Check for incomplete tick + // + if (KiTickOffset > 0) + { + + } + else + { + // + // Update the system time + // + SystemTime.HighPart = SharedUserData->SystemTime.High1Time; + SystemTime.LowPart = SharedUserData->SystemTime.LowPart; + SystemTime.QuadPart += KeTimeAdjustment; + SharedUserData->SystemTime.High1Time = SystemTime.HighPart; + SharedUserData->SystemTime.LowPart = SystemTime.LowPart; + SharedUserData->SystemTime.High2Time = SystemTime.HighPart; + + // + // Update the tick count + // + SystemTime.HighPart = KeTickCount.High1Time; + SystemTime.LowPart = KeTickCount.LowPart; + SystemTime.QuadPart += 1; + KeTickCount.High1Time = SystemTime.HighPart; + KeTickCount.LowPart = SystemTime.LowPart; + KeTickCount.High2Time = SystemTime.HighPart; + + // + // Update it in the shared user data + // + SharedUserData->TickCount.High1Time = SystemTime.HighPart; + SharedUserData->TickCount.LowPart = SystemTime.LowPart; + SharedUserData->TickCount.High2Time = SystemTime.HighPart; + } + + // + // Check for timer expiration + // + Hand = KeTickCount.LowPart & (TIMER_TABLE_SIZE - 1); + Hand <<= 4; + if (KiTimerTableListHead[Hand].Time.QuadPart > InterruptTime.QuadPart) + { + // + // Timer has expired! + // + DPRINT1("TIMER EXPIRATION!!!\n"); + while (TRUE); + } + + // + // Check if we should request a debugger break + // + if (KdDebuggerEnabled) + { + // + // Check if we should break + // + if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + } + + // + // Check if this was a full tick + // + if (KiTickOffset <= 0) + { + // + // Updare the tick offset + // + KiTickOffset += KeMaximumIncrement; + + // + // Update system runtime + // + KeUpdateRunTime(NULL, CLOCK2_LEVEL); + } + else + { + // + // Increase interrupt count and exit + // + Prcb->InterruptCount++; + } } VOID

16 years, 2 months

[mpiulachs] 34083: - Fix InstallSysSetupComponents: SetupInstallFromInfSection was being called with the wrong HINF handler - Always check for application existence before creating the shortcut

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Wed Jun 25 09:21:27 2008 New Revision: 34083 URL: http://svn.reactos.org/svn/reactos?rev=34083&view=rev Log: - Fix InstallSysSetupComponents: SetupInstallFromInfSection was being called with the wrong HINF handler - Always check for application existence before creating the shortcut Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Wed Jun 25 09:21:27 2008 @@ -399,6 +399,7 @@ INFCONTEXT InfContext; TCHAR NameBuffer[256]; TCHAR SectionBuffer[256]; + HINF hComponentInf = INVALID_HANDLE_VALUE; if (!SetupFindFirstLine(hSysSetupInf, _T("Infs.Always"), @@ -433,21 +434,35 @@ DPRINT("Trying to execute install section '%S' from '%S' \n", SectionBuffer , NameBuffer); - if (!SetupInstallFromInfSection(NULL, - hSysSetupInf, - SectionBuffer, - SPINST_ALL, - NULL, - NULL, - SP_COPY_NEWER, - NULL, - NULL, - NULL, - NULL)) + hComponentInf = SetupOpenInfFileW(NameBuffer, + NULL, + INF_STYLE_WIN4, + NULL); + + if (hComponentInf == INVALID_HANDLE_VALUE) { - DebugPrint("Error while trying to install : %S (Error: %lu) \n", NameBuffer, GetLastError()); + DebugPrint("SetupOpenInfFileW() failed to open '%S' (Error: %lu)\n", NameBuffer ,GetLastError()); return FALSE; } + + if (!SetupInstallFromInfSection(NULL, + hComponentInf, + SectionBuffer, + SPINST_ALL, + NULL, + NULL, + SP_COPY_NEWER, + SetupDefaultQueueCallbackW, + NULL, + NULL, + NULL)) + { + DebugPrint("Error while trying to install : %S (Error: %lu)\n", NameBuffer, GetLastError()); + SetupCloseInfFile(hComponentInf); + return FALSE; + } + + SetupCloseInfFile(hComponentInf); } while (SetupFindNextLine(&InfContext, &InfContext)); } @@ -740,33 +755,33 @@ CoInitialize(NULL); /* Create desktop shortcuts */ - CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); /* Create program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, FALSE); + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE); CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create administrative tools startmenu shortcuts */ - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("%SystemRoot%\\system32\\servman.exe"), IDS_CMT_SERVMAN, FALSE); - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("%SystemRoot%\\system32\\devmgmt.exe"), IDS_CMT_DEVMGMT, FALSE); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("%SystemRoot%\\system32\\servman.exe"), IDS_CMT_SERVMAN, TRUE); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("%SystemRoot%\\system32\\devmgmt.exe"), IDS_CMT_DEVMGMT, TRUE); /* Create and fill Accessories subfolder */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, FALSE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, FALSE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, TRUE); } /* Creacte System Tools subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_TOOLS, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, FALSE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, FALSE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, TRUE); } /* Creacte Accessibility subfolder and fill if the exe is available */ @@ -778,8 +793,8 @@ /* Create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SOLITAIRE, _T("%SystemRoot%\\system32\\sol.exe"), IDS_CMT_SOLITAIRE, FALSE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WINEMINE, _T("%SystemRoot%\\system32\\winemine.exe"), IDS_CMT_WINEMINE, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SOLITAIRE, _T("%SystemRoot%\\system32\\sol.exe"), IDS_CMT_SOLITAIRE, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WINEMINE, _T("%SystemRoot%\\system32\\winemine.exe"), IDS_CMT_WINEMINE, TRUE); } CoUninitialize();

16 years, 2 months

[navaraf] 34082: Change the logic and make the AnswerInPublic Command option opt-out instead of opt-in. Now everything except !help is allowed in public again (due to popular demand).

by navaraf＠svn.reactos.org

Author: navaraf Date: Wed Jun 25 09:13:21 2008 New Revision: 34082 URL: http://svn.reactos.org/svn/reactos?rev=34082&view=rev Log: Change the logic and make the AnswerInPublic Command option opt-out instead of opt-in. Now everything except !help is allowed in public again (due to popular demand). Modified: trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs Modified: trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs [iso-8859-1] Wed Jun 25 09:13:21 2008 @@ -11,11 +11,6 @@ public BugCommand() { } - - public override bool AnswerInPublic - { - get { return true; } - } public string BugID { Modified: trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs [iso-8859-1] Wed Jun 25 09:13:21 2008 @@ -23,7 +23,7 @@ public virtual bool AnswerInPublic { - get { return false; } + get { return true; } } public string Name Modified: trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs [iso-8859-1] Wed Jun 25 09:13:21 2008 @@ -11,7 +11,12 @@ { } - [CommandParameter("Name", "The command name to show help")] + public override bool AnswerInPublic + { + get { return false; } + } + + [CommandParameter("Name", "The command name to show help")] public string CommandName { get { return Parameters; }

16 years, 2 months

[navaraf] 34081: Fix answers to !winerror <hex number> command and to !error command.

by navaraf＠svn.reactos.org

Author: navaraf Date: Wed Jun 25 09:07:13 2008 New Revision: 34081 URL: http://svn.reactos.org/svn/reactos?rev=34081&view=rev Log: Fix answers to !winerror <hex number> command and to !error command. Modified: trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs Modified: trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs [iso-8859-1] Wed Jun 25 09:07:13 2008 @@ -51,7 +51,7 @@ { XmlElement root = base.m_XmlDocument.DocumentElement; XmlNode node = root.SelectSingleNode(String.Format("Winerror[@value='{0}']", - Text)); + winerror.ToString())); if (node != null) { XmlAttribute text = node.Attributes["text"];

16 years, 2 months

[cfinck] 34080: Update the patches, so that they apply against current trunk. Also delete the "mm" directory after speaking with Aleksey about this, further work on the "branch" shall only result in updated patches.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jun 25 08:49:18 2008 New Revision: 34080 URL: http://svn.reactos.org/svn/reactos?rev=34080&view=rev Log: Update the patches, so that they apply against current trunk. Also delete the "mm" directory after speaking with Aleksey about this, further work on the "branch" shall only result in updated patches. Removed: branches/cache_manager_rewrite/mm/ Modified: branches/cache_manager_rewrite/headers.patch (contents, props changed) branches/cache_manager_rewrite/mm.patch Modified: branches/cache_manager_rewrite/headers.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/headers.p… ============================================================================== --- branches/cache_manager_rewrite/headers.patch [iso-8859-1] (original) +++ branches/cache_manager_rewrite/headers.patch [iso-8859-1] Wed Jun 25 08:49:18 2008 @@ -1,6 +1,6 @@ Index: include/reactos/exeformat.h =================================================================== ---- include/reactos/exeformat.h (revision 31533) +--- include/reactos/exeformat.h (revision 34037) +++ include/reactos/exeformat.h (working copy) @@ -35,6 +35,7 @@ typedef NTSTATUS (NTAPI * PEXEFMT_CB_READ_FILE) @@ -12,9 +12,9 @@ OUT PVOID * Data, Index: ntoskrnl/include/internal/mm.h =================================================================== ---- ntoskrnl/include/internal/mm.h (revision 31533) +--- ntoskrnl/include/internal/mm.h (revision 34040) +++ ntoskrnl/include/internal/mm.h (working copy) -@@ -176,6 +176,9 @@ +@@ -187,6 +187,9 @@ ULONG Flags; ULONG Characteristics; BOOLEAN WriteCopy; @@ -24,7 +24,7 @@ } MM_SECTION_SEGMENT, *PMM_SECTION_SEGMENT; typedef struct _MM_IMAGE_SECTION_OBJECT -@@ -192,6 +195,10 @@ +@@ -203,6 +206,10 @@ BOOLEAN Executable; ULONG NrSegments; ULONG ImageSize; @@ -35,7 +35,7 @@ PMM_SECTION_SEGMENT Segments; } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT; -@@ -210,6 +217,16 @@ +@@ -221,6 +228,16 @@ }; } ROS_SECTION_OBJECT, *PROS_SECTION_OBJECT; @@ -52,7 +52,7 @@ typedef struct _MEMORY_AREA { PVOID StartingAddress; -@@ -224,17 +241,10 @@ +@@ -235,17 +252,10 @@ ULONG PageOpCount; union { @@ -73,9 +73,9 @@ } MEMORY_AREA, *PMEMORY_AREA; Index: ntoskrnl/include/internal/cc.h =================================================================== ---- ntoskrnl/include/internal/cc.h (revision 31533) +--- ntoskrnl/include/internal/cc.h (revision 34040) +++ ntoskrnl/include/internal/cc.h (working copy) -@@ -102,17 +102,29 @@ +@@ -102,19 +102,29 @@ LONG ActivePrefetches; } PFSN_PREFETCHER_GLOBALS, *PPFSN_PREFETCHER_GLOBALS; @@ -102,6 +102,8 @@ - ULONG CacheSegmentSize; - LARGE_INTEGER AllocationSize; - LARGE_INTEGER FileSize; +- PCACHE_MANAGER_CALLBACKS Callbacks; +- PVOID LazyWriteContext; - KSPIN_LOCK BcbLock; + CC_FILE_SIZES FileSizes; + BOOLEAN PinAccess; @@ -113,7 +115,7 @@ ULONG RefCount; #if defined(DBG) || defined(KDBG) BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments */ -@@ -157,8 +169,8 @@ +@@ -159,8 +169,8 @@ typedef struct _INTERNAL_BCB { PUBLIC_BCB PFCB; @@ -124,37 +126,10 @@ CSHORT RefCount; /* (At offset 0x34 on WinNT4) */ } INTERNAL_BCB, *PINTERNAL_BCB; -Index: ntoskrnl/ntoskrnl.def +Index: drivers/filesystems/fastfat/vfat.h =================================================================== ---- ntoskrnl/ntoskrnl.def (revision 31533) -+++ ntoskrnl/ntoskrnl.def (working copy) -@@ -5,9 +5,6 @@ - ; ReactOS Operating System - ; - EXPORTS --CcRosInitializeFileCache@8 --CcRosReleaseFileCache@4 --CcRosTraceCacheMap@8 - CcCanIWrite@16 - CcCopyRead@24 - CcCopyWrite@20 -Index: drivers/filesystems/cdfs/cdfs.h -=================================================================== ---- drivers/filesystems/cdfs/cdfs.h (revision 31533) -+++ drivers/filesystems/cdfs/cdfs.h (working copy) -@@ -6,7 +6,7 @@ - #include <ntddcdrm.h> - #include <ccros.h> - --#define USE_ROS_CC_AND_FS -+//#define USE_ROS_CC_AND_FS - - #define CDFS_BASIC_SECTOR 2048 - #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 -Index: drivers/filesystems/vfat/vfat.h -=================================================================== ---- drivers/filesystems/vfat/vfat.h (revision 31533) -+++ drivers/filesystems/vfat/vfat.h (working copy) +--- drivers/filesystems/fastfat/vfat.h (revision 34037) ++++ drivers/filesystems/fastfat/vfat.h (working copy) @@ -6,7 +6,7 @@ #ifdef __GNUC__ #include <ccros.h> @@ -164,16 +139,3 @@ #else #define KEBUGCHECK KeBugCheck #define KEBUGCHECKEX KeBugCheckEx -Index: drivers/filesystems/ntfs/ntfs.h -=================================================================== ---- drivers/filesystems/ntfs/ntfs.h (revision 31533) -+++ drivers/filesystems/ntfs/ntfs.h (working copy) -@@ -6,7 +6,7 @@ - #include <ntdddisk.h> - #include <ccros.h> - --#define USE_ROS_CC_AND_FS -+//#define USE_ROS_CC_AND_FS - - - #define CACHEPAGESIZE(pDeviceExt) \ Propchange: branches/cache_manager_rewrite/headers.patch ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cache_manager_rewrite/mm.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm.patch?… ============================================================================== --- branches/cache_manager_rewrite/mm.patch [iso-8859-1] (original) +++ branches/cache_manager_rewrite/mm.patch [iso-8859-1] Wed Jun 25 08:49:18 2008 @@ -1,6 +1,6 @@ Index: mm/elf.inc.h =================================================================== ---- mm/elf.inc.h (revision 32677) +--- mm/elf.inc.h (revision 34040) +++ mm/elf.inc.h (working copy) @@ -1,3 +1,5 @@ +#include <ntoskrnl.h> @@ -18,7 +18,7 @@ &pData, Index: mm/elf32.c =================================================================== ---- mm/elf32.c (revision 32677) +--- mm/elf32.c (revision 34040) +++ mm/elf32.c (working copy) @@ -6,7 +6,7 @@ * @@ -31,7 +31,7 @@ Index: mm/elf64.c =================================================================== ---- mm/elf64.c (revision 32677) +--- mm/elf64.c (revision 34040) +++ mm/elf64.c (working copy) @@ -6,6 +6,6 @@ * @@ -43,7 +43,7 @@ #include "elf.inc.h" Index: mm/freelist.c =================================================================== ---- mm/freelist.c (revision 32677) +--- mm/freelist.c (revision 34040) +++ mm/freelist.c (working copy) @@ -634,6 +634,12 @@ } @@ -60,7 +60,7 @@ { Index: mm/mm.c =================================================================== ---- mm/mm.c (revision 32677) +--- mm/mm.c (revision 34040) +++ mm/mm.c (working copy) @@ -246,6 +246,7 @@ break; @@ -72,7 +72,7 @@ (PVOID)Address, Index: mm/mminit.c =================================================================== ---- mm/mminit.c (revision 32677) +--- mm/mminit.c (revision 34040) +++ mm/mminit.c (working copy) @@ -67,6 +67,9 @@ FALSE; @@ -94,7 +94,7 @@ return TRUE; Index: mm/mpw.c =================================================================== ---- mm/mpw.c (revision 32677) +--- mm/mpw.c (revision 34040) +++ mm/mpw.c (working copy) @@ -88,7 +88,7 @@ MmWriteDirtyPages(128, &PagesWritten); @@ -107,7 +107,7 @@ Index: mm/pagefile.c =================================================================== ---- mm/pagefile.c (revision 32677) +--- mm/pagefile.c (revision 34040) +++ mm/pagefile.c (working copy) @@ -1,5 +1,4 @@ -/* @@ -118,7 +118,7 @@ * This program is free software; you can redistribute it and/or modify Index: mm/pageop.c =================================================================== ---- mm/pageop.c (revision 32677) +--- mm/pageop.c (revision 34040) +++ mm/pageop.c (working copy) @@ -81,14 +81,23 @@ /* @@ -213,11 +213,10 @@ } PageOp->ReferenceCount = 1; PageOp->Next = MmPageOpHashTable[Hash]; -@@ -257,12 +277,3 @@ - TAG_MM_PAGEOP, +@@ -258,11 +278,3 @@ 50); } -- + - - - @@ -228,7 +227,7 @@ - Index: mm/pe.c =================================================================== ---- mm/pe.c (revision 32677) +--- mm/pe.c (revision 34040) +++ mm/pe.c (working copy) @@ -240,7 +240,7 @@ lnOffset.QuadPart = pidhDosHeader->e_lfanew; @@ -250,7 +249,7 @@ DIE(("ReadFile failed with status %08X\n", nStatus)); Index: mm/rmap.c =================================================================== ---- mm/rmap.c (revision 32677) +--- mm/rmap.c (revision 34040) +++ mm/rmap.c (working copy) @@ -299,6 +299,17 @@ Status = MmPageOutVirtualMemory(AddressSpace, MemoryArea, @@ -272,7 +271,7 @@ KEBUGCHECK(0); Index: mm/section.c =================================================================== ---- mm/section.c (revision 32677) +--- mm/section.c (revision 34040) +++ mm/section.c (working copy) @@ -31,7 +31,7 @@ * Ge van Geldorp @@ -4361,14 +4360,14 @@ IN OUT PULONG NumberOfPages, Index: mm/virtual.c =================================================================== ---- mm/virtual.c (revision 32677) +--- mm/virtual.c (revision 34040) +++ mm/virtual.c (working copy) -@@ -396,7 +396,7 @@ +@@ -594,7 +594,7 @@ NTSTATUS Status; - + *NumberOfBytesToProtect = -- PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) - -+ PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (ULONG_PTR)(*NumberOfBytesToProtect)) - - PAGE_ROUND_DOWN(*BaseAddress); +- PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) - ++ PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (ULONG_PTR)(*NumberOfBytesToProtect)) - + PAGE_ROUND_DOWN(*BaseAddress); *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress); - +

16 years, 2 months

[mpiulachs] 34079: - miscellaneous small fixes - add support for preventing all commands to be run on the channel by default. Now TechBot only answers some of the commands in PM - add back the error Command

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Wed Jun 25 08:23:59 2008 New Revision: 34079 URL: http://svn.reactos.org/svn/reactos?rev=34079&view=rev Log: - miscellaneous small fixes - add support for preventing all commands to be run on the channel by default. Now TechBot only answers some of the commands in PM - add back the error Command Added: trunk/irc/TechBot/TechBot.Commands.Common/ErrorCommand.cs - copied, changed from r33939, trunk/irc/TechBot/TechBot.Library/Commands/ErrorCommand.cs Removed: trunk/irc/TechBot/TechBot.Library/Commands/ErrorCommand.cs trunk/irc/TechBot/TechBot.Library/ParametersParser.cs Modified: trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs trunk/irc/TechBot/TechBot.Commands.Common/TechBot.Commands.Common.csproj trunk/irc/TechBot/TechBot.Commands.MSDN/ApiCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs trunk/irc/TechBot/TechBot.Library/TechBotService.cs Modified: trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs [iso-8859-1] Wed Jun 25 08:23:59 2008 @@ -6,11 +6,16 @@ { public abstract class BugCommand : Command { - private string m_BugID = null; +// private string m_BugID = null; public BugCommand() { } + + public override bool AnswerInPublic + { + get { return true; } + } public string BugID { Copied: trunk/irc/TechBot/TechBot.Commands.Common/ErrorCommand.cs (from r33939, trunk/irc/TechBot/TechBot.Library/Commands/ErrorCommand.cs) URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/ErrorCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/ErrorCommand.cs [iso-8859-1] Wed Jun 25 08:23:59 2008 @@ -2,7 +2,9 @@ using System.Xml; using System.Collections; -namespace TechBot.Library +using TechBot.Library; + +namespace TechBot.Commands.Common { [Command("error", Help = "!error <value>")] public class ErrorCommand : Command @@ -68,27 +70,24 @@ return code.ToString(); } - public override void Handle(MessageContext context) - { - if (Text.Equals(String.Empty)) + public override void ExecuteCommand() + { + if (Parameters.Equals(String.Empty)) { - TechBot.ServiceOutput.WriteLine(context, - "Please provide an Error Code."); + Say("Please provide an Error Code."); return; } - string errorText = originalErrorText; + string errorText = Parameters; retry: NumberParser np = new NumberParser(); long error = np.Parse(errorText); - if (np.Error) - { - TechBot.ServiceOutput.WriteLine(context, - String.Format("{0} is not a valid Error Code.", - originalErrorText)); - return; - } + if (np.Error) + { + Say("{0} is not a valid Error Code.", Parameters); + return; + } ArrayList descriptions = new ArrayList(); @@ -159,27 +158,23 @@ goto retry; } - TechBot.ServiceOutput.WriteLine(context, - String.Format("I don't know about Error Code {0}.", - originalErrorText)); + Say("I don't know about Error Code {0}.", + Parameters); } - else if (descriptions.Count == 1) - { - string description = (string)descriptions[0]; - TechBot.ServiceOutput.WriteLine(context, - String.Format("{0} is {1}.", - originalErrorText, - description)); - } - else - { - TechBot.ServiceOutput.WriteLine(context, - String.Format("{0} could be:", - originalErrorText)); - - foreach(string description in descriptions) - TechBot.ServiceOutput.WriteLine(context, String.Format("\t{0}", description)); - } + else if (descriptions.Count == 1) + { + string description = (string)descriptions[0]; + Say("{0} is {1}.", + Parameters, + description); + } + else + { + Say("{0} could be:", Parameters); + + foreach (string description in descriptions) + Say("\t{0}", description); + } } } } Modified: trunk/irc/TechBot/TechBot.Commands.Common/TechBot.Commands.Common.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/TechBot.Commands.Common.csproj [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/TechBot.Commands.Common.csproj [iso-8859-1] Wed Jun 25 08:23:59 2008 @@ -34,6 +34,7 @@ </ItemGroup> <ItemGroup> <Compile Include="Base\BugCommand.cs" /> + <Compile Include="ErrorCommand.cs" /> <Compile Include="HResultCommand.cs" /> <Compile Include="NtStatusCommand.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> Modified: trunk/irc/TechBot/TechBot.Commands.MSDN/ApiCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.MSDN/ApiCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.MSDN/ApiCommand.cs [iso-8859-1] Wed Jun 25 08:23:59 2008 @@ -16,11 +16,10 @@ private bool IsVerbose = false; private HtmlHelpSystem chm; - private string name; public ApiCommand() { - Run(); + LoadCHM(); } [CommandParameter("api", "The API name")] @@ -36,7 +35,7 @@ Say(message); } - private void Run() + private void LoadCHM() { string CHMFilename = Path.Combine(Settings.Default.ChmPath, Settings.Default.MainChm); chm = new HtmlHelpSystem(); Modified: trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs [iso-8859-1] Wed Jun 25 08:23:59 2008 @@ -19,6 +19,11 @@ { get { return m_Context; } set { m_Context = value; } + } + + public virtual bool AnswerInPublic + { + get { return false; } } public string Name @@ -53,6 +58,25 @@ TechBot.ServiceOutput.WriteLine(Context, String.Format(format, args)); } + public void Run() + { + if (Context is ChannelMessageContext) + { + if (AnswerInPublic) + { + ExecuteCommand(); + } + else + { + Say("Sorry, I only respond '{0}' in private , PM me!", Name); + } + } + else + { + ExecuteCommand(); + } + } + public abstract void ExecuteCommand(); public virtual void Initialize() Modified: trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs [iso-8859-1] Wed Jun 25 08:23:59 2008 @@ -6,8 +6,6 @@ { public abstract class XmlLookupCommand : XmlCommand { - protected string m_Text = null; - public virtual string Text { get { return Parameters; } Removed: trunk/irc/TechBot/TechBot.Library/Commands/ErrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/ErrorCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/ErrorCommand.cs (removed) @@ -1,185 +1,0 @@ -using System; -using System.Xml; -using System.Collections; - -namespace TechBot.Library -{ - [Command("error", Help = "!error <value>")] - public class ErrorCommand : Command - { - private NtStatusCommand ntStatus; - private WinErrorCommand winerror; - private HResultCommand hresult; - - public ErrorCommand() - { - this.ntStatus = new NtStatusCommand(); - this.winerror = new WinErrorCommand(); - this.hresult = new HResultCommand(); - } - - private static int GetSeverity(long error) - { - return (int)((error >> 30) & 0x3); - } - - private static bool IsCustomer(long error) - { - return (error & 0x20000000) != 0; - } - - private static bool IsReserved(long error) - { - return (error & 0x10000000) != 0; - } - - private static int GetFacility(long error) - { - return (int)((error >> 16) & 0xFFF); - } - - private static short GetCode(long error) - { - return (short)((error >> 0) & 0xFFFF); - } - - private static string FormatSeverity(long error) - { - int severity = GetSeverity(error); - switch (severity) - { - case 0: return "SUCCESS"; - case 1: return "INFORMATIONAL"; - case 2: return "WARNING"; - case 3: return "ERROR"; - } - return null; - } - - private static string FormatFacility(long error) - { - int facility = GetFacility(error); - return facility.ToString(); - } - - private static string FormatCode(long error) - { - int code = GetCode(error); - return code.ToString(); - } - - public override void Handle(MessageContext context) - { - if (Text.Equals(String.Empty)) - { - TechBot.ServiceOutput.WriteLine(context, - "Please provide an Error Code."); - return; - } - - string errorText = originalErrorText; - - retry: - NumberParser np = new NumberParser(); - long error = np.Parse(errorText); - if (np.Error) - { - TechBot.ServiceOutput.WriteLine(context, - String.Format("{0} is not a valid Error Code.", - originalErrorText)); - return; - } - - ArrayList descriptions = new ArrayList(); - - // Error is out of bounds - if ((ulong)error > uint.MaxValue) - { - // Do nothing - } - // Error is outside of the range [0, 65535]: it cannot be a plain Win32 error code - else if ((ulong)error > ushort.MaxValue) - { - // Customer bit is set: custom error code - if (IsCustomer(error)) - { - string description = String.Format("[custom, severity {0}, facility {1}, code {2}]", - FormatSeverity(error), - FormatFacility(error), - FormatCode(error)); - descriptions.Add(description); - } - // Reserved bit is set: HRESULT_FROM_NT(ntstatus) - else if (IsReserved(error)) - { - int status = (int)(error & 0xCFFFFFFF); - string description = ntStatus.GetNtstatusDescription(status); - - if (description == null) - description = status.ToString("X"); - - description = String.Format("HRESULT_FROM_NT({0})", description); - descriptions.Add(description); - } - // Win32 facility: HRESULT_FROM_WIN32(winerror) - else if (GetFacility(error) == 7) - { - // Must be an error code - if (GetSeverity(error) == 2) - { - short err = GetCode(error); - string description = winerror.GetWinerrorDescription(err); - - if (description == null) - description = err.ToString("D"); - - description = String.Format("HRESULT_FROM_WIN32({0})", description); - descriptions.Add(description); - } - } - } - - string winerrorDescription = winerror.GetWinerrorDescription(error); - string ntstatusDescription = ntStatus.GetNtstatusDescription(error); - string hresultDescription = hresult.GetHresultDescription(error); - - if (winerrorDescription != null) - descriptions.Add(winerrorDescription); - if (ntstatusDescription != null) - descriptions.Add(ntstatusDescription); - if (hresultDescription != null) - descriptions.Add(hresultDescription); - - if (descriptions.Count == 0) - { - // Last chance heuristics: attempt to parse a 8-digit decimal as hexadecimal - if (errorText.Length == 8) - { - errorText = "0x" + errorText; - goto retry; - } - - TechBot.ServiceOutput.WriteLine(context, - String.Format("I don't know about Error Code {0}.", - originalErrorText)); - } - else if (descriptions.Count == 1) - { - string description = (string)descriptions[0]; - TechBot.ServiceOutput.WriteLine(context, - String.Format("{0} is {1}.", - originalErrorText, - description)); - } - else - { - TechBot.ServiceOutput.WriteLine(context, - String.Format("{0} could be:", - originalErrorText)); - - foreach(string description in descriptions) - TechBot.ServiceOutput.WriteLine(context, String.Format("\t{0}", description)); - } - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/ParametersParser.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Parame… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/ParametersParser.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/ParametersParser.cs (removed) @@ -1,537 +1,0 @@ -using System; -using System.Text.RegularExpressions; - -//Code taken from : http://www.codeproject.com/KB/recipes/commandlineparser.aspx - -namespace TechBot.Library -{ - /// <summary>Implementation of a command-line parsing class. Is capable of - /// having switches registered with it directly or can examine a registered - /// class for any properties with the appropriate attributes appended to - /// them.</summary> - public class ParametersParser - { - /// <summary>A simple internal class for passing back to the caller - /// some information about the switch. The internals/implementation - /// of this class has privillaged access to the contents of the - /// SwitchRecord class.</summary> - public class SwitchInfo - { - #region Private Variables - private object m_Switch = null; - #endregion - - #region Public Properties - public string Name { get { return (m_Switch as SwitchRecord).Name; } } - public string Description { get { return (m_Switch as SwitchRecord).Description; } } - public string[] Aliases { get { return (m_Switch as SwitchRecord).Aliases; } } - public System.Type Type { get { return (m_Switch as SwitchRecord).Type; } } - public object Value { get { return (m_Switch as SwitchRecord).Value; } } - public object InternalValue { get { return (m_Switch as SwitchRecord).InternalValue; } } - public bool IsEnum { get { return (m_Switch as SwitchRecord).Type.IsEnum; } } - public string[] Enumerations { get { return (m_Switch as SwitchRecord).Enumerations; } } - #endregion - - /// <summary> - /// Constructor for the SwitchInfo class. Note, in order to hide to the outside world - /// information not necessary to know, the constructor takes a System.Object (aka - /// object) as it's registering type. If the type isn't of the correct type, an exception - /// is thrown. - /// </summary> - /// <param name="rec">The SwitchRecord for which this class store information.</param> - /// <exception cref="ArgumentException">Thrown if the rec parameter is not of - /// the type SwitchRecord.</exception> - public SwitchInfo( object rec ) - { - if ( rec is SwitchRecord ) - m_Switch = rec; - else - throw new ArgumentException(); - } - } - - /// <summary> - /// The SwitchRecord is stored within the parser's collection of registered - /// switches. This class is private to the outside world. - /// </summary> - private class SwitchRecord - { - #region Private Variables - private string m_name = ""; - private string m_description = ""; - private object m_value = null; - private System.Type m_switchType = typeof(bool); - private System.Collections.ArrayList m_Aliases = null; - private string m_Pattern = ""; - - // The following advanced functions allow for callbacks to be - // made to manipulate the associated data type. - private System.Reflection.MethodInfo m_SetMethod = null; - private System.Reflection.MethodInfo m_GetMethod = null; - private object m_PropertyOwner = null; - #endregion - - #region Private Utility Functions - private void Initialize( string name, string description ) - { - m_name = name; - m_description = description; - - BuildPattern(); - } - - private void BuildPattern() - { - string matchString = Name; - - if ( Aliases != null && Aliases.Length > 0 ) - foreach( string s in Aliases ) - matchString += "|" + s; - - string strPatternStart = @"(\s|^)(?<match>(-{1,2}|/)("; - string strPatternEnd; // To be defined below. - - // The common suffix ensures that the switches are followed by - // a white-space OR the end of the string. This will stop - // switches such as /help matching /helpme - // - string strCommonSuffix = @"(?=(\s|$))"; - - if ( Type == typeof(bool) ) - strPatternEnd = @")(?<value>(\+|-){0,1}))"; - else if ( Type == typeof(string) ) - strPatternEnd = @")(?::|\s+))((?:"")(?<value>.+)(?:"")|(?<value>\S+))"; - else if ( Type == typeof(int) ) - strPatternEnd = @")(?::|\s+))((?<value>(-|\+)[0-9]+)|(?<value>[0-9]+))"; - else if ( Type.IsEnum ) - { - string[] enumNames = Enumerations; - string e_str = enumNames[0]; - for ( int e=1; e<enumNames.Length; e++ ) - e_str += "|" + enumNames[e]; - strPatternEnd = @")(?::|\s+))(?<value>" + e_str + @")"; - } - else - throw new System.ArgumentException(); - - // Set the internal regular expression pattern. - m_Pattern = strPatternStart + matchString + strPatternEnd + strCommonSuffix; - } - #endregion - - #region Public Properties - public object Value - { - get - { - if ( ReadValue != null ) - return ReadValue; - else - return m_value; - } - } - - public object InternalValue - { - get { return m_value; } - } - - public string Name - { - get { return m_name; } - set { m_name = value; } - } - - public string Description - { - get { return m_description; } - set { m_description = value; } - } - - public System.Type Type - { - get { return m_switchType; } - } - - public string[] Aliases - { - get { return (m_Aliases != null) ? (string[])m_Aliases.ToArray(typeof(string)): null; } - } - - public string Pattern - { - get { return m_Pattern; } - } - - public System.Reflection.MethodInfo SetMethod - { - set { m_SetMethod = value; } - } - - public System.Reflection.MethodInfo GetMethod - { - set { m_GetMethod = value; } - } - - public object PropertyOwner - { - set { m_PropertyOwner = value; } - } - - public object ReadValue - { - get - { - object o = null; - if ( m_PropertyOwner != null && m_GetMethod != null ) - o = m_GetMethod.Invoke( m_PropertyOwner, null ); - return o; - } - } - - public string[] Enumerations - { - get - { - if ( m_switchType.IsEnum ) - return System.Enum.GetNames( m_switchType ); - else - return null; - } - } - #endregion - - #region Constructors - public SwitchRecord( string name, string description ) - { - Initialize( name, description ); - } - - public SwitchRecord( string name, string description, System.Type type ) - { - if ( type == typeof(bool) || - type == typeof(string) || - type == typeof(int) || - type.IsEnum ) - { - m_switchType = type; - Initialize( name, description ); - } - else - throw new ArgumentException("Currently only Ints, Bool and Strings are supported"); - } - #endregion - - #region Public Methods - public void AddAlias( string alias ) - { - if ( m_Aliases == null ) - m_Aliases = new System.Collections.ArrayList(); - m_Aliases.Add( alias ); - - BuildPattern(); - } - - public void Notify( object value ) - { - if ( m_PropertyOwner != null && m_SetMethod != null ) - { - object[] parameters = new object[1]; - parameters[0] = value; - m_SetMethod.Invoke( m_PropertyOwner, parameters ); - } - m_value = value; - } - - #endregion - } - - - #region Private Variables - private string m_commandLine = ""; - private string m_workingString = ""; - private string m_applicationName = ""; - private string[] m_splitParameters = null; - private System.Collections.ArrayList m_switches = null; - #endregion - - #region Private Utility Functions - private void ExtractApplicationName() - { - Regex r = new Regex(@"^(?<commandLine>("".+""|(\S)+))(?<remainder>.+)", - RegexOptions.ExplicitCapture); - Match m = r.Match(m_commandLine); - if ( m != null && m.Groups["commandLine"] != null ) - { - m_applicationName = m.Groups["commandLine"].Value; - m_workingString = m.Groups["remainder"].Value; - } - } - - private void SplitParameters() - { - // Populate the split parameters array with the remaining parameters. - // Note that if quotes are used, the quotes are removed. - // e.g. one two three "four five six" - // 0 - one - // 1 - two - // 2 - three - // 3 - four five six - // (e.g. 3 is not in quotes). - Regex r = new Regex(@"((\s*(""(?<param>.+?)""|(?<param>\S+))))", - RegexOptions.ExplicitCapture); - MatchCollection m = r.Matches( m_workingString ); - - if ( m != null ) - { - m_splitParameters = new string[ m.Count ]; - for ( int i=0; i < m.Count; i++ ) - m_splitParameters[i] = m[i].Groups["param"].Value; - } - } - - private void HandleSwitches() - { - if ( m_switches != null ) - { - foreach ( SwitchRecord s in m_switches ) - { - Regex r = new Regex( s.Pattern, - RegexOptions.ExplicitCapture - | RegexOptions.IgnoreCase ); - MatchCollection m = r.Matches( m_workingString ); - if ( m != null ) - { - for ( int i=0; i < m.Count; i++ ) - { - string value = null; - if ( m[i].Groups != null && m[i].Groups["value"] != null ) - value = m[i].Groups["value"].Value; - - if ( s.Type == typeof(bool)) - { - bool state = true; - // The value string may indicate what value we want. - if ( m[i].Groups != null && m[i].Groups["value"] != null ) - { - switch ( value ) - { - case "+": state = true; - break; - case "-": state = false; - break; - case "": if ( s.ReadValue != null ) - state = !(bool)s.ReadValue; - break; - default: break; - } - } - s.Notify( state ); - break; - } - else if ( s.Type == typeof(string) ) - s.Notify( value ); - else if ( s.Type == typeof(int) ) - s.Notify( int.Parse( value ) ); - else if ( s.Type.IsEnum ) - s.Notify( System.Enum.Parse(s.Type,value,true) ); - } - } - - m_workingString = r.Replace(m_workingString, " "); - } - } - } - - #endregion - - #region Public Properties - public string ApplicationName - { - get { return m_applicationName; } - } - - public string[] Parameters - { - get { return m_splitParameters; } - } - - public SwitchInfo[] Switches - { - get - { - if ( m_switches == null ) - return null; - else - { - SwitchInfo[] si = new SwitchInfo[ m_switches.Count ]; - for ( int i=0; i<m_switches.Count; i++ ) - si[i] = new SwitchInfo( m_switches[i] ); - return si; - } - } - } - - public object this[string name] - { - get - { - if ( m_switches != null ) - for ( int i=0; i<m_switches.Count; i++ ) - if ( string.Compare( (m_switches[i] as SwitchRecord).Name, name, true )==0 ) - return (m_switches[i] as SwitchRecord).Value; - return null; - } - } - - /// <summary>This function returns a list of the unhandled switches - /// that the parser has seen, but not processed.</summary> - /// <remark>The unhandled switches are not removed from the remainder - /// of the command-line.</remark> - public string[] UnhandledSwitches - { - get - { - string switchPattern = @"(\s|^)(?<match>(-{1,2}|/)(.+?))(?=(\s|$))"; - Regex r = new Regex( switchPattern, - RegexOptions.ExplicitCapture - | RegexOptions.IgnoreCase ); - MatchCollection m = r.Matches( m_workingString ); - - if ( m != null ) - { - string[] unhandled = new string[ m.Count ]; - for ( int i=0; i < m.Count; i++ ) - unhandled[i] = m[i].Groups["match"].Value; - return unhandled; - } - else - return null; - } - } - #endregion - - #region Public Methods - public void AddSwitch( string name, string description ) - { - if ( m_switches == null ) - m_switches = new System.Collections.ArrayList(); - - SwitchRecord rec = new SwitchRecord( name, description ); - m_switches.Add( rec ); - } - - public void AddSwitch( string[] names, string description ) - { - if ( m_switches == null ) - m_switches = new System.Collections.ArrayList(); - SwitchRecord rec = new SwitchRecord( names[0], description ); - for ( int s=1; s<names.Length; s++ ) - rec.AddAlias( names[s] ); - m_switches.Add( rec ); - } - - public bool Parse() - { - ExtractApplicationName(); - - // Remove switches and associated info. - HandleSwitches(); - - // Split parameters. - SplitParameters(); - - return true; - } - - public object InternalValue(string name) - { - if ( m_switches != null ) - for ( int i=0; i<m_switches.Count; i++ ) - if ( string.Compare( (m_switches[i] as SwitchRecord).Name, name, true )==0 ) - return (m_switches[i] as SwitchRecord).InternalValue; - return null; - } - #endregion - - #region Constructors - public ParametersParser( string commandLine ) - { - m_commandLine = commandLine; - } - - public ParametersParser( string commandLine, - object classForAutoAttributes ) - { - m_commandLine = commandLine; - - Type type = classForAutoAttributes.GetType(); - System.Reflection.MemberInfo[] members = type.GetMembers(); - - for(int i=0; i<members.Length; i++) - { - object[] attributes = members[i].GetCustomAttributes(false); - if(attributes.Length > 0) - { - SwitchRecord rec = null; - - foreach ( Attribute attribute in attributes ) - { - if ( attribute is CommandParameterAttribute ) - { - CommandParameterAttribute switchAttrib = - (CommandParameterAttribute) attribute; - - // Get the property information. We're only handling - // properties at the moment! - if ( members[i] is System.Reflection.PropertyInfo ) - { - System.Reflection.PropertyInfo pi = (System.Reflection.PropertyInfo) members[i]; - - rec = new SwitchRecord( switchAttrib.Name, - switchAttrib.Description, - pi.PropertyType ); - - // Map in the Get/Set methods. - rec.SetMethod = pi.GetSetMethod(); - rec.GetMethod = pi.GetGetMethod(); - rec.PropertyOwner = classForAutoAttributes; - - // Can only handle a single switch for each property - // (otherwise the parsing of aliases gets silly...) - break; - } - } - } - - // See if any aliases are required. We can only do this after - // a switch has been registered and the framework doesn't make - // any guarantees about the order of attributes, so we have to - // walk the collection a second time. - if ( rec != null ) - { - foreach ( Attribute attribute in attributes ) - { - if (attribute is CommandParameterAliasAttribute) - { - CommandParameterAliasAttribute aliasAttrib = - (CommandParameterAliasAttribute)attribute; - rec.AddAlias( aliasAttrib.Alias ); - } - } - } - - // Assuming we have a switch record (that may or may not have - // aliases), add it to the collection of switches. - if ( rec != null ) - { - if ( m_switches == null ) - m_switches = new System.Collections.ArrayList(); - m_switches.Add( rec ); - } - } - } - } - #endregion - } -} Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/TechBotService.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/TechBotService.cs [iso-8859-1] Wed Jun 25 08:23:59 2008 @@ -81,7 +81,7 @@ try { cmd.Initialize(); - cmd.ExecuteCommand(); + cmd.Run(); cmd.DeInitialize(); } catch (Exception e)

16 years, 2 months

[jimtabor] 34078: Jeffrey Morlan (mrnobo1024 at yahoo.com) - Fix ModifyWorldTransform multiplies. See bug 3314.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jun 25 06:47:12 2008 New Revision: 34078 URL: http://svn.reactos.org/svn/reactos?rev=34078&view=rev Log: Jeffrey Morlan (mrnobo1024 at yahoo.com) - Fix ModifyWorldTransform multiplies. See bug 3314. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Wed Jun 25 06:47:12 2008 @@ -68,6 +68,7 @@ LPXFORM xform1, LPXFORM xform2) { + XFORM xformTemp; /* Check for illegal parameters */ if (!XFormResult || !xform1 || !xform2) { @@ -76,12 +77,13 @@ /* Create the result in a temporary XFORM, since xformResult may be * equal to xform1 or xform2 */ - XFormResult->eM11 = xform1->eM11 * xform2->eM11 + xform1->eM12 * xform2->eM21; - XFormResult->eM12 = xform1->eM11 * xform2->eM12 + xform1->eM12 * xform2->eM22; - XFormResult->eM21 = xform1->eM21 * xform2->eM11 + xform1->eM22 * xform2->eM21; - XFormResult->eM22 = xform1->eM21 * xform2->eM12 + xform1->eM22 * xform2->eM22; - XFormResult->eDx = xform1->eDx * xform2->eM11 + xform1->eDy * xform2->eM21 + xform2->eDx; - XFormResult->eDy = xform1->eDx * xform2->eM12 + xform1->eDy * xform2->eM22 + xform2->eDy; + xformTemp.eM11 = xform1->eM11 * xform2->eM11 + xform1->eM12 * xform2->eM21; + xformTemp.eM12 = xform1->eM11 * xform2->eM12 + xform1->eM12 * xform2->eM22; + xformTemp.eM21 = xform1->eM21 * xform2->eM11 + xform1->eM22 * xform2->eM21; + xformTemp.eM22 = xform1->eM21 * xform2->eM12 + xform1->eM22 * xform2->eM22; + xformTemp.eDx = xform1->eDx * xform2->eM11 + xform1->eDy * xform2->eM21 + xform2->eDx; + xformTemp.eDy = xform1->eDx * xform2->eM12 + xform1->eDy * xform2->eM22 + xform2->eDy; + *XFormResult = xformTemp; return TRUE; } @@ -90,9 +92,6 @@ LPXFORM Unsafexform1, LPXFORM Unsafexform2) { - XFORM xformTemp; - XFORM xform1 = {0}, xform2 = {0}; - NTSTATUS Status = STATUS_SUCCESS; BOOL Ret; _SEH_TRY @@ -106,40 +105,13 @@ ProbeForRead(Unsafexform2, sizeof(XFORM), 1); - xform1 = *Unsafexform1; - xform2 = *Unsafexform2; + Ret = IntGdiCombineTransform(UnsafeXFormResult, Unsafexform1, Unsafexform2); } _SEH_HANDLE { - Status = _SEH_GetExceptionCode(); + Ret = FALSE; } _SEH_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - Ret = IntGdiCombineTransform(&xformTemp, &xform1, &xform2); - - /* Copy the result to xformResult */ - _SEH_TRY - { - /* pointer was already probed! */ - *UnsafeXFormResult = xformTemp; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } return Ret; } @@ -185,7 +157,7 @@ CONST LPXFORM lpXForm, DWORD Mode) { - ASSERT(pDc && lpXForm); + ASSERT(pDc); switch(Mode) { @@ -211,7 +183,6 @@ break; default: - SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } DC_UpdateXforms(pDc); @@ -418,13 +389,7 @@ { PDC dc; XFORM SafeXForm; - BOOL Ret = FALSE; - - if (!UnsafeXForm) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } + BOOL Ret = TRUE; dc = DC_LockDc(hDC); if (!dc) @@ -433,19 +398,24 @@ return FALSE; } - _SEH_TRY - { - ProbeForRead(UnsafeXForm, sizeof(XFORM), 1); - RtlCopyMemory(&SafeXForm, UnsafeXForm, sizeof(XFORM)); + // The xform is permitted to be NULL for MWT_IDENTITY. + // However, if it is not NULL, then it must be valid even though it is not used. + if (UnsafeXForm != NULL || Mode != MWT_IDENTITY) + { + _SEH_TRY + { + ProbeForRead(UnsafeXForm, sizeof(XFORM), 1); + RtlCopyMemory(&SafeXForm, UnsafeXForm, sizeof(XFORM)); + } + _SEH_HANDLE + { + Ret = FALSE; + } + _SEH_END; } - _SEH_HANDLE - { - SetLastNtError(_SEH_GetExceptionCode()); - } - _SEH_END; // Safe to handle kernel mode data. - Ret = IntGdiModifyWorldTransform(dc, &SafeXForm, Mode); + if (Ret) Ret = IntGdiModifyWorldTransform(dc, &SafeXForm, Mode); DC_UnlockDc(dc); return Ret; }

16 years, 2 months

[cfinck] 34077: Jeffrey Morlan (mrnobo1024@yahoo.com) - Fix a race condition in msgina, which occasionally led to hangs at "Loading your personal settings" See issue #3384 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jun 25 06:12:42 2008 New Revision: 34077 URL: http://svn.reactos.org/svn/reactos?rev=34077&view=rev Log: Jeffrey Morlan (mrnobo1024(a)yahoo.com) - Fix a race condition in msgina, which occasionally led to hangs at "Loading your personal settings" See issue #3384 for more details. Modified: trunk/reactos/dll/win32/msgina/gui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Wed Jun 25 06:12:42 2008 @@ -83,9 +83,6 @@ (LPARAM)lpParam); SetThreadDesktop(OldDesk); - msg->Context->hStatusWindow = 0; - msg->Context->SignaledStatusWindowCreated = FALSE; - HeapFree(GetProcessHeap(), 0, lpParam); return TRUE; } @@ -159,6 +156,7 @@ { EndDialog(pgContext->hStatusWindow, 0); pgContext->hStatusWindow = 0; + pgContext->SignaledStatusWindowCreated = FALSE; } return TRUE;

16 years, 2 months

← Newer
1
...
12
13
14
15
16
17
18
...
44
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 June 2008