Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[cgutman] 36881: - Mark the irp pending when needed
by cgutman＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: cgutman Date: Tue Oct 21 18:11:33 2008 New Revision: 36881 URL: http://svn.reactos.org/svn/reactos?rev=36881&view=rev Log: - Mark the irp pending when needed Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Tue Oct 21 18:11:33 2008 @@ -405,6 +405,9 @@ DispDataRequestComplete, Irp ); + if (Status == STATUS_PENDING) + IoMarkIrpPending(Irp); + TI_DbgPrint(MAX_TRACE, ("TCP Connect returned %08x\n", Status)); return Status; @@ -587,6 +590,9 @@ DispDataRequestComplete, Irp ); } + + if (Status == STATUS_PENDING) + IoMarkIrpPending(Irp); TI_DbgPrint(MID_TRACE,("Leaving %x\n", Status));

1 0

[sginsberg] 36880: - Correct an assertion after ARM system call changes in 34366
by sginsberg＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: sginsberg Date: Tue Oct 21 16:02:16 2008 New Revision: 36880 URL: http://svn.reactos.org/svn/reactos?rev=36880&view=rev Log: - Correct an assertion after ARM system call changes in 34366 Modified: trunk/reactos/ntoskrnl/ke/arm/usercall.c Modified: trunk/reactos/ntoskrnl/ke/arm/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/usercall.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/usercall.c [iso-8859-1] Tue Oct 21 16:02:16 2008 @@ -148,7 +148,7 @@ // Check how many arguments this system call takes // ArgumentCount = DescriptorTable->Number[Number] / 4; - ASSERT(ArgumentCount <= 20); + ASSERT(ArgumentCount <= 17); // // Copy the register-arguments first

1 0

[jimtabor] 36879: - Implement RtlQueryInformationActiveActivationContext and add new define. Wow, this one need some love from wine!
by jimtabor＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: jimtabor Date: Tue Oct 21 14:49:17 2008 New Revision: 36879 URL: http://svn.reactos.org/svn/reactos?rev=36879&view=rev Log: - Implement RtlQueryInformationActiveActivationContext and add new define. Wow, this one need some love from wine! Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=36879… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Tue Oct 21 14:49:17 2008 @@ -12,6 +12,8 @@ #define NDEBUG #include <debug.h> + +#define QUERY_ACTCTX_FLAG_ACTIVE (0x00000001) /* FUNCTIONS ***************************************************************/ @@ -82,6 +84,22 @@ NTSTATUS NTAPI +RtlQueryInformationActiveActivationContext(ULONG ulInfoClass, + PVOID pvBuffer, + SIZE_T cbBuffer OPTIONAL, + SIZE_T *pcbWrittenOrRequired OPTIONAL) +{ + return RtlQueryInformationActivationContext(QUERY_ACTCTX_FLAG_ACTIVE, + NULL, + NULL, + ulInfoClass, + pvBuffer, + cbBuffer, + pcbWrittenOrRequired); +} + +NTSTATUS +NTAPI RtlZombifyActivationContext(PVOID Context) { UNIMPLEMENTED;

1 0

[jimtabor] 36878: - Correct wrong ID'ed type, it is an activation context basic information buffer.
by jimtabor＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: jimtabor Date: Tue Oct 21 14:29:37 2008 New Revision: 36878 URL: http://svn.reactos.org/svn/reactos?rev=36878&view=rev Log: - Correct wrong ID'ed type, it is an activation context basic information buffer. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Oct 21 14:29:37 2008 @@ -1078,7 +1078,7 @@ HINSTANCE hInstance, LPVOID lpParam, DWORD dwFlags, - BOOL InfoActive); + PVOID acbiBuffer); #endif HWINSTA

1 0

[fireball] 36877: - If data is going to be modified, CcPinRead should be used instead of CcMapData. Fix this.
by fireball＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: fireball Date: Tue Oct 21 13:48:08 2008 New Revision: 36877 URL: http://svn.reactos.org/svn/reactos?rev=36877&view=rev Log: - If data is going to be modified, CcPinRead should be used instead of CcMapData. Fix this. Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Tue Oct 21 13:48:08 2008 @@ -478,7 +478,7 @@ if (RequestedOptions & FILE_DIRECTORY_FILE) { FileOffset.QuadPart = 0; - CcMapData((*Fcb)->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, + CcPinRead((*Fcb)->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry); /* clear the new directory cluster */ RtlZeroMemory(pFatEntry, DeviceExt->FatInfo.BytesPerCluster);

1 0

[sginsberg] 36876: - Fix various compilation errors in SMP assembly (typos, missing jump labels and specifiers) - Implement the SMP case in KiDispatchInterrupt -- on SMP we must raise IRQL to SYNCH_LEVEL, set the thread context swap busy flag and acquire the PRCB lock before calling KiQueueReadyThread and KiSwapContextInternal
by sginsberg＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: sginsberg Date: Tue Oct 21 13:34:06 2008 New Revision: 36876 URL: http://svn.reactos.org/svn/reactos?rev=36876&view=rev Log: - Fix various compilation errors in SMP assembly (typos, missing jump labels and specifiers) - Implement the SMP case in KiDispatchInterrupt -- on SMP we must raise IRQL to SYNCH_LEVEL, set the thread context swap busy flag and acquire the PRCB lock before calling KiQueueReadyThread and KiSwapContextInternal Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Tue Oct 21 13:34:06 2008 @@ -13,6 +13,7 @@ #include <ndk/asm.h> .intel_syntax noprefix +#define Ready 1 #define Running 2 #define WrDispatchInt 0x1F @@ -346,7 +347,7 @@ #ifdef CONFIG_SMP GetSwapLock: /* Acquire the swap lock */ - cmp [esi+KTHREAD_SWAP_BUSY], 0 + cmp byte ptr [esi+KTHREAD_SWAP_BUSY], 0 jz NotBusy pause jmp GetSwapLock @@ -559,6 +560,16 @@ mov cr0, ecx jmp StackOk +#ifdef CONFIG_SMP +NpxLoaded: + + /* FIXME: TODO */ + int 3 + + /* Jump back */ + jmp SetStack +#endif + WmiTrace: /* No WMI support yet */ @@ -696,8 +707,7 @@ #ifdef CONFIG_SMP /* There is, raise IRQL to synch level */ - mov ecx, SYNCH_LEVEL - call @KfRaiseIrql@4 + call _KeRaiseIrqlToSynchLevel@0 #endif sti @@ -707,7 +717,7 @@ mov byte ptr [edi+KTHREAD_SWAP_BUSY], 1 /* Acquire the PRCB Lock */ - lock bts [ebx+KPCR_PRCB_PRCB_LOCK], 0 + lock bts dword ptr [ebx+KPCR_PRCB_PRCB_LOCK], 0 jnb CheckNext lea ecx, [ebx+KPCR_PRCB_PRCB_LOCK] call @KefAcquireSpinLockAtDpcLevel@4 @@ -731,7 +741,7 @@ #ifdef CONFIG_SMP /* Disable the idle scheduler and release the PRCB lock */ and byte ptr [ebx+KPCR_PRCB_IDLE_SCHEDULE], 0 - and [ebx+KPCR_PRCB_PRCB_LOCK], 0 + and dword ptr [ebx+KPCR_PRCB_PRCB_LOCK], 0 #endif SwapContext: @@ -764,7 +774,7 @@ jz CpuIdle /* It is, so call the scheduler */ - lea ecx, [ebx+KPCR_PRCBDATA] + lea ecx, [ebx+KPCR_PRCB_DATA] call @KiIdleSchedule@4 test eax, eax Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Tue Oct 21 13:34:06 2008 @@ -2455,9 +2455,20 @@ mov edi, [ebx+KPCR_CURRENT_THREAD] #ifdef CONFIG_SMP - #error SMP Interrupt not handled! + /* Raise to synch level */ + call _KeRaiseIrqlToSynchLevel@0 + + /* Set context swap busy */ + mov byte ptr [edi+KTHREAD_SWAP_BUSY], 1 + + /* Acquire the PRCB Lock */ + lock bts dword ptr [ebx+KPCR_PRCB_PRCB_LOCK], 0 + jnb GetNext + lea ecx, [ebx+KPCR_PRCB_PRCB_LOCK] + call @KefAcquireSpinLockAtDpcLevel@4 #endif +GetNext: /* Get the next thread and clear it */ mov esi, [ebx+KPCR_PRCB_NEXT_THREAD] and dword ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 @@ -2475,6 +2486,12 @@ /* Set APC_LEVEL and do the swap */ mov cl, APC_LEVEL call @KiSwapContextInternal@0 + +#ifdef CONFIG_SMP + /* Lower IRQL back to dispatch */ + mov cl, DISPATCH_LEVEL + call @KfLowerIrql@4 +#endif /* Restore registers */ mov ebp, [esp+0] @@ -2617,7 +2634,7 @@ #ifdef CONFIG_SMP IntSpin: - SPIN_ON_LOCK esi, GetIntLock + SPIN_ON_LOCK(esi, GetIntLock) #endif IsrTimeout:

1 0

[hyperion] 36875: Bring rosapps up to date with the rbuild changes of r36870
by hyperion＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: hyperion Date: Tue Oct 21 12:42:04 2008 New Revision: 36875 URL: http://svn.reactos.org/svn/reactos?rev=36875&view=rev Log: Bring rosapps up to date with the rbuild changes of r36870 Modified: trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild trunk/rosapps/applications/screensavers/circles/circles.rbuild Modified: trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/blankscr/blankscr.rbuild [iso-8859-1] Tue Oct 21 12:42:04 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="blankscr" type="win32scr" installbase="system32" installname="scrnsave.scr" unicode="yes"> - <importlibrary definition="scrnsave.spec.def" /> + <importlibrary definition="scrnsave.spec" /> <library>scrnsave</library> <library>kernel32</library> <library>user32</library> @@ -9,5 +9,4 @@ <file>scrnsave.c</file> <file>scrnsave.rc</file> - <file>scrnsave.spec</file> </module> Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rbuild [iso-8859-1] Tue Oct 21 12:42:04 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="butterflies" type="win32scr" installbase="system32" installname="butterflies.scr" unicode="yes"> - <importlibrary definition="butterflies.spec.def" /> + <importlibrary definition="butterflies.spec" /> <include base="butterflies">.</include> <library>scrnsave</library> <library>kernel32</library> @@ -16,5 +16,4 @@ <file>butterflies.c</file> <file>butterflies.rc</file> - <file>butterflies.spec</file> </module> Modified: trunk/rosapps/applications/screensavers/circles/circles.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/circles.rbuild [iso-8859-1] Tue Oct 21 12:42:04 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="circles" type="win32scr" installbase="system32" unicode="true"> - <importlibrary definition="circles.spec.def" /> + <importlibrary definition="circles.spec" /> <include base="circles">.</include> <library>scrnsave</library> <library>kernel32</library> @@ -12,5 +12,4 @@ <file>circles.c</file> <file>circles.rc</file> - <file>circles.spec</file> </module>

1 0

[sginsberg] 36874: - SMP SYNCH_LEVEL for x86 is IPI_LEVEL - 2 since 2K3
by sginsberg＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: sginsberg Date: Tue Oct 21 11:23:06 2008 New Revision: 36874 URL: http://svn.reactos.org/svn/reactos?rev=36874&view=rev Log: - SMP SYNCH_LEVEL for x86 is IPI_LEVEL - 2 since 2K3 Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Tue Oct 21 11:23:06 2008 @@ -142,7 +142,11 @@ #ifndef CONFIG_SMP #define SYNCH_LEVEL DISPATCH_LEVEL #else +#if (NTDDI_VERSION < NTDDI_WS03) #define SYNCH_LEVEL (IPI_LEVEL - 1) +#else +#define SYNCH_LEVEL (IPI_LEVEL - 2) +#endif #endif //

1 0

[sginsberg] 36873: - Add missing KPCR_PRCB_IDLE_SCHEDULE offset
by sginsberg＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: sginsberg Date: Tue Oct 21 10:32:49 2008 New Revision: 36873 URL: http://svn.reactos.org/svn/reactos?rev=36873&view=rev Log: - Add missing KPCR_PRCB_IDLE_SCHEDULE offset Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=3687… ============================================================================== --- trunk/reactos/include/ndk/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/asm.h [iso-8859-1] Tue Oct 21 10:32:49 2008 @@ -220,6 +220,7 @@ #define KPCR_PRCB_DPC_LAST_COUNT 0xA80 #define KPCR_PRCB_TIMER_REQUEST 0xA88 #define KPCR_PRCB_QUANTUM_END 0xAA1 +#define KPCR_PRCB_IDLE_SCHEDULE 0xAA3 #define KPCR_PRCB_DEFERRED_READY_LIST_HEAD 0xC10 #define KPCR_PRCB_POWER_STATE_IDLE_FUNCTION 0xEC0 Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Tue Oct 21 10:32:49 2008 @@ -273,6 +273,7 @@ C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, PowerState) == KPCR_PRCB_POWER_STATE_IDLE_FUNCTION); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, PrcbLock) == KPCR_PRCB_PRCB_LOCK); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DpcStack) == KPCR_PRCB_DPC_STACK); +C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, IdleSchedule) == KPCR_PRCB_IDLE_SCHEDULE); C_ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); /* Platform specific checks */

1 0

[jimtabor] 36872: - Fix NtUserCreateWindowEx.
by jimtabor＠svn.reactos.org 21 Oct '08

21 Oct '08

Author: jimtabor Date: Tue Oct 21 09:51:14 2008 New Revision: 36872 URL: http://svn.reactos.org/svn/reactos?rev=36872&view=rev Log: - Fix NtUserCreateWindowEx. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Oct 21 09:51:14 2008 @@ -1060,6 +1060,26 @@ DWORD dwShowMode, BOOL bUnicodeWindow, DWORD dwUnknown); +#if 0 +HWND +NTAPI +NtUserCreateWindowEx( + DWORD dwExStyle, + PLARGE_UNICODE_STRING plustrClassName, + PLARGE_UNICODE_STRING plustrClsVesrion, + PLARGE_UNICODE_STRING plustrWindowName, + DWORD dwStyle, + int x, + int y, + int nWidth, + int nHeight, + HWND hWndParent, + HMENU hMenu, + HINSTANCE hInstance, + LPVOID lpParam, + DWORD dwFlags, + BOOL InfoActive); +#endif HWINSTA NTAPI

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008