Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[fireball] 43870: [usetup] - Change "MBR" to "bootsector", as proposed in bug 4356 by Michael Trausch. Changed languages are English and Russian.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 31 14:31:28 2009 New Revision: 43870 URL: http://svn.reactos.org/svn/reactos?rev=43870&view=rev Log: [usetup] - Change "MBR" to "bootsector", as proposed in bug 4356 by Michael Trausch. Changed languages are English and Russian. Modified: trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/ru-RU.h Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sat Oct 31 14:31:28 2009 @@ -986,7 +986,7 @@ { 8, 12, - "Install bootloader on the harddisk (MBR).", + "Install bootloader on the harddisk (bootsector).", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sat Oct 31 14:31:28 2009 @@ -987,7 +987,7 @@ { 8, 12, - "áâ ®¢ª ¦¥áâª¨© ¤¨áª (MBR).", + "áâ ®¢ª ¦¥áâª¨© ¤¨áª (§ £àã§®çë© á¥ªâ®à).", TEXT_STYLE_NORMAL }, {

14 years, 10 months

[janderwald] 43869: - Fix retrieving audio position

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Oct 31 11:38:25 2009 New Revision: 43869 URL: http://svn.reactos.org/svn/reactos?rev=43869&view=rev Log: - Fix retrieving audio position Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Sat Oct 31 11:38:25 2009 @@ -354,7 +354,7 @@ IN PVOID Tag) PURE; STDMETHOD_(BOOL, HasLastMappingFailed)(THIS) PURE; - STDMETHOD_(VOID, PrintQueueStatus)(THIS) PURE; + STDMETHOD_(ULONG, GetCurrentIrpOffset)(THIS) PURE; STDMETHOD_(VOID, SetMinimumDataThreshold)(THIS_ IN ULONG MinimumDataThreshold) PURE; STDMETHOD_(ULONG, GetMinimumDataThreshold)(THIS) PURE; @@ -403,7 +403,7 @@ IN PVOID Tag); \ \ STDMETHODIMP_(BOOL) HasLastMappingFailed(THIS); \ - STDMETHODIMP_(VOID) PrintQueueStatus(THIS); \ + STDMETHODIMP_(ULONG) GetCurrentIrpOffset(THIS); \ STDMETHODIMP_(VOID) SetMinimumDataThreshold( \ IN ULONG MinimumDataThreshold); \ STDMETHODIMP_(ULONG) GetMinimumDataThreshold(VOID) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Sat Oct 31 11:38:25 2009 @@ -35,7 +35,7 @@ virtual ~CIrpQueue(){} protected: - ULONG m_CurrentOffset; + volatile ULONG m_CurrentOffset; LONG m_NumMappings; ULONG m_NumDataAvailable; BOOL m_StartStream; @@ -312,7 +312,7 @@ // ASSERT(StreamHeader); // add to current offset - m_CurrentOffset += BytesWritten; + InterlockedExchangeAdd((volatile PLONG)&m_CurrentOffset, (LONG)BytesWritten); // decrement available data counter m_NumDataAvailable -= BytesWritten; @@ -559,11 +559,12 @@ return m_OutOfMapping; } -VOID -NTAPI -CIrpQueue::PrintQueueStatus() -{ - +ULONG +NTAPI +CIrpQueue::GetCurrentIrpOffset() +{ + + return m_CurrentOffset; } VOID Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Sat Oct 31 11:38:25 2009 @@ -218,7 +218,8 @@ else if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING) { Position->PlayOffset = Pin->m_Position.PlayOffset % Pin->m_Position.WriteOffset; - Position->WriteOffset = Pin->m_IrpQueue->NumData(); + Position->WriteOffset = (ULONGLONG)Pin->m_IrpQueue->GetCurrentIrpOffset(); + DPRINT("Play %lu Write %lu\n", Position->PlayOffset, Position->WriteOffset); } @@ -606,10 +607,7 @@ if (NT_SUCCESS(Status)) { - if (m_Capture) - m_Position.WriteOffset += Data; - else - m_Position.WriteOffset += Data; + m_Position.WriteOffset += Data; return STATUS_PENDING; }

14 years, 10 months

[janderwald] 43868: - Implement looped streaming (needed for dsound bringup) - Implement GetPosition handler for looped streaming, WIP

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Oct 31 09:26:26 2009 New Revision: 43868 URL: http://svn.reactos.org/svn/reactos?rev=43868&view=rev Log: - Implement looped streaming (needed for dsound bringup) - Implement GetPosition handler for looped streaming, WIP Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Sat Oct 31 09:26:26 2009 @@ -322,9 +322,8 @@ IN PVOID SilenceBuffer) PURE; STDMETHOD_(NTSTATUS, AddMapping)(THIS_ - IN PUCHAR Buffer, - IN ULONG BufferSize, - IN PIRP Irp) PURE; + IN PIRP Irp, + OUT PULONG Data) PURE; STDMETHOD_(NTSTATUS, GetMapping)(THIS_ OUT PUCHAR * Buffer, @@ -372,9 +371,8 @@ IN PVOID SilenceBuffer); \ \ STDMETHODIMP_(NTSTATUS) AddMapping(THIS_ \ - IN PUCHAR Buffer, \ - IN ULONG BufferSize, \ - IN PIRP Irp); \ + IN PIRP Irp, \ + OUT PULONG Data); \ \ STDMETHODIMP_(NTSTATUS) GetMapping(THIS_ \ OUT PUCHAR * Buffer, \ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Sat Oct 31 09:26:26 2009 @@ -39,7 +39,7 @@ LONG m_NumMappings; ULONG m_NumDataAvailable; BOOL m_StartStream; - KSPIN_CONNECT * m_ConnectDetails; + PKSPIN_CONNECT m_ConnectDetails; PKSDATAFORMAT_WAVEFORMATEX m_DataFormat; KSPIN_LOCK m_IrpListLock; @@ -110,9 +110,8 @@ NTSTATUS NTAPI CIrpQueue::AddMapping( - IN PUCHAR Buffer, - IN ULONG BufferSize, - IN PIRP Irp) + IN PIRP Irp, + OUT PULONG Data) { PKSSTREAM_HEADER Header; NTSTATUS Status = STATUS_SUCCESS; @@ -124,8 +123,6 @@ // get current irp stack location IoStack = IoGetCurrentIrpStackLocation(Irp); - - PC_ASSERT(!Buffer); if (!Irp->MdlAddress) { @@ -172,8 +169,8 @@ NumData = 0; // prepare all headers - for(Index = 0; Index < NumHeaders; Index++) - { + for(Index = 0; Index < NumHeaders; Index++) + { // sanity checks PC_ASSERT(Header); PC_ASSERT(Mdl); @@ -181,17 +178,17 @@ Header->Data = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority); if (!Header->Data) - { + { // insufficient resources ExFreePool(Irp->AssociatedIrp.SystemBuffer); Irp->AssociatedIrp.SystemBuffer = NULL; - // complete and forget request + // complete and forget request Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INSUFFICIENT_RESOURCES; - } + } // increment num mappings InterlockedIncrement(&m_NumMappings); @@ -207,10 +204,10 @@ // move to next mdl Mdl = Mdl->Next; - } + } DPRINT("StreamHeaders %u NumData %u FrameSize %u NumDataAvailable %u\n", NumHeaders, NumData, m_MaxFrameSize, m_NumDataAvailable); - + *Data = NumData; // mark irp as pending IoMarkIrpPending(Irp); @@ -330,7 +327,7 @@ if (m_CurrentOffset >= Size) { if (STREAMHEADER_INDEX(m_Irp) + 1 < STREAMHEADER_COUNT(m_Irp)) - { + { // the irp has at least one more stream header m_Irp->Tail.Overlay.DriverContext[OFFSET_HEADERINDEX] = UlongToPtr(STREAMHEADER_INDEX(m_Irp) + 1); @@ -345,7 +342,7 @@ // done return; - } + } // irp has been processed completly @@ -354,7 +351,7 @@ // loop all stream headers for(Index = 0; Index < STREAMHEADER_COUNT(m_Irp); Index++) - { + { PC_ASSERT(StreamHeader); // add size of buffer @@ -369,19 +366,29 @@ // get next stream header StreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)StreamHeader + StreamHeader->Size); - } + } + + if (m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING) + { + // looped streaming repeat the buffers untill + // the caller decides to stop the streams + + // reset stream header index + m_Irp->Tail.Overlay.DriverContext[OFFSET_HEADERINDEX] = UlongToPtr(0); + // re-insert irp + KsAddIrpToCancelableQueue(&m_IrpList, &m_IrpListLock, m_Irp, KsListEntryTail, NULL); + // clear current irp + m_Irp = NULL; + // reset offset + m_CurrentOffset = 0; + // increment available data + InterlockedExchangeAdd((PLONG)&m_NumDataAvailable, NumData); + // done + return; + } m_Irp->IoStatus.Status = STATUS_SUCCESS; m_Irp->IoStatus.Information = NumData; - -#if 0 - PC_ASSERT_IRQL(DISPATCH_LEVEL); - MmUnlockPages(m_Irp->MdlAddress); - IoFreeMdl(m_Irp->MdlAddress); - m_Irp->MdlAddress = NULL; - ExFreePool(m_Irp->AssociatedIrp.SystemBuffer); - m_Irp->AssociatedIrp.SystemBuffer = NULL; -#endif // complete the request IoCompleteRequest(m_Irp, IO_SOUND_INCREMENT); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Sat Oct 31 09:26:26 2009 @@ -59,7 +59,7 @@ PMINIPORTWAVECYCLICSTREAM m_Stream; KSSTATE m_State; PKSDATAFORMAT m_Format; - KSPIN_CONNECT * m_ConnectDetails; + PKSPIN_CONNECT m_ConnectDetails; PVOID m_CommonBuffer; ULONG m_CommonBufferSize; @@ -187,6 +187,7 @@ { CPortPinWaveCyclic *Pin; PSUBDEVICE_DESCRIPTOR Descriptor; + PKSAUDIO_POSITION Position; // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); @@ -206,9 +207,21 @@ { // FIXME non multithreading-safe // copy audio position - RtlMoveMemory(Data, &Pin->m_Position, sizeof(KSAUDIO_POSITION)); - - DPRINT("Play %lu Record %lu\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); + + Position = (PKSAUDIO_POSITION)Data; + + if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_STREAMING) + { + RtlMoveMemory(Data, &Pin->m_Position, sizeof(KSAUDIO_POSITION)); + DPRINT("Play %lu Record %lu\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); + } + else if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING) + { + Position->PlayOffset = Pin->m_Position.PlayOffset % Pin->m_Position.WriteOffset; + Position->WriteOffset = Pin->m_IrpQueue->NumData(); + } + + Irp->IoStatus.Information = sizeof(KSAUDIO_POSITION); return STATUS_SUCCESS; } @@ -584,25 +597,21 @@ IN PIRP Irp) { NTSTATUS Status; + ULONG Data = 0; InterlockedIncrement((PLONG)&m_TotalPackets); DPRINT("IPortPinWaveCyclic_HandleKsStream entered Total %u State %x MinData %u\n", m_TotalPackets, m_State, m_IrpQueue->NumData()); - Status = m_IrpQueue->AddMapping(NULL, 0, Irp); + Status = m_IrpQueue->AddMapping(Irp, &Data); if (NT_SUCCESS(Status)) { - - PKSSTREAM_HEADER Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; - PC_ASSERT(Header); - if (m_Capture) - m_Position.WriteOffset += Header->FrameExtent; + m_Position.WriteOffset += Data; else - m_Position.WriteOffset += Header->DataUsed; + m_Position.WriteOffset += Data; return STATUS_PENDING; - } return Status; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Sat Oct 31 09:26:26 2009 @@ -665,22 +665,19 @@ IN PIRP Irp) { NTSTATUS Status; + ULONG Data = 0; InterlockedIncrement((PLONG)&m_TotalPackets); DPRINT("IPortPinWaveCyclic_HandleKsStream entered Total %u State %x MinData %u\n", m_TotalPackets, m_State, m_IrpQueue->NumData()); - Status = m_IrpQueue->AddMapping(NULL, 0, Irp); + Status = m_IrpQueue->AddMapping(Irp, &Data); if (NT_SUCCESS(Status)) { - - PKSSTREAM_HEADER Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; - PC_ASSERT(Header); - if (m_Capture) - m_Position.WriteOffset += Header->FrameExtent; + m_Position.WriteOffset += Data; else - m_Position.WriteOffset += Header->DataUsed; + m_Position.WriteOffset += Data; return STATUS_PENDING; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Sat Oct 31 09:26:26 2009 @@ -7,6 +7,22 @@ */ #include "private.hpp" + + +KSPIN_INTERFACE PinInterfaces[] = +{ + { + {STATIC_KSINTERFACESETID_Standard}, + KSINTERFACE_STANDARD_STREAMING, + 0 + }, + { + {STATIC_KSINTERFACESETID_Standard}, + KSINTERFACE_STANDARD_LOOPED_STREAMING, + 0 + } +}; + NTSTATUS NTAPI @@ -450,6 +466,9 @@ { RtlMoveMemory(&Descriptor->Factory.KsPinDescriptor[Index], &SrcDescriptor->KsPinDescriptor, sizeof(KSPIN_DESCRIPTOR)); + Descriptor->Factory.KsPinDescriptor[Index].Interfaces = PinInterfaces; + Descriptor->Factory.KsPinDescriptor[Index].InterfacesCount = sizeof(PinInterfaces) / sizeof(KSPIN_INTERFACE); + DPRINT("Index %u DataRangeCount %u\n", Index, SrcDescriptor->KsPinDescriptor.DataRangesCount); Descriptor->Factory.Instances[Index].CurrentPinInstanceCount = 0;

14 years, 10 months

[cgutman] 43867: - Add more cases to TCPTranslateError - Fix a header typo

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Oct 31 08:34:27 2009 New Revision: 43867 URL: http://svn.reactos.org/svn/reactos?rev=43867&view=rev Log: - Add more cases to TCPTranslateError - Fix a header typo Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/oskittcp/include/oskiterrno.h Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Oct 31 08:34:27 2009 @@ -563,8 +563,16 @@ case OSK_EAFNOSUPPORT: Status = STATUS_INVALID_CONNECTION; break; case OSK_ECONNREFUSED: case OSK_ECONNRESET: Status = STATUS_REMOTE_NOT_LISTENING; break; - case OSK_EINPROGRESS: - case OSK_EAGAIN: Status = STATUS_PENDING; break; + case OSK_EINPROGRESS: Status = STATUS_PENDING; break; + case OSK_EWOULDBLOCK: Status = STATUS_CANT_WAIT; break; + case OSK_EINVAL: Status = STATUS_INVALID_PARAMETER; break; + case OSK_ENOMEM: + case OSK_ENOBUFS: Status = STATUS_INSUFFICIENT_RESOURCES; break; + case OSK_ESHUTDOWN: Status = STATUS_FILE_CLOSED; break; + case OSK_EMSGSIZE: Status = STATUS_BUFFER_TOO_SMALL; break; + case OSK_ETIMEDOUT: Status = STATUS_TIMEOUT; break; + case OSK_ENETUNREACH: Status = STATUS_NETWORK_UNREACHABLE; break; + case OSK_EFAULT: Status = STATUS_ACCESS_VIOLATION; break; default: DbgPrint("OskitTCP returned unhandled error code: %d\n", OskitError); Status = STATUS_INVALID_CONNECTION; Modified: trunk/reactos/lib/drivers/oskittcp/include/oskiterrno.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskiterrno.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskiterrno.h [iso-8859-1] Sat Oct 31 08:34:27 2009 @@ -97,7 +97,7 @@ /* non-blocking and interrupt i/o */ #define OSK_EAGAIN 35 /* Resource temporarily unavailable */ #ifndef _POSIX_SOURCE -#define OSK_EWOULDBLOCK EAGAIN /* Operation would block */ +#define OSK_EWOULDBLOCK OSK_EAGAIN /* Operation would block */ #define OSK_EINPROGRESS 36 /* Operation now in progress */ #define OSK_EALREADY 37 /* Operation already in progress */

14 years, 10 months

[tkreuzer] 43866: Add a number of official win32k pool tags, taken from https://blogs.technet.com/yongrhee/archive/2009/06/24/pool-tag-list.aspx

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 31 03:10:51 2009 New Revision: 43866 URL: http://svn.reactos.org/svn/reactos?rev=43866&view=rev Log: Add a number of official win32k pool tags, taken from https://blogs.technet.com/yongrhee/archive/2009/06/24/pool-tag-list.aspx Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Sat Oct 31 03:10:51 2009 @@ -99,5 +99,250 @@ #define TAG_DDSURF '2 hD' #define TAG_EDDGBL 'GDDE' /* ? edd_directdraw_global ??*/ +/* Official tags */ +#define GDITAG_ATM_FONT 'Adbe' +#define GDITAG_BMP_FONT 'dfmB' +#define GDITAG_ENG_EVENT 'msfD' +#define GDITAG_DWM_HWND_LOOKUP 'LmwD' +#define GDITAG_DWM_VALIDATION 'vMWD' +#define GDITAG_LOCKED_PRIMARY 'ddxD' +#define GDITAG_DC_COLOR_TRANSFORM 'bdaG' +#define GDITAG_DC_FONT 'ddaG' +#define GDITAG_ALPHABLEND 'plaG' +#define GDITAG_BRUSH_FREELIST 'fabG' +#define GDITAG_ICM_DIB_LIST 'ldbG' +#define GDITAG_FONTCACHE 'cacG' +#define GDITAG_SCRIPTS 'lscG' +#define GDITAG_CHAR_TO_WIDE_CHAR 'cwcG' +#define GDITAG_RBRUSH 'rbdG' +#define GDITAG_DC_FREELIST 'fcdG' +#define GDITAG_DWMSTATE 'scDG' +#define GDITAG_DEVMODE 'vedG' +#define GDITAG_PDEV 'veDG' +#define GDITAG_HGLYPH_ARRAY 'mfdG' +#define GDITAG_DRVSUP 'srdG' +#define GDITAG_CLIPOBJ 'vrdG' +#define GDITAG_SEMAPHORE_VALIDATE 'dtdG' +#define GDITAG_WATCHDOG 'dwdG' +#define GDITAG_ENGBRUSH 'rbeG' +#define GDITAG_ENUM_DISPLAY_DEVICES 'ddeG' +#define GDITAG_EDGE 'gdeG' +#define GDITAG_TRIANGLEDATA 'gdEg' +#define GDITAG_TEXTOUT 'oteG' +#define GDITAG_FONT_DEFAULT_FAMILY 'fdfG' +#define GDITAG_FONTFILEVIEW 'vffG' +#define GDITAG_UNIVERSAL_FONT_ID 'difG' +#define GDITAG_FILEPATH 'liFG' +#define GDITAG_MAPFILE 'lifG' +#define GDITAG_FLOODFILL 'dlFG' +#define GDITAG_RFONT 'tnfG' +#define GDITAG_FONT_SUB 'bsfG' +#define GDITAG_FONT_STOCKFONT 'fsfG' +#define GDITAG_FAST_MUTEX 'msfG' +#define GDITAG_FULLSCREEN 'lufG' +#define GDITAG_FONTVICTIM 'ivfG' +#define GDITAG_GLYPHBLOCK ' bgG' +#define GDITAG_GDEVICE 'vdgG' +#define GDITAG_GLYPHSET 'slgG' +#define GDITAG_HGLYPH 'ylgG' +#define GDITAG_HMGR_LFONT_TYPE ':?hG' +#define GDITAG_HMGR_RFONT_TYPE ';?hG' +#define GDITAG_HMGR_BRUSH_TYPE '@?hG' +#define GDITAG_HMGR_ICMCXF_TYPE '>?hG' +#define GDITAG_HMGR_DEF_TYPE '0?hG' +#define GDITAG_HMGR_DC_TYPE '1?hG' +#define GDITAG_HMGR_RGN_TYPE '4?hG' +#define GDITAG_HMGR_SURF_TYPE '5?hG' +#define GDITAG_HMGR_CLIENTOBJ_TYPE '6?hG' +#define GDITAG_HMGR_PATH_TYPE '7?hG' +#define GDITAG_HMGR_PAL_TYPE '8?hG' +#define GDITAG_HMGR_ICMLCS_TYPE '9?hG' +#define GDITAG_HMGR_UMPD_TYPE 'A?hG' +#define GDITAG_HMGR_HLSURF_TYPE 'B?hG' +#define GDITAG_HMGR_META_TYPE 'E?hG' +#define GDITAG_HMGR_DRVOBJ_TYPE 'L?hG' +#define GDITAG_HMGR_SPRITE_TYPE '??hG' +#define GDITAG_HMGR_START '00hG' +#define GDITAG_PFE_HASHBUCKET 'bahG' +#define GDITAG_PFE_HASHTABLE 'sahG' +#define GDITAG_HMGR_LOCK 'lmhG' +#define GDITAG_HALFTONE_COLORTRIAD 'cthG' +#define GDITAG_HMGR_TEMP 'mthG' +#define GDITAG_DDCCI 'c2iG' +#define GDITAG_ICM 'mciG' +#define GDITAG_KMODE_BITMAP 'mbkG' +#define GDITAG_HMGR_LOOKASIDE_LFONT_TYPE ':alG' +#define GDITAG_HMGR_LOOKASIDE_RFONT_TYPE ';alG' +#define GDITAG_HMGR_LOOKASIDE_BRUSH_TYPE '@alG' +#define GDITAG_HMGR_LOOKASIDE_START '0alG' +#define GDITAG_HMGR_LOOKASIDE_DC_TYPE '1alG' +#define GDITAG_HMGR_LOOKASIDE_RGN_TYPE '4alG' +#define GDITAG_HMGR_LOOKASIDE_SURF_TYPE '5alG' +#define GDITAG_HMGR_LOOKASIDE_PAL_TYPE '8alG' +#define GDITAG_LDEV 'vdlG' +#define GDITAG_LOCALEINFO 'dilG' +#define GDITAG_PFE_LINK 'knlG' +#define GDITAG_FONT_MAPPER 'pamG' +#define GDITAG_DISPURF_SORT 'osmG' +#define GDITAG_MULTIFONT 'lumG' +#define GDITAG_NLS 'slnG' +#define GDITAG_OPENGL 'lgoG' +#define GDITAG_OPM 'MPOG' +#define GDITAG_PALETTE 'laPG' +#define GDITAG_PANNING_PDEV 'napG' +#define GDITAG_PATHOBJ 'tapG' +#define GDITAG_PFF_INDEXES 'efpG' +#define GDITAG_PFF 'ffpG' +#define GDITAG_PFT 'tfpG' +#define GDITAG_PLGBLT_DATA 'bgpG' +#define GDITAG_PRINTCLIENTID 'dipG' +#define GDITAG_CLIP_PATHOBJ 'oppG' +#define GDITAG_PROXYPORT 'tppG' +#define GDITAG_PRESENT 'erpG' +#define GDITAG_LFONT_QUICKLOOKUP 'knqG' +#define GDITAG_PALETTE_RGB_XLATE 'bgrG' +#define GDITAG_REGION 'ngrG' +#define GDITAG_SEMAPHORE 'mesG' +#define GDITAG_SPRITE ' psG' +#define GDITAG_METASPRITE 'mpsG' +#define GDITAG_SPRITESCAN 'rpsG' +#define GDITAG_STACKTRACE 'atsG' +#define GDITAG_STRETCHBLT 'htsG' +#define GDITAG_PENSTYLE 'ytsG' +#define GDITAG_SFM 'xusG' +#define GDITAG_TEMP 'pmtG' +#define GDITAG_TEMP_THREADLOCK 'pmTG' +#define GDITAG_TEXTMETRICS 'wmtG' +#define GDITAG_PFF_DATA 'pvtG' +#define GDITAG_TRIANGLE_MESH 'tvtG' +#define GDITAG_TEXT 'txtG' +#define GDITAG_UMODE_BITMAP 'mbuG' +#define GDITAG_ENG_USER_MEM_ALLOC_TABLE 'amUG' +#define GDITAG_UMPD 'pmuG' +#define GDITAG_HDEV 'sdvG' +#define GDITAG_VDEV 'vdVG' +#define GDITAG_MULTISAVEBITS 'smVG' +#define GDITAG_MDSURF 'fsVG' +#define GDITAG_WNDOBJ 'dnwG' +#define GDITAG_PXLATE 'tlxG' +#define GDITAG_UMPDOBJ 'dpxG' +#define GDITAG_FONT_LINK 'flnk' +#define GDITAG_PANNING_SURFACE 'fSAP' +#define GDITAG_PANNING_SHADOWLOCK 'olSP' +#define GDITAG_SINGLEREADERLOCK 'lrsS' +#define GDITAG_TT_FONT_CACHE 'CFTT' +#define GDITAG_TT_FONT 'dftT' +#define GDITAG_VF_FONT 'dftV' +#define GDITAG_W32PIDLOCK 'l23W' +#define GDITAG_HANDLEPUSHLOCK 'lpHG' +#define USERTAG_SERVICE_TABLE 'lacU' +#define USERTAG_MONITOR_MARGIN 'mamU' +#define USERTAG_REDIRECT 'rdrU' +#define USERTAG_ACCEL 'casU' +#define USERTAG_ATTACHINFO 'iasU' +#define USERTAG_ALTTAB 'lasU' +#define USERTAG_DEBUG 'gbsU' +#define USERTAG_CLIPBOARD 'bcsU' +#define USERTAG_CALLBACK 'ccsU' +#define USERTAG_COMPOSITIONPROP 'dcsU' +#define USERTAG_CLIENTTHREADINFO 'icsU' +#define USERTAG_CLASS 'lcsU' +#define USERTAG_SCANCODEMAP 'mcsU' +#define USERTAG_CLIPBOARDPALETTE 'pcsU' +#define USERTAG_COLORS 'rcsU' +#define USERTAG_CHECKPT 'tcsU' +#define USERTAG_CURSOR 'ucsU' +#define USERTAG_COLORVALUES 'vcsU' +#define USERTAG_DDE1 '1dsU' +#define USERTAG_DDE2 '2dsU' +#define USERTAG_DDE4 '4dsU' +#define USERTAG_DDE5 '5dsU' +#define USERTAG_DDE6 '6dsU' +#define USERTAG_DDE7 '7dsU' +#define USERTAG_DDE8 '8dsU' +#define USERTAG_DDE9 '9dsU' +#define USERTAG_DDEa 'AdsU' +#define USERTAG_DDEb 'BdsU' +#define USERTAG_DCE 'cdsU' +#define USERTAG_DDEd 'DdsU' +#define USERTAG_DDE 'EdsU' +#define USERTAG_DEVICEINFO 'IDsU' +#define USERTAG_DISPLAYINFO 'idsU' +#define USERTAG_DRAGDROP 'sdsU' +#define USERTAG_DEVICECHANGE 'vdsU' +#define USERTAG_WSEXCOMPINVALID 'CEsU' +#define USERTAG_ERESOURCE 'resU' +#define USERTAG_EVENT 'vesU' +#define USERTAG_FORWARDTOUCHMESSAGE 'tfsU' +#define USERTAG_GRANTEDHANDLES 'hgsU' +#define USERTAG_GESTUREINFO 'igsU' +#define USERTAG_GLOBALTHREADLOCK 'lgsU' +#define USERTAG_GHOST 'tgsU' +#define USERTAG_HIDDATA 'ahsU' +#define USERTAG_HIDDESC 'DhsU' +#define USERTAG_HOTKEY 'khsU' +#define USERTAG_IMEHOTKEY 'hisU' +#define USERTAG_IME 'misU' +#define USERTAG_W32JOB 'bjsU' +#define USERTAG_W32JOBEXTRA 'xjsU' +#define USERTAG_KBDLAYOUT 'bksU' +#define USERTAG_KBDEXID 'eksU' +#define USERTAG_KBDFILE 'fksU' +#define USERTAG_KBDSTATE 'sksU' +#define USERTAG_KBDTABLE 'tksU' +#define USERTAG_LOOKASIDE 'alsU' +#define USERTAG_LOGDESKTOP 'dlsU' +#define USERTAG_LOCKRECORD 'rlsU' +#define USERTAG_MAGNIFICATION 'gmsU' +#define USERTAG_MIRROR 'imsU' +#define USERTAG_MESSAGE_FILTER 'lmsU' +#define USERTAG_MONITORRECTS 'rmsU' +#define USERTAG_MOVESIZE 'smsU' +#define USERTAG_MENUSTATE 'tmsU' +#define USERTAG_NKAPC 'ansU' +#define USERTAG_NOTIFY 'ynsU' +#define USERTAG_POWERBROADCAST 'bpsU' +#define USERTAG_PROCESSINFO 'ipsU' +#define USERTAG_POPUPMENU 'mpsU' +#define USERTAG_PROFILEUSERNAME 'npsU' +#define USERTAG_POWER 'opsU' +#define USERTAG_PNP 'ppsU' +#define USERTAG_PROFILE 'rpsU' +#define USERTAG_WINDOWARRAY 'wpsU' +#define USERTAG_SQM 'mqsU' +#define USERTAG_QMSG 'mqsU' +#define USERTAG_Q 'uqsU' +#define USERTAG_RTL 'trsU' +#define USERTAG_SMS_ASYNC 'assU' +#define USERTAG_SPB 'bssU' +#define USERTAG_SMS_CAPTURE 'cssU' +#define USERTAG_SHADOW 'dssU' +#define USERTAG_SECURITY 'essU' +#define USERTAG_SENDINPUT 'issU' +#define USERTAG_SENDTOUCHINPUT 'jssU' +#define USERTAG_SMS 'mssU' +#define USERTAG_SMS_STRING 'sssU' +#define USERTAG_SCROLLTRACK 'tssU' +#define USERTAG_SWP 'wssU' +#define USERTAG_SYSTEM 'yssU' +#define USERTAG_TRACKDESKTOP 'dtsU' +#define USERTAG_THREADINFO 'itsU' +#define USERTAG_STACK 'ktsU' +#define USERTAG_TIMER 'mtsU' +#define USERTAG_TOKEN 'otsU' +#define USERTAG_SECTION 'stsU' +#define USERTAG_TEXT 'xtsU' +#define USERTAG_TEXT2 'ytsU' +#define USERTAG_TOUCHINPUTINFO 'ztsU' +#define USERTAG_UNICODEBUFFER 'busU' +#define USERTAG_UIPI_SQM 'susU' +#define USERTAG_VISRGN 'ivsU' +#define USERTAG_VWPL 'lvsU' +#define USERTAG_WINDOW 'dwsU' +#define USERTAG_WINEVENT 'ewsU' +#define USERTAG_WINDOWLIST 'lwsU' +#define USERTAG_WOWTDB 'owsU' +#define USERTAG_WOWPROCESSINFO 'pwsU' +#define USERTAG_WOWTHREADINFO 'twsU' #endif /* _WIN32K_TAGS_H */

14 years, 10 months

[sginsberg] 43865: ...and fix non-KD build for the rest of you.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Oct 31 02:11:43 2009 New Revision: 43865 URL: http://svn.reactos.org/svn/reactos?rev=43865&view=rev Log: ...and fix non-KD build for the rest of you. Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Oct 31 02:11:43 2009 @@ -405,7 +405,9 @@ <file>dbgpool.c</file> <file>freelist.c</file> <file>marea.c</file> - <file>mmdbg.c</file> + <if property="_WINKD_" value ="1"> + <file>mmdbg.c</file> + </if> <file>mmfault.c</file> <file>mminit.c</file> <file>mpw.c</file>

14 years, 10 months

[cgutman] 43864: - Make sure the socket is still open before entering oskittcp - Remove an unused parameter from OskitTCPBind - Return a status value from OskitTCPGetAddress - Add debug print for unhandled error codes

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Oct 31 02:05:31 2009 New Revision: 43864 URL: http://svn.reactos.org/svn/reactos?rev=43864&view=rev Log: - Make sure the socket is still open before entering oskittcp - Remove an unused parameter from OskitTCPBind - Return a status value from OskitTCPGetAddress - Add debug print for unhandled error codes Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sat Oct 31 02:05:31 2009 @@ -90,7 +90,6 @@ TI_DbgPrint(DEBUG_TCP,("AddressToBind - %x:%x\n", AddressToBind.sin_addr, AddressToBind.sin_port)); Status = TCPTranslateError( OskitTCPBind( Connection->SocketContext, - Connection, &AddressToBind, sizeof(AddressToBind) ) ); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Oct 31 02:05:31 2009 @@ -555,7 +555,7 @@ } NTSTATUS TCPTranslateError( int OskitError ) { - NTSTATUS Status = STATUS_UNSUCCESSFUL; + NTSTATUS Status; switch( OskitError ) { case 0: Status = STATUS_SUCCESS; break; @@ -565,7 +565,10 @@ case OSK_ECONNRESET: Status = STATUS_REMOTE_NOT_LISTENING; break; case OSK_EINPROGRESS: case OSK_EAGAIN: Status = STATUS_PENDING; break; - default: Status = STATUS_INVALID_CONNECTION; break; + default: + DbgPrint("OskitTCP returned unhandled error code: %d\n", OskitError); + Status = STATUS_INVALID_CONNECTION; + break; } TI_DbgPrint(DEBUG_TCP,("Error %d -> %x\n", OskitError, Status)); @@ -621,7 +624,6 @@ Status = TCPTranslateError ( OskitTCPBind( Connection->SocketContext, - Connection, &AddressToBind, sizeof(AddressToBind) ) ); @@ -703,6 +705,8 @@ DrainSignals(); Status = TCPTranslateError( OskitTCPClose( Connection->SocketContext ) ); + if (Status == STATUS_SUCCESS) + Connection->SocketContext = NULL; TI_DbgPrint(DEBUG_TCP,("TCPClose finished %x\n", Status)); @@ -867,13 +871,15 @@ OSK_UINT LocalAddress, RemoteAddress; OSK_UI16 LocalPort, RemotePort; PTA_IP_ADDRESS AddressIP = (PTA_IP_ADDRESS)Address; + NTSTATUS Status; ASSERT_LOCKED(&TCPLock); - OskitTCPGetAddress - ( Connection->SocketContext, - &LocalAddress, &LocalPort, - &RemoteAddress, &RemotePort ); + Status = TCPTranslateError(OskitTCPGetAddress(Connection->SocketContext, + &LocalAddress, &LocalPort, + &RemoteAddress, &RemotePort)); + if (!NT_SUCCESS(Status)) + return Status; AddressIP->TAAddressCount = 1; AddressIP->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; @@ -881,7 +887,7 @@ AddressIP->Address[0].Address[0].sin_port = GetRemote ? RemotePort : LocalPort; AddressIP->Address[0].Address[0].in_addr = GetRemote ? RemoteAddress : LocalAddress; - return STATUS_SUCCESS; + return Status; } VOID TCPRemoveIRP( PCONNECTION_ENDPOINT Endpoint, PIRP Irp ) { Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] Sat Oct 31 02:05:31 2009 @@ -127,7 +127,7 @@ void *nam, OSK_UINT namelen ); extern int OskitTCPClose( void *socket ); -extern int OskitTCPBind( void *socket, void *connection, +extern int OskitTCPBind( void *socket, void *nam, OSK_UINT namelen ); extern int OskitTCPAccept( void *socket, void **new_socket, @@ -144,7 +144,7 @@ OSK_UINT *OutLen, OSK_UINT Flags ); -void OskitTCPGetAddress( void *socket, +int OskitTCPGetAddress( void *socket, OSK_UINT *LocalAddress, OSK_UI16 *LocalPort, OSK_UINT *RemoteAddress, Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Sat Oct 31 02:05:31 2009 @@ -76,9 +76,6 @@ void RegisterOskitTCPEventHandlers( POSKITTCP_EVENT_HANDLERS EventHandlers ) { memcpy( &OtcpEvent, EventHandlers, sizeof(OtcpEvent) ); - if( OtcpEvent.PacketSend ) - OS_DbgPrint(OSK_MID_TRACE,("SendPacket handler registered: %x\n", - OtcpEvent.PacketSend)); } void OskitDumpBuffer( OSK_PCHAR Data, OSK_UINT Len ) @@ -169,7 +166,7 @@ return error; } -int OskitTCPBind( void *socket, void *connection, +int OskitTCPBind( void *socket, void *nam, OSK_UINT namelen ) { int error = EFAULT; struct socket *so = socket; @@ -177,6 +174,9 @@ struct sockaddr addr; OS_DbgPrint(OSK_MID_TRACE,("Called, socket = %08x\n", socket)); + + if (!socket) + return OSK_ESHUTDOWN; if( nam ) addr = *((struct sockaddr *)nam); @@ -243,11 +243,18 @@ } int OskitTCPShutdown( void *socket, int disconn_type ) { + if (!socket) + return OSK_ESHUTDOWN; + return soshutdown( socket, disconn_type ); } int OskitTCPClose( void *socket ) { struct socket *so = socket; + + if (!socket) + return OSK_ESHUTDOWN; + so->so_connection = 0; soclose( so ); return 0; @@ -258,6 +265,9 @@ int error; struct uio uio; struct iovec iov; + + if (!socket) + return OSK_ESHUTDOWN; iov.iov_len = Len; iov.iov_base = (char *)Data; @@ -293,6 +303,12 @@ struct inpcb *inp; int namelen = 0, error = 0, s; + if (!socket) + return OSK_ESHUTDOWN; + + if (!new_socket || !AddrOut) + return OSK_EINVAL; + OS_DbgPrint(OSK_MID_TRACE,("OSKITTCP: Doing accept (Finish %d)\n", FinishAccepting)); @@ -436,6 +452,9 @@ { struct mbuf *m; + if (!socket) + return OSK_ESHUTDOWN; + if (size >= MLEN) return OSK_EINVAL; @@ -460,6 +479,9 @@ int error, oldsize = *size; struct mbuf *m; + if (!socket) + return OSK_ESHUTDOWN; + error = sogetopt(socket, level, optname, &m); if (!error) { @@ -482,6 +504,9 @@ int OskitTCPListen( void *socket, int backlog ) { int error; + if (!socket) + return OSK_ESHUTDOWN; + OS_DbgPrint(OSK_MID_TRACE,("Called, socket = %08x\n", socket)); error = solisten( socket, backlog ); OS_DbgPrint(OSK_MID_TRACE,("Ending: %08x\n", error)); @@ -489,32 +514,44 @@ return error; } -void OskitTCPSetAddress( void *socket, +int OskitTCPSetAddress( void *socket, OSK_UINT LocalAddress, OSK_UI16 LocalPort, OSK_UINT RemoteAddress, OSK_UI16 RemotePort ) { struct socket *so = socket; - struct inpcb *inp = (struct inpcb *)so->so_pcb; + struct inpcb *inp; + + if (!socket) + return OSK_ESHUTDOWN; + + inp = (struct inpcb *)so->so_pcb; inp->inp_laddr.s_addr = LocalAddress; inp->inp_lport = LocalPort; inp->inp_faddr.s_addr = RemoteAddress; inp->inp_fport = RemotePort; -} - -void OskitTCPGetAddress( void *socket, + + return 0; +} + +int OskitTCPGetAddress( void *socket, OSK_UINT *LocalAddress, OSK_UI16 *LocalPort, OSK_UINT *RemoteAddress, OSK_UI16 *RemotePort ) { struct socket *so = socket; - struct inpcb *inp = so ? (struct inpcb *)so->so_pcb : NULL; - if( inp ) { - *LocalAddress = inp->inp_laddr.s_addr; - *LocalPort = inp->inp_lport; - *RemoteAddress = inp->inp_faddr.s_addr; - *RemotePort = inp->inp_fport; - } + struct inpcb *inp; + + if (!socket) + return OSK_ESHUTDOWN; + + inp = (struct inpcb *)so->so_pcb; + *LocalAddress = inp->inp_laddr.s_addr; + *LocalPort = inp->inp_lport; + *RemoteAddress = inp->inp_faddr.s_addr; + *RemotePort = inp->inp_fport; + + return 0; } struct ifaddr *ifa_iffind(struct sockaddr *addr, int type)

14 years, 10 months

[sginsberg] 43863: - Add 'simple' implementation of MmDbgCopyMemory to read/write virtual memory in a somewhat safe way (still no support for physical memory). Properly implement KdpCopyMemoryChunks as a wrapper around MmDbgCopyMemory and make most of the remaining unsafe copies use it instead of RtlCopyMemory. This fixes most of the remaining crashes during KD debugging as WinDbg/KD relies on the kernel support to handle bad addresses. - Stub out the remaining missing global variables for the d

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Oct 31 02:02:35 2009 New Revision: 43863 URL: http://svn.reactos.org/svn/reactos?rev=43863&view=rev Log: - Add 'simple' implementation of MmDbgCopyMemory to read/write virtual memory in a somewhat safe way (still no support for physical memory). Properly implement KdpCopyMemoryChunks as a wrapper around MmDbgCopyMemory and make most of the remaining unsafe copies use it instead of RtlCopyMemory. This fixes most of the remaining crashes during KD debugging as WinDbg/KD relies on the kernel support to handle bad addresses. - Stub out the remaining missing global variables for the debugger data block -- fixes some cases of WinDbg failures and gives it a chance to handle errors instead of failing on a NULL read. Several of these variables are for functionality we don't yet implement, so I tried to put them where they are "least wrong". Everything besides the MmLoadedUserImageList variable is left unitialized -- KD should mostly be able to handle this properly. - Define correctly sized KDDEBUGGER_DATA64 for our kernel (needs to be done in a better way). Added: trunk/reactos/ntoskrnl/mm/mmdbg.c (with props) Modified: trunk/reactos/include/psdk/wdbgexts.h trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/kd64/i386/kdsup.c trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kdbreak.c trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/include/psdk/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wdbgexts.h?re… ============================================================================== --- trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -285,7 +285,11 @@ USHORT Gdt64R3CmTeb; GCC_ULONG64 IopNumTriageDumpDataBlocks; GCC_ULONG64 IopTriageDumpDataBlocks; +#if 0 // Longhorn/Vista and later GCC_ULONG64 VfCrashDataBlock; + GCC_ULONG64 MmBadPagesDetected; + GCC_ULONG64 MmZeroedPageSingleBitErrorsDetected; +#endif } KDDEBUGGER_DATA64, *PKDDEBUGGER_DATA64; #endif Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -1057,6 +1057,8 @@ extern POBJECT_TYPE _IoFileObjectType; extern HAL_DISPATCH _HalDispatchTable; extern LIST_ENTRY IopErrorLogListHead; +extern ULONG IopNumTriageDumpDataBlocks; +extern PVOID IopTriageDumpDataBlocks[64]; // // Inlined Functions Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -294,6 +294,20 @@ NTAPI KdpSuspendAllBreakPoints( VOID +); + +// +// Safe memory read & write Support +// +NTSTATUS +NTAPI +KdpCopyMemoryChunks( + IN ULONG64 Address, + IN PVOID Buffer, + IN ULONG TotalSize, + IN ULONG ChunkSize, + IN ULONG Flags, + OUT PULONG ActualSize OPTIONAL ); // Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -18,12 +18,32 @@ extern ULONG MmLowestPhysicalPage; extern ULONG MmHighestPhysicalPage; extern ULONG MmAvailablePages; +extern ULONG MmResidentAvailablePages; extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize; extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; + +extern LIST_ENTRY MmLoadedUserImageList; + +extern ULONG MmNumberOfPagingFiles; + +extern PVOID MmUnloadedDrivers; +extern PVOID MmLastUnloadedDrivers; +extern PVOID MmTriageActionTaken; +extern PVOID KernelVerifier; +extern MM_DRIVER_VERIFIER_DATA MmVerifierData; + +extern SIZE_T MmTotalCommitLimit; +extern SIZE_T MmTotalCommittedPages; +extern SIZE_T MmSharedCommit; +extern SIZE_T MmDriverCommit; +extern SIZE_T MmProcessCommit; +extern SIZE_T MmPagedPoolCommit; +extern SIZE_T MmPeakCommitment; +extern SIZE_T MmtotalCommitLimitMaximum; struct _KTRAP_FRAME; struct _EPROCESS; @@ -33,7 +53,7 @@ typedef ULONG PFN_TYPE, *PPFN_TYPE; // -//MmDbgCopyMemory Flags +// MmDbgCopyMemory Flags // #define MMDBG_COPY_WRITE 0x00000001 #define MMDBG_COPY_PHYSICAL 0x00000002 @@ -369,6 +389,20 @@ extern PMMPFN MmPfnDatabase; +typedef struct _MMPFNLIST +{ + PFN_NUMBER Total; + MMLISTS ListName; + PFN_NUMBER Flink; + PFN_NUMBER Blink; +} MMPFNLIST, *PMMPFNLIST; + +extern MMPFNLIST MmZeroedPageListHead; +extern MMPFNLIST MmFreePageListHead; +extern MMPFNLIST MmStandbyPageListHead; +extern MMPFNLIST MmModifiedPageListHead; +extern MMPFNLIST MmModifiedNoWritePageListHead; + typedef struct _MM_PAGEOP { /* Type of operation. */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -39,6 +39,8 @@ ULONG IoOtherOperationCount = 0; LARGE_INTEGER IoOtherTransferCount = {{0, 0}}; KSPIN_LOCK IoStatisticsLock = 0; +ULONG IopNumTriageDumpDataBlocks; +PVOID IopTriageDumpDataBlocks[64]; GENERIC_MAPPING IopFileMapping = { FILE_GENERIC_READ, Modified: trunk/reactos/ntoskrnl/kd64/i386/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/i386/kdsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -160,7 +160,7 @@ Length); /* Return status */ - return (*ActualLength != 0) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + return *ActualLength != 0 ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } NTSTATUS @@ -182,7 +182,7 @@ Length); /* Return status */ - return (*ActualLength != 0) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + return *ActualLength != 0 ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } NTSTATUS @@ -209,12 +209,13 @@ (ULONG_PTR)&KiProcessorBlock[Processor]-> ProcessorState); - /* Copy the memory */ - RtlCopyMemory(Buffer, ControlStart, Length); - - /* Finish up */ - *ActualLength = Length; - return STATUS_SUCCESS; + /* Read the control state safely */ + return KdpCopyMemoryChunks((ULONG_PTR)Buffer, + ControlStart, + Length, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + ActualLength); } else { @@ -243,12 +244,13 @@ (ULONG_PTR)&KiProcessorBlock[Processor]-> ProcessorState); - /* Copy the memory */ - RtlCopyMemory(ControlStart, Buffer, Length); - - /* Finish up */ - *ActualLength = Length; - return STATUS_SUCCESS; + /* Write the control state safely */ + return KdpCopyMemoryChunks((ULONG_PTR)Buffer, + ControlStart, + Length, + 0, + MMDBG_COPY_UNSAFE, + ActualLength); } else { Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -24,65 +24,72 @@ IN ULONG Flags, OUT PULONG ActualSize OPTIONAL) { - ULONG Length; NTSTATUS Status; - - /* Check if this is physical or virtual copy */ - if (Flags & MMDBG_COPY_PHYSICAL) - { - /* Fail physical memory read/write for now */ - if (Flags & MMDBG_COPY_WRITE) - { - KdpDprintf("KdpCopyMemoryChunks: Failing write for Physical Address 0x%I64x Length: %x\n", - Address, - TotalSize); + ULONG RemainingLength, CopyChunk; + + /* Check if we didn't get a chunk size or if it is too big */ + if (ChunkSize == 0) + { + /* Default to 4 byte chunks */ + ChunkSize = 4; + } + else if (ChunkSize > MMDBG_COPY_MAX_SIZE) + { + /* Normalize to maximum size */ + ChunkSize = MMDBG_COPY_MAX_SIZE; + } + + /* Copy the whole range in page aligned chunks */ + RemainingLength = TotalSize; + CopyChunk = 1; + while (RemainingLength > 0) + { + /* + * Determine the best chunk size for this round. + * The ideal size is page aligned, isn't larger than the + * the remaining length and respects the chunk limit. + */ + while (((CopyChunk * 2) <= RemainingLength) && + (CopyChunk < ChunkSize) && + ((Address & ((CopyChunk * 2) - 1)) == 0)) + { + /* Increase it */ + CopyChunk = CopyChunk * 2; } - else - { - KdpDprintf("KdpCopyMemoryChunks: Failing read for Physical Address 0x%I64x Length: %x\n", - Address, - TotalSize); + + /* + * The chunk size can be larger than the remaining size if this isn't + * the first round, so check if we need to shrink it back + */ + while (CopyChunk > RemainingLength) + { + /* Shrink it */ + CopyChunk /= 2; } - /* Return an error */ - Length = 0; - Status = STATUS_UNSUCCESSFUL; - } - else - { - /* Protect against NULL */ - if (!Address) - { - if (ActualSize) *ActualSize = 0; - return STATUS_UNSUCCESSFUL; + /* Do the copy */ + Status = MmDbgCopyMemory(Address, + Buffer, + CopyChunk, + Flags); + if (!NT_SUCCESS(Status)) + { + /* Copy failed, break out */ + break; } - /* Check if this is read or write */ - if (Flags & MMDBG_COPY_WRITE) - { - /* Do the write */ - RtlCopyMemory((PVOID)(ULONG_PTR)Address, - Buffer, - TotalSize); - } - else - { - /* Do the read */ - RtlCopyMemory(Buffer, - (PVOID)(ULONG_PTR)Address, - TotalSize); - } - - /* Set size and status */ - Length = TotalSize; - Status = STATUS_SUCCESS; - } - - /* Return the actual length if requested */ - if (ActualSize) *ActualSize = Length; - - /* Return status */ - return Status; + /* Update pointers and length for the next run */ + Address = Address + CopyChunk; + Buffer = (PVOID)((ULONG_PTR)Buffer + CopyChunk); + RemainingLength = RemainingLength - CopyChunk; + } + + /* + * Return the size we managed to copy + * and return success if we could copy the whole range + */ + if (ActualSize) *ActualSize = TotalSize - RemainingLength; + return RemainingLength == 0 ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } VOID @@ -269,7 +276,7 @@ IN PCONTEXT Context, IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange) { - USHORT InstructionCount; + ULONG InstructionCount; BOOLEAN HadBreakpoints; /* Setup common stuff available for all CPU architectures */ @@ -285,10 +292,12 @@ sizeof(DBGKD_ANY_CONTROL_REPORT)); /* Now copy the instruction stream and set the count */ - RtlCopyMemory(&WaitStateChange->ControlReport.InstructionStream[0], - (PVOID)(ULONG_PTR)WaitStateChange->ProgramCounter, - DBGKD_MAXSTREAM); - InstructionCount = DBGKD_MAXSTREAM; + KdpCopyMemoryChunks((ULONG_PTR)WaitStateChange->ProgramCounter, + &WaitStateChange->ControlReport.InstructionStream[0], + DBGKD_MAXSTREAM, + 0, + MMDBG_COPY_UNSAFE, + &InstructionCount); WaitStateChange->ControlReport.InstructionCount = InstructionCount; /* Clear all the breakpoints in this region */ @@ -299,9 +308,12 @@ if (HadBreakpoints) { /* Copy the instruction stream again, this time without breakpoints */ - RtlCopyMemory(&WaitStateChange->ControlReport.InstructionStream[0], - (PVOID)(ULONG_PTR)WaitStateChange->ProgramCounter, - WaitStateChange->ControlReport.InstructionCount); + KdpCopyMemoryChunks((ULONG_PTR)WaitStateChange->ProgramCounter, + &WaitStateChange->ControlReport.InstructionStream[0], + InstructionCount, + 0, + MMDBG_COPY_UNSAFE, + NULL); } } @@ -1297,6 +1309,7 @@ PSTRING ExtraData; STRING Data, Header; DBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange; + ULONG PathNameLength; KCONTINUE_STATUS Status; /* Start wait loop */ @@ -1317,14 +1330,27 @@ WaitStateChange.u.LoadSymbols.CheckSum = SymbolInfo->CheckSum; WaitStateChange.u.LoadSymbols.SizeOfImage = SymbolInfo->SizeOfImage; - /* Check if we have a symbol name */ + /* Check if we have a path name */ if (PathName) { - /* Setup the information */ - WaitStateChange.u.LoadSymbols.PathNameLength = PathName->Length; - RtlCopyMemory(KdpPathBuffer, PathName->Buffer, PathName->Length); + /* Copy it to the path buffer */ + KdpCopyMemoryChunks((ULONG_PTR)PathName->Buffer, + KdpPathBuffer, + PathName->Length, + 0, + MMDBG_COPY_UNSAFE, + &PathNameLength); + + /* Null terminate */ + KdpPathBuffer[PathNameLength] = ANSI_NULL; + PathNameLength++; + + /* Set the path length */ + WaitStateChange.u.LoadSymbols.PathNameLength = PathNameLength; + + /* Set up the data */ Data.Buffer = KdpPathBuffer; - Data.Length = WaitStateChange.u.LoadSymbols.PathNameLength; + Data.Length = PathNameLength; ExtraData = &Data; } else Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdbreak.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -21,6 +21,7 @@ { KD_BREAKPOINT_TYPE Content; ULONG i; + NTSTATUS Status; /* Loop current breakpoints */ for (i = 0; i < KD_BREAKPOINT_MAX; i++) @@ -51,15 +52,39 @@ if (i == KD_BREAKPOINT_MAX) return 0; /* Save the old instruction */ - RtlCopyMemory(&Content, Address, KD_BREAKPOINT_SIZE); + Status = KdpCopyMemoryChunks((ULONG_PTR)Address, + &Content, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE, + NULL); + + if (!NT_SUCCESS(Status)) + { + /* TODO: Set it as a owed breakpoint */ + KdpDprintf("Failed to set breakpoint at address 0x%p\n", Address); + return 0; + } /* Write the entry */ KdpBreakpointTable[i].Address = Address; KdpBreakpointTable[i].Content = Content; KdpBreakpointTable[i].Flags = KdpBreakpointActive; - /* Write the breakpoint and return the handle */ - RtlCopyMemory(Address, &KdpBreakpointInstruction, KD_BREAKPOINT_SIZE); + /* Write the breakpoint */ + Status = KdpCopyMemoryChunks((ULONG_PTR)Address, + &KdpBreakpointInstruction, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* This should never happen */ + KdpDprintf("Unable to write breakpoint to address 0x%p\n", Address); + } + + /* Return the breakpoint handle */ return i + 1; } @@ -67,6 +92,8 @@ NTAPI KdpLowWriteContent(IN ULONG BpIndex) { + NTSTATUS Status; + /* Make sure that the breakpoint is actually active */ if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointPending) { @@ -83,9 +110,20 @@ } /* We have an active breakpoint with an instruction to bring back. Do it. */ - RtlCopyMemory(KdpBreakpointTable[BpIndex].Address, - &KdpBreakpointTable[BpIndex].Content, - KD_BREAKPOINT_SIZE); + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex]. + Address, + &KdpBreakpointTable[BpIndex].Content, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* TODO: Set it as a owed breakpoint */ + KdpDprintf("Failed to delete breakpoint at address 0x%p\n", + KdpBreakpointTable[BpIndex].Address); + return FALSE; + } /* Everything went fine, return */ return TRUE; @@ -95,6 +133,8 @@ NTAPI KdpLowRestoreBreakpoint(IN ULONG BpIndex) { + NTSTATUS Status; + /* Were we not able to remove it earlier? */ if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointExpired) { @@ -111,9 +151,20 @@ } /* Ok, we actually have to overwrite the instruction now */ - RtlCopyMemory(KdpBreakpointTable[BpIndex].Address, - &KdpBreakpointInstruction, - KD_BREAKPOINT_SIZE); + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex]. + Address, + &KdpBreakpointInstruction, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* FIXME: Set it as a owed breakpoint */ + KdpDprintf("Failed to restore breakpoint at address 0x%p\n", + KdpBreakpointTable[BpIndex].Address); + return FALSE; + } /* Clear any possible previous pending flag and return success */ KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointPending; Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -391,22 +391,22 @@ {(ULONG_PTR)&PsActiveProcessHead}, {(ULONG_PTR)&PspCidTable}, {(ULONG_PTR)&ExpSystemResourcesList}, - {0}, // ExpPagedPoolDescriptor - {0}, // ExpNumberOfPagedPools + {(ULONG_PTR)ExpPagedPoolDescriptor}, + {(ULONG_PTR)&ExpNumberOfPagedPools}, {(ULONG_PTR)&KeTimeIncrement}, {(ULONG_PTR)&KeBugcheckCallbackListHead}, {(ULONG_PTR)KiBugCheckData}, {(ULONG_PTR)&IopErrorLogListHead}, {(ULONG_PTR)&ObpRootDirectoryObject}, {(ULONG_PTR)&ObpTypeObjectType}, - {0}, // MmSystemCacheStart - {0}, // MmSystemCacheEnd - {0}, // MmSystemCacheWs + {(ULONG_PTR)&MmSystemCacheStart}, + {(ULONG_PTR)&MmSystemCacheEnd}, + {(ULONG_PTR)&MmSystemCacheWs}, {(ULONG_PTR)&MmPfnDatabase}, {(ULONG_PTR)MmSystemPtesStart}, {(ULONG_PTR)MmSystemPtesEnd}, - {0}, // MmSubsectionBase - {0}, // MmNumberOfPagingFiles + {(ULONG_PTR)&MmSubsectionBase}, + {(ULONG_PTR)&MmNumberOfPagingFiles}, {(ULONG_PTR)&MmLowestPhysicalPage}, {(ULONG_PTR)&MmHighestPhysicalPage}, {(ULONG_PTR)&MmNumberOfPhysicalPages}, @@ -419,21 +419,21 @@ {(ULONG_PTR)&MmPagedPoolInfo}, PAGE_SIZE, {(ULONG_PTR)&MmSizeOfPagedPoolInBytes}, - {0}, // MmTotalCommitLimit - {0}, // MmTotalCommittedPages - {0}, // MmSharedCommit - {0}, // MmDriverCommit - {0}, // MmProcessCommit - {0}, // MmPagedPoolCommit + {(ULONG_PTR)&MmTotalCommitLimit}, + {(ULONG_PTR)&MmTotalCommittedPages}, + {(ULONG_PTR)&MmSharedCommit}, + {(ULONG_PTR)&MmDriverCommit}, + {(ULONG_PTR)&MmProcessCommit}, + {(ULONG_PTR)&MmPagedPoolCommit}, {0}, - {0}, // MmZeroedPageListHead - {0}, // MmFreePageListHead - {0}, // MmStandbyPageListHead - {0}, // MmModifiedPageListHead - {0}, // MmModifiedNoWritePageListHead - {0}, // MmAvailablePages - {0}, // MmResidentAvailablePages - {0}, // PoolTrackTable + {(ULONG_PTR)&MmZeroedPageListHead}, + {(ULONG_PTR)&MmFreePageListHead}, + {(ULONG_PTR)&MmStandbyPageListHead}, + {(ULONG_PTR)&MmModifiedPageListHead}, + {(ULONG_PTR)&MmModifiedNoWritePageListHead}, + {(ULONG_PTR)&MmAvailablePages}, + {(ULONG_PTR)&MmResidentAvailablePages}, + {(ULONG_PTR)&PoolTrackTable}, {(ULONG_PTR)&NonPagedPoolDescriptor}, {(ULONG_PTR)&MmHighestUserAddress}, {(ULONG_PTR)&MmSystemRangeStart}, @@ -442,19 +442,19 @@ {(ULONG_PTR)KdPrintDefaultCircularBuffer + 1}, {(ULONG_PTR)&KdPrintWritePointer}, {(ULONG_PTR)&KdPrintRolloverCount}, - {0}, // MmLoadedUserImageList + {(ULONG_PTR)&MmLoadedUserImageList}, {(ULONG_PTR)&NtBuildLab}, {0}, {(ULONG_PTR)KiProcessorBlock}, - {0}, // MmUnloadedDrivers - {0}, // MmLastUnloadedDrivers - {0}, // MmTriageActionTaken - {0}, // MmSpecialPoolTag - {0}, // KernelVerifier - {0}, // MmVerifierData - {0}, // MmAllocatedNonPagedPool - {0}, // MmPeakCommitment - {0}, // MmtotalCommitLimitMaximum + {(ULONG_PTR)&MmUnloadedDrivers}, + {(ULONG_PTR)&MmLastUnloadedDrivers}, + {(ULONG_PTR)&MmTriageActionTaken}, + {(ULONG_PTR)&MmSpecialPoolTag}, + {(ULONG_PTR)&KernelVerifier}, + {(ULONG_PTR)&MmVerifierData}, + {(ULONG_PTR)&MmAllocatedNonPagedPool}, + {(ULONG_PTR)&MmPeakCommitment}, + {(ULONG_PTR)&MmtotalCommitLimitMaximum}, {(ULONG_PTR)&CmNtCSDVersion}, {(ULONG_PTR)&MmPhysicalMemoryBlock}, {(ULONG_PTR)&MmSessionBase}, @@ -539,6 +539,6 @@ 0, 0, #endif - {0}, // IopNumTriageDumpDataBlocks - {0}, // IopTriageDumpDataBlocks + {(ULONG_PTR)&IopNumTriageDumpDataBlocks}, + {(ULONG_PTR)IopTriageDumpDataBlocks}, }; Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -54,6 +54,9 @@ ULONG MmUserProbeAddress; PVOID MmHighestUserAddress; PVOID MmSystemRangeStart; +PVOID MmSystemCacheStart; +PVOID MmSystemCacheEnd; +MMSUPPORT MmSystemCacheWs; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -21,8 +21,11 @@ /* GLOBALS ********************************************************************/ +ULONG ExpNumberOfPagedPools; POOL_DESCRIPTOR NonPagedPoolDescriptor; +PPOOL_DESCRIPTOR ExpPagedPoolDescriptor[16 + 1]; PPOOL_DESCRIPTOR PoolVector[2]; +PVOID PoolTrackTable; PKGUARDED_MUTEX ExpPagedPoolMutex; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -216,6 +216,12 @@ ULONG MmUserProbeAddress; PVOID MmHighestUserAddress; PVOID MmSystemRangeStart; + + + +PVOID MmSystemCacheStart; +PVOID MmSystemCacheEnd; +MMSUPPORT MmSystemCacheWs; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -87,7 +87,10 @@ C_ASSERT(sizeof(POOL_HEADER) == 8); C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY)); +extern ULONG ExpNumberOfPagedPools; extern POOL_DESCRIPTOR NonPagedPoolDescriptor; +extern PPOOL_DESCRIPTOR ExpPagedPoolDescriptor[16 + 1]; +extern PVOID PoolTrackTable; // // END FIXFIX @@ -156,6 +159,12 @@ extern PVOID MiSessionSpaceEnd; extern ULONG MmSizeOfPagedPoolInBytes; extern PMMPTE MmSystemPagePtes; +extern PVOID MmSystemCacheStart; +extern PVOID MmSystemCacheEnd; +extern MMSUPPORT MmSystemCacheWs; +extern SIZE_T MmAllocatedNonPagedPool; +extern ULONG_PTR MmSubsectionBase; +extern ULONG MmSpecialPoolTag; NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -24,6 +24,8 @@ PFN_NUMBER MiStartOfInitialPoolFrame, MiEndOfInitialPoolFrame; KGUARDED_MUTEX MmPagedPoolMutex; MM_PAGED_POOL_INFO MmPagedPoolInfo; +SIZE_T MmAllocatedNonPagedPool; +ULONG MmSpecialPoolTag; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -51,6 +51,22 @@ PPHYSICAL_PAGE MmPfnDatabase; ULONG MmAvailablePages; +ULONG MmResidentAvailablePages; + +SIZE_T MmTotalCommitLimit; +SIZE_T MmTotalCommittedPages; +SIZE_T MmSharedCommit; +SIZE_T MmDriverCommit; +SIZE_T MmProcessCommit; +SIZE_T MmPagedPoolCommit; +SIZE_T MmPeakCommitment; +SIZE_T MmtotalCommitLimitMaximum; + +MMPFNLIST MmZeroedPageListHead; +MMPFNLIST MmFreePageListHead; +MMPFNLIST MmStandbyPageListHead; +MMPFNLIST MmModifiedPageListHead; +MMPFNLIST MmModifiedNoWritePageListHead; /* List of pages allocated to the MC_USER Consumer */ static LIST_ENTRY UserPageListHead; Added: trunk/reactos/ntoskrnl/mm/mmdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmdbg.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmdbg.c (added) +++ trunk/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -1,0 +1,108 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/mm/mmdbg.c + * PURPOSE: Memory Manager support routines for the Kernel Debugger + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +MmDbgCopyMemory(IN ULONG64 Address, + IN PVOID Buffer, + IN ULONG Size, + IN ULONG Flags) +{ + NTSTATUS Status; + + /* For now, this must be a "unsafe" copy */ + ASSERT(Flags & MMDBG_COPY_UNSAFE); + + /* We only handle 1, 2, 4 and 8 byte requests */ + if ((Size != 1) && + (Size != 2) && + (Size != 4) && + (Size != MMDBG_COPY_MAX_SIZE)) + { + /* Invalid size, fail */ + return STATUS_INVALID_PARAMETER_3; + } + + /* The copy must be aligned too */ + if ((Address & (Size - 1)) != 0) + { + /* Fail */ + return STATUS_INVALID_PARAMETER_3; + } + + /* No physical memory support yet */ + if (Flags & MMDBG_COPY_PHYSICAL) + { + /* Fail */ + KdpDprintf("MmDbgCopyMemory: Failing %s for Physical Address 0x%I64x\n", + Flags & MMDBG_COPY_WRITE ? "write" : "read", + Address); + return STATUS_UNSUCCESSFUL; + } + + /* Simple check for invalid address */ + if ((MiAddressToPde((ULONG_PTR)Address)->u.Hard.Valid == 0) || + (MiAddressToPte((ULONG_PTR)Address)->u.Hard.Valid == 0)) + { + /* Fail */ + KdpDprintf("MmDbgCopyMemory: Failing %s for invalid Address 0x%p\n", + Flags & MMDBG_COPY_WRITE ? "write" : "read", + (PVOID)(ULONG_PTR)Address); + return STATUS_UNSUCCESSFUL; + } + + /* If we are going to write to it then make sure it is writeable too */ + if ((Flags & MMDBG_COPY_WRITE) && + (!MI_IS_PAGE_WRITEABLE(MiAddressToPte((ULONG_PTR)Address)))) + { + /* Fail */ + KdpDprintf("MmDbgCopyMemory: Failing write for Address 0x%p\n", + (PVOID)(ULONG_PTR)Address); + return STATUS_UNSUCCESSFUL; + } + + /* Use SEH to try to catch anything else somewhat cleanly */ + _SEH2_TRY + { + /* Check if this is read or write */ + if (Flags & MMDBG_COPY_WRITE) + { + /* Do the write */ + RtlCopyMemory((PVOID)(ULONG_PTR)Address, + Buffer, + Size); + } + else + { + /* Do the read */ + RtlCopyMemory(Buffer, + (PVOID)(ULONG_PTR)Address, + Size); + } + + /* Copy succeeded */ + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Return status */ + return Status; +} Propchange: trunk/reactos/ntoskrnl/mm/mmdbg.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -424,6 +424,9 @@ /* Initialize working sets */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); + /* Initialize the user mode image list */ + InitializeListHead(&MmLoadedUserImageList); + /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -78,6 +78,7 @@ /* Number of paging files */ static ULONG MiPagingFileCount; +ULONG MmNumberOfPagingFiles; /* Number of pages that are available for swapping */ ULONG MiFreeSwapPages; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -70,6 +70,8 @@ /* GLOBALS *******************************************************************/ POBJECT_TYPE MmSectionObjectType = NULL; + +ULONG_PTR MmSubsectionBase; static GENERIC_MAPPING MmpSectionMapping = { STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY, Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -28,10 +28,17 @@ /* GLOBALS *******************************************************************/ LIST_ENTRY PsLoadedModuleList; +LIST_ENTRY MmLoadedUserImageList; KSPIN_LOCK PsLoadedModuleSpinLock; ULONG_PTR PsNtosImageBase; KMUTANT MmSystemLoadLock; extern ULONG NtGlobalFlag; + +PVOID MmUnloadedDrivers; +PVOID MmLastUnloadedDrivers; +PVOID MmTriageActionTaken; +PVOID KernelVerifier; +MM_DRIVER_VERIFIER_DATA MmVerifierData; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -405,6 +405,7 @@ <file>dbgpool.c</file> <file>freelist.c</file> <file>marea.c</file> + <file>mmdbg.c</file> <file>mmfault.c</file> <file>mminit.c</file> <file>mpw.c</file>

14 years, 10 months

[sginsberg] 43862: - Clarify a check and don't cast KPCR->GDT to PKIPCR (spotted by Timo).

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Oct 31 01:39:16 2009 New Revision: 43862 URL: http://svn.reactos.org/svn/reactos?rev=43862&view=rev Log: - Clarify a check and don't cast KPCR->GDT to PKIPCR (spotted by Timo). Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] Sat Oct 31 01:39:16 2009 @@ -27,10 +27,10 @@ IN ULONG Offset, IN PKGDTENTRY Descriptor) { - /* Make sure the offset is inside the allowed range */ - if (!((Offset) < (KGDT_NUMBER * sizeof(KGDTENTRY)))) - { - /* It isn't, fail */ + /* Make sure the offset isn't outside the allowed range */ + if (Offset >= (KGDT_NUMBER * sizeof(KGDTENTRY))) + { + /* It is, fail */ return STATUS_ACCESS_VIOLATION; } @@ -46,7 +46,7 @@ { /* Get the descriptor entry from the GDT */ RtlCopyMemory(Descriptor, - (PCHAR)((PKIPCR)KeGetPcr()->GDT) + Offset, + (PVOID)(((ULONG_PTR)KeGetPcr()->GDT) + Offset), sizeof(KGDTENTRY)); /* Check if this is the TEB selector */

14 years, 10 months

[cgutman] 43861: - Implement OskitTCPSetSockOpt and OskitTCPGetSockOpt (currently unused)

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Oct 31 01:24:38 2009 New Revision: 43861 URL: http://svn.reactos.org/svn/reactos?rev=43861&view=rev Log: - Implement OskitTCPSetSockOpt and OskitTCPGetSockOpt (currently unused) Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] Sat Oct 31 01:24:38 2009 @@ -150,6 +150,18 @@ OSK_UINT *RemoteAddress, OSK_UI16 *RemotePort ); +int OskitTCPGetSockOpt(void *socket, + int level, + int optname, + char *buffer, + int *size); + +int OskitTCPSetSockOpt(void *socket, + int level, + int optname, + char *buffer, + int size); + #undef errno void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ); Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Sat Oct 31 01:24:38 2009 @@ -428,6 +428,57 @@ /* The buffer Ip is freed by tcp_input */ } +int OskitTCPSetSockOpt(void *socket, + int level, + int optname, + char *buffer, + int size) +{ + struct mbuf *m; + + if (size >= MLEN) + return OSK_EINVAL; + + m = m_get(M_WAIT, MT_SOOPTS); + if (!m) + return OSK_ENOMEM; + + m->m_len = size; + + memcpy(m->m_data, buffer, size); + + /* m is freed by sosetopt */ + return sosetopt(socket, level, optname, m); +} + +int OskitTCPGetSockOpt(void *socket, + int level, + int optname, + char *buffer, + int *size) +{ + int error, oldsize = *size; + struct mbuf *m; + + error = sogetopt(socket, level, optname, &m); + if (!error) + { + *size = m->m_len; + + if (!buffer || oldsize < m->m_len) + { + m_freem(m); + return OSK_EINVAL; + } + + memcpy(buffer, m->m_data, m->m_len); + + m_freem(m); + } + + return error; +} + int OskitTCPListen( void *socket, int backlog ) { int error;

14 years, 10 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-diffs October 2009