Ros-dev

ros-dev@reactos.org

5788 discussions

Re: [ros-dev] [ros-diffs] [dgorbachev] 43333: Fix GCC 4.1.3 warning.

by Alex Ionescu

Why are you using this bad/broken API? Why are you doing an exchange without even checking the result? Just use InterlockedAdd (but you're not accessing KdpFreeBytes safely elsewhere, so again, you're just wasting time doing bad synchronziation). Best regards, Alex Ionescu On Wed, Oct 7, 2009 at 4:04 PM, <dgorbachev(a)svn.reactos.org> wrote: > Author: dgorbachev > Date: Wed Oct 7 22:04:17 2009 > New Revision: 43333 > > URL: http://svn.reactos.org/svn/reactos?rev=43333&view=rev > Log: > Fix GCC 4.1.3 warning. > > Modified: > trunk/reactos/ntoskrnl/kd/kdio.c > > Modified: trunk/reactos/ntoskrnl/kd/kdio.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=433… > ============================================================================== > --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Wed Oct 7 22:04:17 2009 > @@ -68,7 +68,7 @@ > KdpDebugBuffer, end, NULL, NULL); > } > > - InterlockedExchangeAddUL(&KdpFreeBytes, num); > + (VOID)InterlockedExchangeAddUL(&KdpFreeBytes, num); > } > } > > > >

14 years, 11 months

Re: [ros-dev] [ros-diffs] [dgorbachev] 43329: Fix FreeLDR bug #4877. Patch by Gabriel.

by Aleksey Bragin

I proposed to erase just one line, instead of erasing whole screen all the time. WBR, Aleksey Bragin. On Oct 7, 2009, at 11:55 PM, dgorbachev(a)svn.reactos.org wrote: > Author: dgorbachev > Date: Wed Oct 7 21:55:44 2009 > New Revision: 43329 > > URL: http://svn.reactos.org/svn/reactos?rev=43329&view=rev > Log: > Fix FreeLDR bug #4877. Patch by Gabriel. > > Modified: > trunk/reactos/boot/freeldr/freeldr/windows/peloader.c > > Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/ > freeldr/windows/peloader.c?rev=43329&r1=43328&r2=43329&view=diff > ====================================================================== > ======== > --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c > [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c > [iso-8859-1] Wed Oct 7 21:55:44 2009 > @@ -270,6 +270,7 @@ > > /* Inform user we are loading files */ > sprintf(ProgressString, "Loading %s...", strchr(FileName, '\\') + > 1); > + UiDrawBackdrop(); > UiDrawProgressBarCenter(1, 100, ProgressString); > > /* Open the image file */

14 years, 11 months

Re: [ros-dev] [ros-diffs] [dgorbachev] 43331: Fix logging to a file. In spite of limitations, it remains the only way to obtain desired logs for some people.

by Alex Ionescu

This code has multiple synchronization issues, such as spinning on a test-for-spin-lock, which is non-atomic... might as well get rid of the spinlock. Also, you should probably be using a worker thread instead of consuming system resources for a dedicated thread and mucking with priorities. Best regards, Alex Ionescu On Wed, Oct 7, 2009 at 3:57 PM, <dgorbachev(a)svn.reactos.org> wrote: > Author: dgorbachev > Date: Wed Oct 7 21:57:40 2009 > New Revision: 43331 > > URL: http://svn.reactos.org/svn/reactos?rev=43331&view=rev > Log: > Fix logging to a file. > > In spite of limitations, it remains the only way to obtain desired logs for some people. > > Modified: > trunk/reactos/ntoskrnl/kd/kdio.c > > Modified: trunk/reactos/ntoskrnl/kd/kdio.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=433… > ============================================================================== > --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Wed Oct 7 21:57:40 2009 > @@ -14,16 +14,17 @@ > > /* GLOBALS *******************************************************************/ > > -#define BufferSize 32*1024 > - > -HANDLE KdbLogFileHandle; > -BOOLEAN KdpLogInitialized; > -CHAR DebugBuffer[BufferSize]; > -ULONG CurrentPosition; > -WORK_QUEUE_ITEM KdpDebugLogQueue; > +#define KdpBufferSize (1024 * 512) > +BOOLEAN KdpLoggingEnabled = FALSE; > +PCHAR KdpDebugBuffer = NULL; > +volatile ULONG KdpCurrentPosition = 0; > +volatile ULONG KdpFreeBytes = 0; > +KSPIN_LOCK KdpDebugLogSpinLock; > +KEVENT KdpLoggerThreadEvent; > +HANDLE KdpLogFileHandle; > + > KSPIN_LOCK KdpSerialSpinLock; > -BOOLEAN ItemQueued; > -KD_PORT_INFORMATION SerialPortInfo = {DEFAULT_DEBUG_PORT, DEFAULT_DEBUG_BAUD_RATE, 0}; > +KD_PORT_INFORMATION SerialPortInfo = { DEFAULT_DEBUG_PORT, DEFAULT_DEBUG_BAUD_RATE, 0 }; > > /* Current Port in use. FIXME: Do we support more then one? */ > ULONG KdpPort; > @@ -32,56 +33,103 @@ > > VOID > NTAPI > -KdpPrintToLogInternal(PVOID Context) > -{ > +KdpLoggerThread(PVOID Context) > +{ > + ULONG beg, end, num; > IO_STATUS_BLOCK Iosb; > > - /* Write to the Debug Log */ > - NtWriteFile(KdbLogFileHandle, > - NULL, > - NULL, > - NULL, > - &Iosb, > - DebugBuffer, > - CurrentPosition, > - NULL, > - NULL); > - > - /* Clear the Current Position */ > - CurrentPosition = 0; > - > - /* A new item can be queued now */ > - ItemQueued = FALSE; > -} > - > -VOID > -NTAPI > -KdpPrintToLog(PCH String, > - ULONG StringLength) > -{ > - /* Don't overflow */ > - if ((CurrentPosition + StringLength) > BufferSize) return; > - > - /* Add the string to the buffer */ > - RtlCopyMemory(&DebugBuffer[CurrentPosition], String, StringLength); > - > - /* Update the Current Position */ > - CurrentPosition += StringLength; > - > - /* Make sure we are initialized and can queue */ > - if (!KdpLogInitialized || (ItemQueued)) return; > - > - /* > - * Queue the work item > - * Note that we don't want to queue if we are > DISPATCH_LEVEL... > - * The message is in the buffer and will simply be taken care of at > - * the next time we are at <= DISPATCH, so it won't be lost. > - */ > - if (KeGetCurrentIrql() <= DISPATCH_LEVEL) > - { > - ExQueueWorkItem(&KdpDebugLogQueue, HyperCriticalWorkQueue); > - ItemQueued = TRUE; > - } > + KdpLoggingEnabled = TRUE; > + > + while (TRUE) > + { > + KeWaitForSingleObject(&KdpLoggerThreadEvent, 0, KernelMode, FALSE, NULL); > + > + /* Bug */ > + end = KdpCurrentPosition; > + num = KdpFreeBytes; > + beg = (end + num) % KdpBufferSize; > + num = KdpBufferSize - num; > + > + /* Nothing to do? */ > + if (num == 0) > + continue; > + > + if (end > beg) > + { > + NtWriteFile(KdpLogFileHandle, NULL, NULL, NULL, &Iosb, > + KdpDebugBuffer + beg, num, NULL, NULL); > + } > + else > + { > + NtWriteFile(KdpLogFileHandle, NULL, NULL, NULL, &Iosb, > + KdpDebugBuffer + beg, KdpBufferSize - beg, NULL, NULL); > + > + NtWriteFile(KdpLogFileHandle, NULL, NULL, NULL, &Iosb, > + KdpDebugBuffer, end, NULL, NULL); > + } > + > + InterlockedExchangeAddUL(&KdpFreeBytes, num); > + } > +} > + > +VOID > +NTAPI > +KdpPrintToLogFile(PCH String, > + ULONG StringLength) > +{ > + ULONG beg, end, num; > + KIRQL OldIrql; > + > + if (KdpDebugBuffer == NULL) return; > + > + /* Acquire the printing spinlock without waiting at raised IRQL */ > + while (TRUE) > + { > + /* Wait when the spinlock becomes available */ > + while (!KeTestSpinLock(&KdpDebugLogSpinLock)); > + > + /* Spinlock was free, raise IRQL */ > + KeRaiseIrql(HIGH_LEVEL, &OldIrql); > + > + /* Try to get the spinlock */ > + if (KeTryToAcquireSpinLockAtDpcLevel(&KdpDebugLogSpinLock)) > + break; > + > + /* Someone else got the spinlock, lower IRQL back */ > + KeLowerIrql(OldIrql); > + } > + > + beg = KdpCurrentPosition; > + num = KdpFreeBytes; > + if (StringLength < num) > + num = StringLength; > + > + if (num != 0) > + { > + end = (beg + num) % KdpBufferSize; > + KdpCurrentPosition = end; > + KdpFreeBytes -= num; > + > + if (end > beg) > + { > + RtlCopyMemory(KdpDebugBuffer + beg, String, num); > + } > + else > + { > + RtlCopyMemory(KdpDebugBuffer + beg, String, KdpBufferSize - beg); > + RtlCopyMemory(KdpDebugBuffer, String + KdpBufferSize - beg, end); > + } > + } > + > + /* Release spinlock */ > + KiReleaseSpinLock(&KdpDebugLogSpinLock); > + > + /* Lower IRQL */ > + KeLowerIrql(OldIrql); > + > + /* Signal the logger thread */ > + if (OldIrql <= DISPATCH_LEVEL && KdpLoggingEnabled) > + KeSetEvent(&KdpLoggerThreadEvent, 0, FALSE); > } > > VOID > @@ -90,9 +138,11 @@ > ULONG BootPhase) > { > NTSTATUS Status; > + UNICODE_STRING FileName; > OBJECT_ATTRIBUTES ObjectAttributes; > - UNICODE_STRING FileName; > IO_STATUS_BLOCK Iosb; > + HANDLE ThreadHandle; > + KPRIORITY Priority; > > if (!KdpDebugMode.File) return; > > @@ -102,10 +152,20 @@ > > /* Write out the functions that we support for now */ > DispatchTable->KdpInitRoutine = KdpInitDebugLog; > - DispatchTable->KdpPrintRoutine = KdpPrintToLog; > + DispatchTable->KdpPrintRoutine = KdpPrintToLogFile; > > /* Register as a Provider */ > InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); > + > + } > + else if (BootPhase == 1) > + { > + /* Allocate a buffer for debug log */ > + KdpDebugBuffer = ExAllocatePool(NonPagedPool, KdpBufferSize); > + KdpFreeBytes = KdpBufferSize; > + > + /* Initialize spinlock */ > + KeInitializeSpinLock(&KdpDebugLogSpinLock); > > /* Display separator + ReactOS version at start of the debug log */ > DPRINT1("---------------------------------------------------------------\n"); > @@ -117,7 +177,7 @@ > } > else if (BootPhase == 3) > { > - /* Setup the Log Name */ > + /* Setup the log name */ > RtlInitUnicodeString(&FileName, L"\\SystemRoot\\debug.log"); > InitializeObjectAttributes(&ObjectAttributes, > &FileName, > @@ -125,9 +185,9 @@ > NULL, > NULL); > > - /* Create the Log File */ > - Status = NtCreateFile(&KdbLogFileHandle, > - FILE_ALL_ACCESS, > + /* Create the log file */ > + Status = NtCreateFile(&KdpLogFileHandle, > + FILE_APPEND_DATA | SYNCHRONIZE, > &ObjectAttributes, > &Iosb, > NULL, > @@ -138,9 +198,26 @@ > NULL, > 0); > > - /* Allow it to be used */ > - ExInitializeWorkItem(&KdpDebugLogQueue, &KdpPrintToLogInternal, NULL); > - KdpLogInitialized = TRUE; > + if (!NT_SUCCESS(Status)) return; > + > + KeInitializeEvent(&KdpLoggerThreadEvent, SynchronizationEvent, TRUE); > + > + /* Create the logger thread */ > + Status = PsCreateSystemThread(&ThreadHandle, > + THREAD_ALL_ACCESS, > + NULL, > + NULL, > + NULL, > + KdpLoggerThread, > + NULL); > + > + if (!NT_SUCCESS(Status)) return; > + > + Priority = 7; > + NtSetInformationThread(ThreadHandle, > + ThreadPriority, > + &Priority, > + sizeof(Priority)); > } > } > > @@ -160,7 +237,7 @@ > /* Wait when the spinlock becomes available */ > while (!KeTestSpinLock(&KdpSerialSpinLock)); > > - /* Spinlock was free, raise irql */ > + /* Spinlock was free, raise IRQL */ > KeRaiseIrql(HIGH_LEVEL, &OldIrql); > > /* Try to get the spinlock */ > > >

14 years, 11 months

Status update

by Aleksey Bragin

Here is a summary of current status based on previous posts by email. Current regressions: - With ARM commit 41636, memory in use continously decreases, I tested it with only task manager open, this is bug 4835. - Toolbar in Abiword has some issues, introduced with 42706, comctl32 sync, bug 4811. - Minimized windows can't be restored, introduced with 41772, bug 4677. - Programs in startup folder don't start automatically anymore, introduced with 40439, bug 4568. - Can't close programs with alt+f4 anymore, introduced with 40299. Bug 4463. - VirtualBox needs more >=256 MB Ram to work (hangs in usbdriver.sys, rel builds are unaffected). Bug 4851 Who is working on what: Timo Kreuzer - Win32k driver loading and DC creation rewrite; dynamic mode switching, requiring a rewrite of PDEV locking code. Time is limited, busy with RL. KJK::Hyperion - Involvement with mingw-w64. Colin Finck - Busy with exams. James Tabor - Class rewrite part2; Message subsystem; Fix menu and window structures. Gregor Schneider - Busy with Master thesis. Johannes Anderwald - Sound support, audio input devices. Ged Murphy - Lack of time for coding. Michael Martin - Busy with RL till Nov-Dec. Later, fixing remaining virtual memory winetests failures. Aleksey Bragin - New FAT driver (based on FullFAT library), continue working on Arwinss, fix remaining Configuration Manager bugs, etc. WBR, Aleksey Bragin.

14 years, 11 months

Re: [ros-dev] [ros-diffs] [mkupfer] 43325: - some preparation for ClickLock implementation

by Timo Kreuzer

Why are you duplicating the value? Is that needed for something? And in case of SPI_SETMOUSECLICKLOCK pvParam is not a pointer to a BOOL, it is the BOOL value itself. mkupfer(a)svn.reactos.org schrieb: > Author: mkupfer > Date: Wed Oct 7 16:25:52 2009 > New Revision: 43325 > > URL: http://svn.reactos.org/svn/reactos?rev=43325&view=rev > Log: > - some preparation for ClickLock implementation > > Modified: > trunk/reactos/subsystems/win32/win32k/include/cursoricon.h > trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c > trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c > > Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Wed Oct 7 16:25:52 2009 > @@ -41,6 +41,8 @@ > typedef struct _SYSTEM_CURSORINFO > { > BOOL Enabled; > + BOOL ClickLockActive; > + DWORD ClickLockTime; > // BOOL SwapButtons; > UINT ButtonsDown; > CURSORCLIP_INFO CursorClipInfo; > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Wed Oct 7 16:25:52 2009 > @@ -263,6 +263,7 @@ > gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); > gspv.dwMouseClickLockTime = SpiLoadDWord(KEY_DESKTOP, VAL_CLICKLOCKTIME, 1200); > gspv.dwUserPrefMask = SpiLoadUserPrefMask(UPM_DEFAULT); > + gspv.bMouseClickLock = (gspv.dwUserPrefMask & UPM_CLICKLOCK) != 0; > #if (_WIN32_WINNT >= 0x0600) > gspv.iWheelScrollChars = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLCHARS, 3); > #endif > @@ -1322,6 +1323,7 @@ > return SpiGetUserPref(UPM_CLICKLOCK, pvParam, fl); > > case SPI_SETMOUSECLICKLOCK: > + gspv.bMouseClickLock = *(BOOL*) pvParam; > return SpiSetUserPref(UPM_CLICKLOCK, pvParam, fl); > > case SPI_GETMOUSEVANISH: > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Wed Oct 7 16:25:52 2009 > @@ -537,6 +537,8 @@ > CurInfo->LastBtnDown = 0; > CurInfo->CurrentCursorObject = NULL; > CurInfo->ShowingCursor = 0; > + CurInfo->ClickLockActive = FALSE; > + CurInfo->ClickLockTime = 0; > > /* > // not used anymore > > > >

14 years, 11 months

Re: [ros-dev] [ros-diffs] [mkupfer] 43292: temporarily workaround for swap mouse buttons feature

by Timo Kreuzer

CurInfo is an overengineered reactos construct. Mouse stuff is only relevant for an interactive Windowstation and there is only one per session. This way is correct,.but using the global variable gspv.bMouseBtnSwap directly would be better. Regards, Timo mkupfer(a)svn.reactos.org schrieb: > Author: mkupfer > Date: Sun Oct 4 22:45:51 2009 > New Revision: 43292 > > URL: http://svn.reactos.org/svn/reactos?rev=43292&view=rev > Log: > temporarily workaround for swap mouse buttons feature > > Modified: > trunk/reactos/subsystems/win32/win32k/ntuser/input.c > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Oct 4 22:45:51 2009 > @@ -1120,7 +1120,8 @@ > mi->time = MsqCalculateMessageTime(&LargeTickCount); > } > > - SwapButtons = CurInfo->SwapButtons; > + // FIXME: CurInfo->SwapButtons doesn't contain the correct value yet > + SwapButtons = UserGetSystemMetrics(SM_SWAPBUTTON);//CurInfo->SwapButtons; > DoMove = FALSE; > > IntGetCursorLocation(WinSta, &MousePos); > > > >

14 years, 11 months

Re: [ros-dev] [ros-diffs] [sginsberg] 43291: - Add STATUS_ASSERTION_FAILURE status code required for NT_ASSERT. - Check KdReceivePacket return for KdPacketReceived instead of 0 for correctness. - Use KdpDprintf instead of setting CR2 for unhandled cases. - Add more variables to KdDebuggerDataBlock.

by Timo Kreuzer

Please use a cast to ULONG_PTR instead of PtrToUlong like done in the amd64 branch. Thanks, Timo sginsberg(a)svn.reactos.org schrieb: > Author: sginsberg > Date: Sun Oct 4 22:19:43 2009 > New Revision: 43291 > > URL: http://svn.reactos.org/svn/reactos?rev=43291&view=rev > Log: > - Add STATUS_ASSERTION_FAILURE status code required for NT_ASSERT. > - Check KdReceivePacket return for KdPacketReceived instead of 0 for correctness. > - Use KdpDprintf instead of setting CR2 for unhandled cases. > - Add more variables to KdDebuggerDataBlock. > > [...] > --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sun Oct 4 22:19:43 2009 > @@ -9,6 +9,7 @@ > /* INCLUDES ******************************************************************/ > > #include <ntoskrnl.h> > +#include "../mm/arm3/miarm.h" > #define NDEBUG > #include <debug.h> > > @@ -51,7 +52,7 @@ > #if defined(_M_IX86) || defined(_M_AMD64) > ULONG KdpBreakpointInstruction = 0xCC; // INT3 > #else > -#error TODO > +#error Define the breakpoint instruction for this architecture > #endif > BOOLEAN KdpOweBreakpoint; > BOOLEAN BreakpointsSuspended; > @@ -367,23 +368,23 @@ > {0}, // MmSystemCacheStart > {0}, // MmSystemCacheEnd > {0}, // MmSystemCacheWs > - {0}, // MmPfnDatabase > - {0}, // MmSystemPtesStart > - {0}, // MmSystemPtesEnd > + {PtrToUlong(&MmPfnDatabase)}, > + {PtrToUlong(MmSystemPtesStart)}, > + {PtrToUlong(MmSystemPtesEnd)}, > {0}, // MmSubsectionBase > {0}, // MmNumberOfPagingFiles > - {0}, // MmLowestPhysicalPage > - {0}, // MmHighestPhysicalPage > - {0}, // MmNumberOfPhysicalPages > - {0}, // MmMaximumNonPagedPoolInBytes > - {0}, // MmNonPagedSystemStart > - {0}, // MmNonPagedPoolStart > - {0}, // MmNonPagedPoolEnd > - {0}, // MmPagedPoolStart > - {0}, // MmPagedPoolEnd > - {0}, // MmPagedPoolInfo > + {PtrToUlong(&MmLowestPhysicalPage)}, > + {PtrToUlong(&MmHighestPhysicalPage)}, > + {PtrToUlong(&MmNumberOfPhysicalPages)}, > + {PtrToUlong(&MmMaximumNonPagedPoolInBytes)}, > + {PtrToUlong(&MmNonPagedSystemStart)}, > + {PtrToUlong(&MmNonPagedPoolStart)}, > + {PtrToUlong(&MmNonPagedPoolEnd)}, > + {PtrToUlong(&MmPagedPoolStart)}, > + {PtrToUlong(&MmPagedPoolEnd)}, > + {PtrToUlong(&MmPagedPoolInfo)}, > PAGE_SIZE, > - {0}, // MmSizeOfPagedPoolInBytes > + {PtrToUlong(&MmSizeOfPagedPoolInBytes)}, > {0}, // MmTotalCommitLimit > {0}, // MmTotalCommittedPages > {0}, // MmSharedCommit > @@ -399,7 +400,7 @@ > {0}, // MmAvailablePages > {0}, // MmResidentAvailablePages > {0}, // PoolTrackTable > - {0}, // NonPagedPoolDescriptor > + {PtrToUlong(&NonPagedPoolDescriptor)}, > {PtrToUlong(&MmHighestUserAddress)}, > {PtrToUlong(&MmSystemRangeStart)}, > {PtrToUlong(&MmUserProbeAddress)}, > @@ -421,9 +422,9 @@ > {0}, // MmPeakCommitment > {0}, // MmtotalCommitLimitMaximum > {PtrToUlong(&CmNtCSDVersion)}, > - {0}, // MmPhysicalMemoryBlock > - {0}, // MmSessionBase > - {0}, // MmSessionSize > + {PtrToUlong(&MmPhysicalMemoryBlock)}, > + {PtrToUlong(&MmSessionBase)}, > + {PtrToUlong(&MmSessionSize)}, > {0}, > {0}, > FIELD_OFFSET(KTHREAD, NextProcessor), > @@ -471,6 +472,6 @@ > KGDT_TSS, > 0, > 0, > - {0}, // IopNumTriagDumpDataBlocks > + {0}, // IopNumTriageDumpDataBlocks > {0}, // IopTriageDumpDataBlocks > }; > >

14 years, 11 months

Re: [ros-dev] [ros-diffs] [sginsberg] 43265: - Replace some x86 assembly in drivers with portable breakpoint support.

by Timo Kreuzer

It was intentionally that I used an inlined break point in bmfd & ftfd. Portability is not yet needed. Please revert. sginsberg(a)svn.reactos.org wrote: > Author: sginsberg > Date: Sat Oct 3 16:15:46 2009 > New Revision: 43265 > > URL: http://svn.reactos.org/svn/reactos?rev=43265&view=rev > Log: > - Replace some x86 assembly in drivers with portable breakpoint support. > > Modified: > trunk/reactos/drivers/network/ndis/ndis/miniport.c > trunk/reactos/drivers/video/font/bmfd/bmfd.h > trunk/reactos/drivers/video/font/bmfd/font.c > trunk/reactos/drivers/video/font/bmfd/glyph.c > trunk/reactos/drivers/video/font/ftfd/enable.c > trunk/reactos/drivers/video/font/ftfd/font.c > trunk/reactos/drivers/video/font/ftfd/ftfd.h > > Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… > ============================================================================== > --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Oct 3 16:15:46 2009 > @@ -1472,7 +1472,7 @@ > *NdisWrapperHandle = NULL; > > #if BREAK_ON_MINIPORT_INIT > - __asm__ ("int $3\n"); > + DbgBreakPoint(); > #endif > > Miniport = ExAllocatePool(NonPagedPool, sizeof(NDIS_M_DRIVER_BLOCK)); > > Modified: trunk/reactos/drivers/video/font/bmfd/bmfd.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/bm… > ============================================================================== > --- trunk/reactos/drivers/video/font/bmfd/bmfd.h [iso-8859-1] (original) > +++ trunk/reactos/drivers/video/font/bmfd/bmfd.h [iso-8859-1] Sat Oct 3 16:15:46 2009 > @@ -263,17 +263,6 @@ > ULONG > DbgPrint(IN PCHAR Format, IN ...); > > -FORCEINLINE > -VOID > -DbgBreakPoint(VOID) > -{ > -#ifdef __GNUC__ > - asm volatile ("int $3"); > -#else > - __asm int 3; > -#endif > -} > - > DHPDEV > APIENTRY > BmfdEnablePDEV( > > Modified: trunk/reactos/drivers/video/font/bmfd/font.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/fo… > ============================================================================== > --- trunk/reactos/drivers/video/font/bmfd/font.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/video/font/bmfd/font.c [iso-8859-1] Sat Oct 3 16:15:46 2009 > @@ -247,7 +247,7 @@ > ULONG cjView; > > DbgPrint("BmfdLoadFontFile()\n"); > - DbgBreakPoint(); > + EngDebugBreak(); > > /* Check parameters */ > if (cFiles != 1) > @@ -323,7 +323,7 @@ > PBMFD_FILE pfile = (PBMFD_FILE)iFile; > > DbgPrint("BmfdQueryFontFile()\n"); > -// DbgBreakPoint(); > +// EngDebugBreak(); > > switch (ulMode) > { > @@ -397,7 +397,7 @@ > HGLYPH * phglyphs; > > DbgPrint("DrvQueryFontTree(iMode=%ld)\n", iMode); > -// DbgBreakPoint(); > +// EngDebugBreak(); > > /* Check parameters, we only support QFT_GLYPHSET */ > if (!iFace || iFace > pfile->cNumFaces || iMode != QFT_GLYPHSET) > @@ -522,7 +522,7 @@ > PANOSE panose = {0}; > > DbgPrint("BmfdQueryFont()\n"); > -// DbgBreakPoint(); > +// EngDebugBreak(); > > /* Validate parameters */ > if (iFace > pfile->cNumFaces || !pid) > > Modified: trunk/reactos/drivers/video/font/bmfd/glyph.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/gl… > ============================================================================== > --- trunk/reactos/drivers/video/font/bmfd/glyph.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/video/font/bmfd/glyph.c [iso-8859-1] Sat Oct 3 16:15:46 2009 > @@ -331,7 +331,7 @@ > > DbgPrint("BmfdQueryFontData(pfo=%p, iMode=%ld, hg=%p, pgd=%p, pv=%p, cjSize=%ld)\n", > pfo, iMode, hg, pgd, pv, cjSize); > -// DbgBreakPoint(); > +// EngDebugBreak(); > > switch (iMode) > { > > Modified: trunk/reactos/drivers/video/font/ftfd/enable.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/en… > ============================================================================== > --- trunk/reactos/drivers/video/font/ftfd/enable.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/video/font/ftfd/enable.c [iso-8859-1] Sat Oct 3 16:15:46 2009 > @@ -77,7 +77,7 @@ > IN HANDLE hDriver) > { > DbgPrint("FtfdEnablePDEV(hdev=%p)\n", hdev); > - DbgBreakPoint(); > + EngDebugBreak(); > > > /* Return a dummy DHPDEV */ > > Modified: trunk/reactos/drivers/video/font/ftfd/font.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/fo… > ============================================================================== > --- trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] (original) > +++ trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] Sat Oct 3 16:15:46 2009 > @@ -145,7 +145,7 @@ > PFTFD_FILE pfile = (PFTFD_FILE)iFile; > > DbgPrint("FtfdQueryFontFile(ulMode=%ld)\n", ulMode); > -// DbgBreakPoint(); > +// EngDebugBreak(); > > switch (ulMode) > { > @@ -322,7 +322,7 @@ > FT_Done_Face(ftface); > > DbgPrint("Finished with the ifi: %p\n", pifiX); > - DbgBreakPoint(); > + EngDebugBreak(); > > return pifi; > } > @@ -469,7 +469,7 @@ > *pid = (ULONG_PTR)pGlyphSet; > > DbgPrint("pGlyphSet=%p\n", pGlyphSet); > -DbgBreakPoint(); > +EngDebugBreak(); > > return pGlyphSet; > } > > Modified: trunk/reactos/drivers/video/font/ftfd/ftfd.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ft… > ============================================================================== > --- trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) > +++ trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sat Oct 3 16:15:46 2009 > @@ -51,17 +51,6 @@ > > ULONG > DbgPrint(IN PCHAR Format, IN ...); > - > -FORCEINLINE > -VOID > -DbgBreakPoint(VOID) > -{ > -#ifdef __GNUC__ > - asm volatile ("int $3"); > -#else > - __asm int 3; > -#endif > -} > > DHPDEV > APIENTRY > > > >

14 years, 11 months

ExpSystemErrorHandler

by Love Nystrom

stefan__100__(a)hotmail.com wrote: >> And the reason you couldn't pass Parameters? > Because KeBugCheck expects the array to contain 4 entries, and Parameters isn't guranteed to be that big. > What do you think of the following? > > NTSTATUS NTAPI ExpSystemErrorHandler ( > // ... abbreviated ... > { > ULONG_PTR BugCheckParameters[MAXIMUM_HARDERROR_PARAMETERS] = {0, 0, 0, 0}; > // ... abbreviated ... > for (i = 0; i < NumberOfParameters; i++) > { > /* Copy them over */ > BugCheckParameters[i] = Parameters[i]; > } If you are going to use that, you'd better include something like this first: if (NumberOfParameters > MAXIMUM_HARDERROR_PARAMETERS) NumberOfParameters = MAXIMUM_HARDERROR_PARAMETERS; or make it for (i = 0; i < min( NumberOfParameters, MAXIMUM_HARDERROR_PARAMETERS ); i++) or you might create more problems than you solve, unless you're 100% guarateed you can never receive more than MAXIMUM_HARDERROR_PARAMETERS. (This said without studying the actual problem at hand). Best Regards // Love _________________________________________________________________ Keep your friends updated—even when you’re not signed in. http://www.microsoft.com/middleeast/windows/windowslive/see-it-in-action/so…

14 years, 11 months

Re: [ros-dev] [ros-diffs] [cgutman] 43251: - Get the length from each packet header instead of assuming that all packets will be the length of the first one

by Matthieu Suiche

Lol, this bug is really nice. -- Matthieu Suiche On Thu, Oct 1, 2009 at 11:00 PM, <cgutman(a)svn.reactos.org> wrote: > Author: cgutman > Date: Thu Oct 1 23:00:41 2009 > New Revision: 43251 > > URL: http://svn.reactos.org/svn/reactos?rev=43251&view=rev > Log: > - Get the length from each packet header instead of assuming that all packets will be the length of the first one > > Modified: > trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c > > Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… > ============================================================================== > --- trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original) > +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Thu Oct 1 23:00:41 2009 > @@ -517,8 +517,8 @@ > error = ENOBUFS; > goto done; > } > - m_copydata( m, 0, htons(ip->ip_len), new_m->m_data ); > - new_m->m_len = htons(ip->ip_len); > + m_copydata( m, 0, m->m_pkthdr.len, new_m->m_data ); > + new_m->m_len = m->m_pkthdr.len; > error = OtcpEvent.PacketSend( OtcpEvent.ClientData, > (OSK_PCHAR)new_m->m_data, new_m->m_len ); > m_free( new_m ); > > >

14 years, 11 months

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-dev