Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[cgutman] 41941: - Stop reporting that we are NDIS 5.1 until S/G DMA is implemented in HAL so unified 2K/XP drivers don't try to use it - Enable a debug print to notify that attempting to use S/G is about to crash ROS - Thanks to niski for testing

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jul 13 21:16:19 2009 New Revision: 41941 URL: http://svn.reactos.org/svn/reactos?rev=41941&view=rev Log: - Stop reporting that we are NDIS 5.1 until S/G DMA is implemented in HAL so unified 2K/XP drivers don't try to use it - Enable a debug print to notify that attempting to use S/G is about to crash ROS - Thanks to niski for testing Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Mon Jul 13 21:16:19 2009 @@ -29,7 +29,7 @@ #endif /* the version of NDIS we claim to be */ -#define NDIS_VERSION 0x00050001 +#define NDIS_VERSION 0x00050000 #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define NDIS_TAG 0x4e4d4953 Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Mon Jul 13 21:16:19 2009 @@ -509,7 +509,7 @@ } else { if (Adapter->NdisMiniportBlock.ScatterGatherListSize != 0) { - NDIS_DbgPrint(MAX_TRACE, ("Using Scatter/Gather DMA\n")); + NDIS_DbgPrint(MIN_TRACE, ("Using Scatter/Gather DMA\n")); NdisQueryPacket(Packet, NULL,

15 years, 5 months

[fireball] 41940: - Fix formatting.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jul 13 16:50:08 2009 New Revision: 41940 URL: http://svn.reactos.org/svn/reactos?rev=41940&view=rev Log: - Fix formatting. Modified: trunk/reactos/ReactOS-generic.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Jul 13 16:50:08 2009 @@ -85,12 +85,12 @@ <include host="true" root="intermediate">include</include> <include host="true">include/reactos</include> <include host="true">include/reactos/wine</include> - + <group compilerset="gcc"> <compilerflag>-Wall</compilerflag> <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> - <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> - <compilerflag compiler="as">-gstabs+</compilerflag> + <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> + <compilerflag compiler="as">-gstabs+</compilerflag> </group> <group compilerset="msc"> @@ -99,7 +99,7 @@ <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag> </group> - + <group compilerset="gcc"> <if property="OPTIMIZE" value="1"> <compilerflag>-Os</compilerflag> @@ -149,6 +149,6 @@ <compilerflag>/GS-</compilerflag> </group> - + <define name="_USE_32BIT_TIME_T" /> </group>

15 years, 5 months

[jimtabor] 41939: - Half-implement MmPageEntireDriver and use it to set the module instance for win32k. ATM, it does not set the entry pageable. - I mean no disrespect to the Arm developers, I'm an admire of your great work with ReactOS! By my commits you can see the need for the offset address when calling internal procs in win32k. - References: MmPageEntireDriver, http://www.osronline.com/ddkx/kmarch/k106_7os2.htm

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jul 13 09:00:17 2009 New Revision: 41939 URL: http://svn.reactos.org/svn/reactos?rev=41939&view=rev Log: - Half-implement MmPageEntireDriver and use it to set the module instance for win32k. ATM, it does not set the entry pageable. - I mean no disrespect to the Arm developers, I'm an admire of your great work with ReactOS! By my commits you can see the need for the offset address when calling internal procs in win32k. - References: MmPageEntireDriver, http://www.osronline.com/ddkx/kmarch/k106_7os2.htm Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c trunk/reactos/subsystems/win32/win32k/main/dllmain.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] Mon Jul 13 09:00:17 2009 @@ -119,7 +119,8 @@ // // We should find the driver loader entry and return its base address // - UNIMPLEMENTED; + PLDR_DATA_TABLE_ENTRY pLdrDataTabEntry = MiLookupDataTableEntry(AddressWithinSection); + if (pLdrDataTabEntry) return pLdrDataTabEntry->DllBase; return NULL; } Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Mon Jul 13 09:00:17 2009 @@ -26,6 +26,8 @@ #define NDEBUG #include <debug.h> + +HANDLE hModuleWin; PGDI_HANDLE_TABLE INTERNAL_CALL GDIOBJ_iAllocHandleTable(OUT PSECTION_OBJECT *SectionObject); BOOL INTERNAL_CALL GDI_CleanupForProcess (struct _EPROCESS *Process); @@ -387,6 +389,8 @@ return STATUS_UNSUCCESSFUL; } + hModuleWin = MmPageEntireDriver(DriverEntry); + /* * Register Object Manager Callbacks */

15 years, 5 months

[jimtabor] 41938: - Fix build.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jul 13 07:55:03 2009 New Revision: 41938 URL: http://svn.reactos.org/svn/reactos?rev=41938&view=rev Log: - Fix build. Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Mon Jul 13 07:55:03 2009 @@ -1,5 +1,7 @@ #ifndef __INCLUDE_NAPI_WIN32_H #define __INCLUDE_NAPI_WIN32_H + +extern HINSTANCE hModClient; // This should replace (PROCESSINFO)->hModUser typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP;

15 years, 5 months

[jimtabor] 41937: - Add initialization of system atoms and fix build.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jul 13 07:49:58 2009 New Revision: 41937 URL: http://svn.reactos.org/svn/reactos?rev=41937&view=rev Log: - Add initialization of system atoms and fix build. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Mon Jul 13 07:49:58 2009 @@ -33,14 +33,38 @@ #define NDEBUG #include <debug.h> +BOOL InitSysParams(); + +/* GLOBALS *******************************************************************/ + ERESOURCE UserLock; ATOM AtomMessage; // Window Message atom. BOOL gbInitialized; - -BOOL -InitSysParams(); - -/* FUNCTIONS **********************************************************/ +HINSTANCE hModClient = NULL; + +/* PRIVATE FUNCTIONS *********************************************************/ + +static +NTSTATUS FASTCALL +InitUserAtoms(VOID) +{ + + gpsi->atomSysClass[ICLS_MENU] = 32768; + gpsi->atomSysClass[ICLS_DESKTOP] = 32769; + gpsi->atomSysClass[ICLS_DIALOG] = 32770; + gpsi->atomSysClass[ICLS_SWITCH] = 32771; + gpsi->atomSysClass[ICLS_ICONTITLE] = 32772; + gpsi->atomSysClass[ICLS_TOOLTIPS] = 32774; + + AtomMessage = IntAddGlobalAtom(L"Message", TRUE); + gpsi->atomSysClass[ICLS_HWNDMESSAGE] = AtomMessage; + + DPRINT("AtomMessage -> %x\n", AtomMessage); + + return STATUS_SUCCESS; +} + +/* FUNCTIONS *****************************************************************/ NTSTATUS FASTCALL InitUserImpl(VOID) @@ -71,6 +95,8 @@ DPRINT("Global Server Data -> %x\n", gpsi); } } + + InitUserAtoms(); InitSysParams();

15 years, 5 months

[jimtabor] 41936: - Implement NtUserInitializeClientPfnArrays, tested and will be needed in later commits.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jul 13 07:37:00 2009 New Revision: 41936 URL: http://svn.reactos.org/svn/reactos?rev=41936&view=rev Log: - Implement NtUserInitializeClientPfnArrays, tested and will be needed in later commits. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Mon Jul 13 07:37:00 2009 @@ -364,9 +364,35 @@ PPFNCLIENTWORKER pfnClientWorker, HINSTANCE hmodUser) { - UNIMPLEMENTED - - return STATUS_UNSUCCESSFUL; + NTSTATUS Status = STATUS_SUCCESS; + DPRINT("Enter NtUserInitializeClientPfnArrays User32 0x%x\n",hmodUser); + UserEnterExclusive(); + + _SEH2_TRY + { + ProbeForRead( pfnClientA, sizeof(PFNCLIENT), 1); + ProbeForRead( pfnClientW, sizeof(PFNCLIENT), 1); + ProbeForRead( pfnClientWorker, sizeof(PFNCLIENTWORKER), 1); + RtlCopyMemory(&gpsi->apfnClientA, pfnClientA, sizeof(PFNCLIENT)); + RtlCopyMemory(&gpsi->apfnClientW, pfnClientW, sizeof(PFNCLIENT)); + RtlCopyMemory(&gpsi->apfnClientWorker, pfnClientWorker, sizeof(PFNCLIENTWORKER)); + + hModClient = hmodUser; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status =_SEH2_GetExceptionCode(); + } + _SEH2_END + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed reading Client Pfns from user space.\n"); + SetLastNtError(Status); + } + + UserLeave(); + return Status; } DWORD

15 years, 5 months

[janderwald] 41935: [WDMAUD_KERNEL] -? Hey Arch, don't be so picky when something goes wrong. - Fix enumeration of wave out / in devices for Vmware adapter - Playback still hangs

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jul 12 19:44:33 2009 New Revision: 41935 URL: http://svn.reactos.org/svn/reactos?rev=41935&view=rev Log: [WDMAUD_KERNEL] -? Hey Arch, don't be so picky when something goes wrong. - Fix enumeration of wave out / in devices for Vmware adapter - Playback still hangs Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Sun Jul 12 19:44:33 2009 @@ -375,14 +375,11 @@ } } - - if (NT_SUCCESS(Status)) - DeviceInfo->DeviceCount = Result; - else - DeviceInfo->DeviceCount = 0; + /* store result count */ + DeviceInfo->DeviceCount = Result; DPRINT1("WdmAudControlDeviceType Status %x Devices %u\n", Status, DeviceInfo->DeviceCount); - return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } NTSTATUS

15 years, 5 months

[ros-arm-bringup] 41933: - Implement the rest of the nonpaged pool allocator, now with support for allocating pages in the nonpaged pool expansion area. - This uses System PTEs, so if you're still not sick of the same old mantra -- optimizations to the former will help the latter. - Additionally, we should eventually implement a single-page SLIST for nonpaged pool pages, which will greately improve allocate/free of 1 page. - As a reminder, this code isn't being used yet.

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

Author: ros-arm-bringup Date: Sun Jul 12 17:02:05 2009 New Revision: 41933 URL: http://svn.reactos.org/svn/reactos?rev=41933&view=rev Log: - Implement the rest of the nonpaged pool allocator, now with support for allocating pages in the nonpaged pool expansion area. - This uses System PTEs, so if you're still not sick of the same old mantra -- optimizations to the former will help the latter. - Additionally, we should eventually implement a single-page SLIST for nonpaged pool pages, which will greately improve allocate/free of 1 page. - As a reminder, this code isn't being used yet. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c 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] Sun Jul 12 17:02:05 2009 @@ -130,11 +130,12 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, IN SIZE_T SizeInBytes) { - PFN_NUMBER SizeInPages; + PFN_NUMBER SizeInPages, PageFrameNumber; ULONG i; KIRQL OldIrql; PLIST_ENTRY NextEntry, NextHead, LastHead; - PMMPTE PointerPte; + PMMPTE PointerPte, StartPte; + MMPTE TempPte; PMMPFN Pfn1; PVOID BaseVa; PMMFREE_POOL_ENTRY FreeEntry; @@ -258,13 +259,78 @@ // If we got here, we're out of space. // Start by releasing the lock // - KeReleaseQueuedSpinLock (LockQueueMmNonPagedPoolLock, OldIrql); - - // - // We should now go into expansion nonpaged pool - // - DPRINT1("Out of NP Pool\n"); - return NULL; + KeReleaseQueuedSpinLock(LockQueueMmNonPagedPoolLock, OldIrql); + + // + // Allocate some system PTEs + // + StartPte = MiReserveSystemPtes(SizeInPages, NonPagedPoolExpansion); + PointerPte = StartPte; + if (StartPte == NULL) + { + // + // Ran out of memory + // + DPRINT1("Out of NP Expansion Pool\n"); + return NULL; + } + + // + // Acquire the pool lock now + // + OldIrql = KeAcquireQueuedSpinLock(LockQueueMmNonPagedPoolLock); + + // + // Lock the PFN database too + // + //KeAcquireQueuedSpinLockAtDpcLevel(LockQueuePfnLock); + + // + // Loop the pages + // + TempPte = HyperTemplatePte; + do + { + // + // Allocate a page + // + PageFrameNumber = MmAllocPage(MC_NPPOOL, 0); + + // + // Get the PFN entry for it + // + Pfn1 = MiGetPfnEntry(PageFrameNumber); + + // + // Write the PTE for it + // + TempPte.u.Hard.PageFrameNumber = PageFrameNumber; + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); + *PointerPte++ = TempPte; + } while (--SizeInPages > 0); + + // + // This is the last page + // + Pfn1->u3.e1.EndOfAllocation = 1; + + // + // Get the first page and mark it as such + // + Pfn1 = MiGetPfnEntry(StartPte->u.Hard.PageFrameNumber); + Pfn1->u3.e1.StartOfAllocation = 1; + + // + // Release the PFN and nonpaged pool lock + // + //KeReleaseQueuedSpinLockFromDpcLevel(LockQueuePfnLock); + KeReleaseQueuedSpinLock(LockQueueMmNonPagedPoolLock, OldIrql); + + // + // Return the address + // + return MiPteToAddress(StartPte); } ULONG

15 years, 5 months

[ros-arm-bringup] 41932: - Stop excercising the nonpaged pool allocator since there have been no complaints and internal testing has revealed no faults.

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

Author: ros-arm-bringup Date: Sun Jul 12 17:00:19 2009 New Revision: 41932 URL: http://svn.reactos.org/svn/reactos?rev=41932&view=rev Log: - Stop excercising the nonpaged pool allocator since there have been no complaints and internal testing has revealed no faults. Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Sun Jul 12 17:00:19 2009 @@ -718,7 +718,7 @@ // // Do a little test of the nonpaged pool allocator // - if (1) + if (0) { ULONG i = 0; PVOID Buffers[4096];

15 years, 5 months

[ros-arm-bringup] 41931: - Fix incomplete comment due to accidental early-merge.

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

Author: ros-arm-bringup Date: Sun Jul 12 16:59:21 2009 New Revision: 41931 URL: http://svn.reactos.org/svn/reactos?rev=41931&view=rev Log: - Fix incomplete comment due to accidental early-merge. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h 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] Sun Jul 12 16:59:21 2009 @@ -112,12 +112,12 @@ VOID ); -VOID -NTAPI -InitializePool( // - IN POOL_TYPE PoolType, - IN ULONG Threshold -); +VOID // +NTAPI // +InitializePool( // + IN POOL_TYPE PoolType,// FIXFIX: This should go in ex.h after the pool merge + IN ULONG Threshold // +); // VOID NTAPI

15 years, 5 months

← Newer
1
...
36
37
38
39
40
41
42
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009