Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49420: [ASM] Fix dummy ASSUME
by tkreuzer＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: tkreuzer Date: Tue Nov 2 00:03:41 2010 New Revision: 49420 URL: http://svn.reactos.org/svn/reactos?rev=49420&view=rev Log: [ASM] Fix dummy ASSUME Modified: branches/cmake-bringup/include/reactos/asm.h Modified: branches/cmake-bringup/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/a… ============================================================================== --- branches/cmake-bringup/include/reactos/asm.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/asm.h [iso-8859-1] Tue Nov 2 00:03:41 2010 @@ -123,7 +123,7 @@ .endm /* Dummy ASSUME */ -.macro ASSUME +.macro ASSUME p1 p2 p3 p4 p5 p6 p7 p8 .endm /* MASM compatible ALIGN */

1 0

[tkreuzer] 49419: [ASM] Add .double macro for ML and dummy ASSUME macro for GAS Allow XMM instructions for ML
by tkreuzer＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: tkreuzer Date: Mon Nov 1 23:18:51 2010 New Revision: 49419 URL: http://svn.reactos.org/svn/reactos?rev=49419&view=rev Log: [ASM] Add .double macro for ML and dummy ASSUME macro for GAS Allow XMM instructions for ML Modified: branches/cmake-bringup/include/reactos/asm.h Modified: branches/cmake-bringup/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/a… ============================================================================== --- branches/cmake-bringup/include/reactos/asm.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/asm.h [iso-8859-1] Mon Nov 1 23:18:51 2010 @@ -12,7 +12,9 @@ OPTION DOTNAME .586 +.XMM .MODEL FLAT +ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING /* Hex numbers need to be in 01ABh format */ #define HEX(x) 0##x##h @@ -56,6 +58,26 @@ .code32 MACRO .code +ENDM + +.align MACRO alignment + ALIGN alignment +ENDM + +.byte MACRO args:VARARG + db args +ENDM + +.short MACRO args:VARARG + dw args +ENDM + +.long MACRO args:VARARG + dd args +ENDM + +.double MACRO args:VARARG + dq args ENDM UNIMPLEMENTED MACRO name @@ -98,6 +120,10 @@ /* MASM compatible PUBLIC */ .macro PUBLIC symbol .global \symbol +.endm + +/* Dummy ASSUME */ +.macro ASSUME .endm /* MASM compatible ALIGN */

1 0

[jgardou] 49418: [CMAKE] - improve win32k/CMakeLists.txt
by jgardou＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: jgardou Date: Mon Nov 1 22:55:56 2010 New Revision: 49418 URL: http://svn.reactos.org/svn/reactos?rev=49418&view=rev Log: [CMAKE] - improve win32k/CMakeLists.txt Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Mon Nov 1 22:55:56 2010 @@ -145,7 +145,12 @@ objects/xformobj.c stubs/stubs.c stubs/umpdstubs.c - win32k.rc) + win32k.rc + win32k_${ARCH}.def) + +if(NOT MSVC) + set_source_files_properties(win32k_${ARCH}.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() list(APPEND GENDIB_GENERATED ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c @@ -180,7 +185,6 @@ set_module_type(win32k kernelmodedriver) target_link_libraries(win32k - ${CMAKE_CURRENT_SOURCE_DIR}/win32k_i386.def ${PSEH_LIB} dxguid libcntpr)

1 0

[janderwald] 49417: [PORTCLS] - Portcls does not need to set the size of the audio buffer for completed irps. This is done in a completion callback in wdmaud. Verified with WinXP portcls [WDMAUD_KE...
by janderwald＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: janderwald Date: Mon Nov 1 22:21:24 2010 New Revision: 49417 URL: http://svn.reactos.org/svn/reactos?rev=49417&view=rev Log: [PORTCLS] - Portcls does not need to set the size of the audio buffer for completed irps. This is done in a completion callback in wdmaud. Verified with WinXP portcls [WDMAUD_KERNEL] - Free allocated mdls in the io completion routine. Also free the associated stream header. [KS] - Replace all ms portcls hacks by one. - MS Portcls is now working in ReactOS (which is nice for testing audio related bugs) Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Mon Nov 1 22:21:24 2010 @@ -898,10 +898,6 @@ goto ProbeMdl; } -#if 0 - // HACK for MS PORTCLS - HeaderSize = Length; -#endif /* probe user mode buffers */ if (Length && ( (!HeaderSize) || (Length % HeaderSize == 0) || ((ProbeFlags & KSPROBE_ALLOWFORMATCHANGE) && (Length == sizeof(KSSTREAM_HEADER))) ) ) { @@ -1370,7 +1366,7 @@ PLIST_ENTRY CurEntry; KIRQL OldIrql; - //DPRINT("KsRemoveIrpFromCancelableQueue ListHead %p SpinLock %p ListLocation %x RemovalOperation %x\n", QueueHead, SpinLock, ListLocation, RemovalOperation); + DPRINT("KsRemoveIrpFromCancelableQueue ListHead %p SpinLock %p ListLocation %x RemovalOperation %x\n", QueueHead, SpinLock, ListLocation, RemovalOperation); /* check parameters */ if (!QueueHead || !SpinLock) @@ -1629,19 +1625,32 @@ PIO_STACK_LOCATION IoStack; KIRQL OldLevel; - DPRINT("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); /* check for required parameters */ if (!QueueHead || !SpinLock || !Irp) return; + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); + + // HACK for ms portcls + if (IoStack->MajorFunction == IRP_MJ_CREATE) + { + // complete the request + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return; + } + + if (!DriverCancel) { /* default to KsCancelRoutine */ DriverCancel = KsCancelRoutine; } - /* get current irp stack */ - IoStack = IoGetCurrentIrpStackLocation(Irp); /* acquire spinlock */ KeAcquireSpinLock(SpinLock, &OldLevel); @@ -1973,12 +1982,6 @@ IN ULONG MajorFunction) { DPRINT("KsSetMajorFunctionHandler Function %x\n", MajorFunction); -#if 1 - // HACK - // for MS PORTCLS - // - DriverObject->MajorFunction[IRP_MJ_CREATE] = KspCreate; -#endif switch ( MajorFunction ) { @@ -2016,7 +2019,7 @@ PKSIDEVICE_HEADER DeviceHeader; PDEVICE_EXTENSION DeviceExtension; - //DPRINT("KsDispatchIrp DeviceObject %p Irp %p\n", DeviceObject, Irp); + DPRINT("KsDispatchIrp DeviceObject %p Irp %p\n", DeviceObject, Irp); /* get device extension */ DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] Mon Nov 1 22:21:24 2010 @@ -232,21 +232,21 @@ if (IsListEmpty(&m_ServiceRoutines)) return STATUS_UNSUCCESSFUL; - DPRINT("Vector %u Level %u Flags %x Affinity %x\n", Descriptor->u.Interrupt.Vector, Descriptor->u.Interrupt.Level, Descriptor->Flags, Descriptor->u.Interrupt.Affinity); + DPRINT1("Vector %u Level %u Flags %x Affinity %x\n", Descriptor->u.Interrupt.Vector, Descriptor->u.Interrupt.Level, Descriptor->Flags, Descriptor->u.Interrupt.Affinity); Status = IoConnectInterrupt(&m_Interrupt, IInterruptServiceRoutine, (PVOID)this, - &m_Lock, + NULL, //&m_Lock, Descriptor->u.Interrupt.Vector, (KIRQL)Descriptor->u.Interrupt.Level, (KIRQL)Descriptor->u.Interrupt.Level, (KINTERRUPT_MODE)(Descriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED), - (Descriptor->Flags != CM_RESOURCE_INTERRUPT_LATCHED), + (Descriptor->ShareDisposition != CmResourceShareDeviceExclusive), Descriptor->u.Interrupt.Affinity, FALSE); - DPRINT("CInterruptSync::Connect result %x\n", Status); + DPRINT1("CInterruptSync::Connect result %x\n", Status); return Status; } 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] Mon Nov 1 22:21:24 2010 @@ -293,7 +293,6 @@ { PKSSTREAM_HEADER StreamHeader; ULONG Size, NumData, Index; - //PMDL CurMdl, NextMdl; if (!m_Irp) { @@ -340,8 +339,7 @@ return; } - // irp has been processed completly - + // irp has been processed completly NumData = 0; if (m_Irp->RequestorMode == KernelMode) StreamHeader = (PKSSTREAM_HEADER)m_Irp->UserBuffer; @@ -385,44 +383,10 @@ // done return; } -#if 0 - // now free allocated mdls - CurMdl = m_Irp->MdlAddress; - for(Index = 0; Index < STREAMHEADER_COUNT(m_Irp); Index++) - { - // sanity check - ASSERT(CurMdl); - - // get next mdl - NextMdl = CurMdl->Next; - - // check if mdl is locked - if (CurMdl->MdlFlags & MDL_PAGES_LOCKED) - { - // unlock pages - MmUnlockPages(CurMdl); - } - - // free mdl - IoFreeMdl(CurMdl); - - // proceed to next mdl - CurMdl = NextMdl; - } - - // all mdls have been freed now - m_Irp->MdlAddress = NULL; - - // free allocated KSSTREAM_HEADER - ExFreePool(m_Irp->AssociatedIrp.SystemBuffer); - - // is this really needed? - m_Irp->AssociatedIrp.SystemBuffer = NULL; -#endif // store operation status m_Irp->IoStatus.Status = STATUS_SUCCESS; - m_Irp->IoStatus.Information = NumData; + m_Irp->IoStatus.Information = 0; // complete the request IoCompleteRequest(m_Irp, IO_SOUND_INCREMENT); 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] Mon Nov 1 22:21:24 2010 @@ -384,6 +384,91 @@ return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); } +NTSTATUS +NTAPI +IoCompletion ( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Ctx) +{ + PKSSTREAM_HEADER Header; + ULONG Length = 0; + PMDL Mdl, NextMdl; + PWDMAUD_COMPLETION_CONTEXT Context = (PWDMAUD_COMPLETION_CONTEXT)Ctx; + + /* get stream header */ + Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + + /* sanity check */ + ASSERT(Header); + + /* iterate through all stream headers and collect size */ + do + { + if (Context->Function == IOCTL_KS_READ_STREAM) + { + /* length is stored in DataUsed */ + Length += Header->DataUsed; + } + else + { + /* length stored in frameextend */ + Length += Header->FrameExtent; + } + + /* subtract size */ + Context->Length -= Header->Size; + + /* move to next stream header */ + Header = (PKSSTREAM_HEADER)((ULONG_PTR)Header + Header->Size); + + }while(Context->Length); + + /* time to free all allocated mdls */ + Mdl = Irp->MdlAddress; + + while(Mdl) + { + /* get next mdl */ + NextMdl = Mdl->Next; + + /* unlock pages */ + MmUnlockPages(Mdl); + + /* grab next mdl */ + Mdl = NextMdl; + } + + /* clear mdl list */ + Irp->MdlAddress = NULL; + + /* check if mdl is locked */ + if (Context->Mdl->MdlFlags & MDL_PAGES_LOCKED) + { + /* unlock pages */ + MmUnlockPages(Context->Mdl); + } + + /* now free the mdl */ + IoFreeMdl(Context->Mdl); + + /* now free the stream header */ + ExFreePool(Irp->AssociatedIrp.SystemBuffer); + + DPRINT("IoCompletion Irp %p IoStatus %lx Information %lx Length %lu\n", Irp, Irp->IoStatus.Status, Irp->IoStatus.Information, Length); + + if (Irp->IoStatus.Status == STATUS_SUCCESS) + { + /* store the length */ + Irp->IoStatus.Information = Length; + } + + /* free context */ + FreeItem(Context); + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI @@ -398,6 +483,20 @@ ULONG Length; PMDL Mdl; BOOLEAN Read = TRUE; + PWDMAUD_COMPLETION_CONTEXT Context; + + /* allocate completion context */ + Context = AllocateItem(NonPagedPool, sizeof(WDMAUD_COMPLETION_CONTEXT)); + + if (!Context) + { + /* not enough memory */ + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ + return STATUS_INSUFFICIENT_RESOURCES; + } /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -413,6 +512,11 @@ /* store outputbuffer length */ IoStack->Parameters.DeviceIoControl.OutputBufferLength = Length; + + /* setup context */ + Context->Length = Length; + Context->Function = (IoStack->MajorFunction == IRP_MJ_WRITE ? IOCTL_KS_WRITE_STREAM : IOCTL_KS_READ_STREAM); + Context->Mdl = Irp->MdlAddress; /* store mdl address */ Mdl = Irp->MdlAddress; @@ -440,16 +544,6 @@ Irp->MdlAddress = Mdl; return SetIrpIoStatus(Irp, Status, 0); } - - /* check if mdl is locked */ - if (Mdl->MdlFlags & MDL_PAGES_LOCKED) - { - /* unlock pages */ - MmUnlockPages(Mdl); - } - - /* now free the mdl */ - IoFreeMdl(Mdl); /* get device info */ DeviceInfo = (PWDMAUD_DEVICE_INFO)Irp->AssociatedIrp.SystemBuffer; @@ -483,6 +577,9 @@ IoStack->Parameters.Write.Length = Length; IoStack->MajorFunction = IRP_MJ_WRITE; + IoSetCompletionRoutine(Irp, IoCompletion, (PVOID)Context, TRUE, TRUE, TRUE); + + /* mark irp as pending */ // IoMarkIrpPending(Irp); /* call the driver */ Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Mon Nov 1 22:21:24 2010 @@ -18,6 +18,14 @@ typedef struct { + PMDL Mdl; + ULONG Length; + ULONG Function; +}WDMAUD_COMPLETION_CONTEXT, *PWDMAUD_COMPLETION_CONTEXT; + + +typedef struct +{ HANDLE Handle; SOUND_DEVICE_TYPE Type; ULONG FilterId;

1 0

[fireball] 49416: - Properly implement win32k timers in arwinss. Fixes a whole bunch of weird crashes, race conditions, unnecessary code complications, and things like that (e.g. #5222). - A couple...
by fireball＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: fireball Date: Mon Nov 1 21:31:07 2010 New Revision: 49416 URL: http://svn.reactos.org/svn/reactos?rev=49416&view=rev Log: - Properly implement win32k timers in arwinss. Fixes a whole bunch of weird crashes, race conditions, unnecessary code complications, and things like that (e.g. #5222). - A couple of timer managing functions are based on code (c) Alexandre Julliard, Wine project (server/fd.c). See issue #5222 for more details. Added: branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c (with props) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] Mon Nov 1 21:31:07 2010 @@ -123,14 +123,13 @@ static inline int check_object_access(struct object *obj, unsigned int *access) { return TRUE; }; // timeout stuff -struct timeout_user -{ - KTIMER Timer; - KDPC Dpc; -}; +VOID NTAPI InitTimeThread(); +struct timeout_user; -typedef PKDEFERRED_ROUTINE timeout_callback; #define TICKS_PER_SEC 10000000 + +typedef void (*timeout_callback)( void *private ); + void remove_timeout_user( struct timeout_user *user ); struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ); @@ -140,7 +139,7 @@ LARGE_INTEGER time; KeQuerySystemTime(&time); - *value = time.QuadPart / 10; + *value = time.QuadPart; } Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Mon Nov 1 21:31:07 2010 @@ -374,6 +374,9 @@ /* Create stock objects */ CreateStockObjects(); + /* Initialize timers */ + InitTimeThread(); + /* Init video driver implementation */ InitDcImpl(); Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Mon Nov 1 21:31:07 2010 @@ -148,6 +148,7 @@ <file>queue.c</file> <file>region.c</file> <file>stubs.c</file> + <file>timeout.c</file> <file>user.c</file> <file>window.c</file> <file>winesup.c</file> Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] Mon Nov 1 21:31:07 2010 @@ -139,7 +139,7 @@ static void msg_queue_poll_event( struct fd *fd, int event ); static void thread_input_dump( struct object *obj, int verbose ); static void thread_input_destroy( struct object *obj ); -static VOID NTAPI timer_callback( PKDPC Dpc, PVOID Context, PVOID SystemArgument1, PVOID SystemArgument2 ); +static void timer_callback( void *private ); static const struct object_ops msg_queue_ops = { @@ -527,21 +527,14 @@ free_message( msg ); } -VOID -NTAPI -result_timeout_worker( PVOID Context ) -{ - PQUEUE_WORKER_CONTEXT work_context = Context; - struct message_result *result = work_context->result; - - UserEnterExclusive(); +/* message timed out without getting a reply */ +static void result_timeout( void *private ) +{ + struct message_result *result = private; assert( !result->replied ); result->timeout = NULL; - - /* Free work item memory */ - ExFreePool(work_context); if (result->msg) /* not received yet */ { @@ -554,30 +547,11 @@ if (!result->sender) { free_result( result ); - UserLeave(); return; } } store_message_result( result, 0, STATUS_TIMEOUT ); - UserLeave(); -} - -/* message timed out without getting a reply */ -static VOID -NTAPI -result_timeout( PKDPC Dpc, PVOID Context, PVOID SystemArgument1, PVOID SystemArgument2) -{ - struct message_result *result = Context; - PQUEUE_WORKER_CONTEXT work_context; - - /* Allocate memory for the work iteam */ - work_context = ExAllocatePool(NonPagedPool, sizeof(QUEUE_WORKER_CONTEXT)); - work_context->result = result; - - /* Queue a work item */ - ExInitializeWorkItem(&work_context->item, result_timeout_worker, result); - ExQueueWorkItem(&work_context->item, DelayedWorkQueue); } /* allocate and fill a message result structure */ @@ -1063,21 +1037,10 @@ } /* callback for the next timer expiration */ -static -VOID -NTAPI -timer_callback_worker( PVOID Context ) -{ - PQUEUE_WORKER_CONTEXT work_context = Context; +static void timer_callback( void *private ) +{ struct list *ptr; - struct msg_queue *queue = work_context->queue; - - ASSERT(queue); - - UserEnterExclusive(); - - /* Free workitem */ - ExFreePool(work_context); + struct msg_queue *queue = private; queue->timeout = NULL; /* move on to the next timer */ @@ -1085,26 +1048,6 @@ list_remove( ptr ); list_add_tail( &queue->expired_timers, ptr ); set_next_timer( queue ); - - UserLeave(); -} - -static -VOID -NTAPI -timer_callback( PKDPC Dpc, PVOID Context, PVOID SystemArgument1, PVOID SystemArgument2 ) -{ - struct msg_queue *queue = Context; - PQUEUE_WORKER_CONTEXT work_context; - - /* Allocate memory for the work iteam */ - work_context = ExAllocatePool(NonPagedPool, sizeof(QUEUE_WORKER_CONTEXT)); - - work_context->queue = queue; - - /* Queue a work item */ - ExInitializeWorkItem(&work_context->item, timer_callback_worker, work_context); - ExQueueWorkItem(&work_context->item, DelayedWorkQueue); } /* link a timer at its rightful place in the queue list */ Added: branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c [iso-8859-1] Mon Nov 1 21:31:07 2010 @@ -1,0 +1,241 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: LGPL v2.1 or any later - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/wine/timer.c + * PURPOSE: Timer code for user server + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> + +#include "object.h" + +#define NDEBUG +#include <debug.h> + +PKTIMER MasterTimer; +static HANDLE TimerThreadHandle; +static CLIENT_ID TimerThreadId; +static KEVENT TimerThreadsStart; +static PVOID TimerWaitObjects[2]; + +/* PRIVATE FUNCTIONS *********************************************************/ + +/****************************************************************/ +/* timeouts support */ + +struct timeout_user +{ + struct list entry; /* entry in sorted timeout list */ + timeout_t when; /* timeout expiry (absolute time) */ + timeout_callback callback; /* callback function */ + void *private; /* callback private data */ +}; + +static struct list timeout_list = LIST_INIT(timeout_list); /* sorted timeouts list */ + +/* add a timeout user */ +struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ) +{ + struct timeout_user *user; + struct list *ptr; + timeout_t current_time; + + DPRINT("add_timeout_user(when %I64d, func %p)\n", when, func); + + get_current_time(&current_time); + + if (!(user = mem_alloc( sizeof(*user) ))) return NULL; + user->when = (when > 0) ? when : current_time - when; + user->callback = func; + user->private = private; + + /* Now insert it in the linked list */ + + LIST_FOR_EACH( ptr, &timeout_list ) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + if (timeout->when >= user->when) break; + } + list_add_before( ptr, &user->entry ); + + /* Inform timeout thread that we have a new timer */ + KeSetEvent(&TimerThreadsStart, IO_NO_INCREMENT, FALSE); + + return user; +} + +/* remove a timeout user */ +void remove_timeout_user( struct timeout_user *user ) +{ + list_remove( &user->entry ); + ExFreePool( user ); +} + +/* return a text description of a timeout for debugging purposes */ +const char *get_timeout_str( timeout_t timeout ) +{ + static char buffer[64]; + long secs, nsecs; + timeout_t current_time; + + get_current_time(&current_time); + + if (!timeout) return "0"; + if (timeout == TIMEOUT_INFINITE) return "infinite"; + + if (timeout < 0) /* relative */ + { + secs = -timeout / TICKS_PER_SEC; + nsecs = -timeout % TICKS_PER_SEC; + sprintf( buffer, "+%ld.%07ld", secs, nsecs ); + } + else /* absolute */ + { + secs = (timeout - current_time) / TICKS_PER_SEC; + nsecs = (timeout - current_time) % TICKS_PER_SEC; + if (nsecs < 0) + { + nsecs += TICKS_PER_SEC; + secs--; + } + if (secs >= 0) + sprintf( buffer, "%x%08x (+%ld.%07ld)", + (unsigned int)(timeout >> 32), (unsigned int)timeout, secs, nsecs ); + else + sprintf( buffer, "%x%08x (-%ld.%07ld)", + (unsigned int)(timeout >> 32), (unsigned int)timeout, + -(secs + 1), TICKS_PER_SEC - nsecs ); + } + return buffer; +} + +/* process pending timeouts and return the time until the next timeout, in milliseconds */ +static int get_next_timeout(void) +{ + timeout_t current_time; + get_current_time(&current_time); + + if (!list_empty( &timeout_list )) + { + struct list expired_list, *ptr; + + /* first remove all expired timers from the list */ + + list_init( &expired_list ); + while ((ptr = list_head( &timeout_list )) != NULL) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + + if (timeout->when <= current_time) + { + list_remove( &timeout->entry ); + list_add_tail( &expired_list, &timeout->entry ); + } + else break; + } + + /* now call the callback for all the removed timers */ + + while ((ptr = list_head( &expired_list )) != NULL) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + list_remove( &timeout->entry ); + timeout->callback( timeout->private ); + ExFreePool( timeout ); + } + + if ((ptr = list_head( &timeout_list )) != NULL) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + //int diff = (timeout->when - current_time + 9999) / 10000; + int diff = timeout->when - current_time + 1; + if (diff < 0) diff = 0; + return diff; + } + } + return -1; /* no pending timeouts */ +} + +VOID +ProcessTimers() +{ + int timeout; + LARGE_INTEGER DueTime; + + timeout = get_next_timeout(); + + if (timeout != -1) + { + /* Wait for the next time out */ + DueTime.QuadPart = -timeout; + KeSetTimer(MasterTimer, DueTime, NULL); + } + else + { + /* Reset the timer making it signal in 60 seconds */ + DueTime.QuadPart = Int32x32To64(60, -TICKS_PER_SEC); + KeSetTimer(MasterTimer, DueTime, NULL); + } +} + +static VOID APIENTRY +TimerThreadMain(PVOID StartContext) +{ + NTSTATUS Status; + + TimerWaitObjects[0] = &TimerThreadsStart; + TimerWaitObjects[1] = MasterTimer; + + KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); + + for(;;) + { + Status = KeWaitForMultipleObjects(2, + TimerWaitObjects, + WaitAny, + WrUserRequest, + KernelMode, + TRUE, + NULL, + NULL); + + /* Process timers inside a user lock */ + UserEnterExclusive(); + ProcessTimers(); + UserLeave(); + } + DPRINT1("Timer thread exit!\n"); +} + +VOID +NTAPI +InitTimeThread() +{ + NTSTATUS Status; + + /* Event used to signal when a new timer is added */ + KeInitializeEvent(&TimerThreadsStart, SynchronizationEvent, FALSE); + + MasterTimer = ExAllocatePool(NonPagedPool, sizeof(KTIMER)); + if (!MasterTimer) + { + ASSERT(FALSE); + return; + } + + KeInitializeTimer(MasterTimer); + + Status = PsCreateSystemThread(&TimerThreadHandle, + THREAD_ALL_ACCESS, + NULL, + NULL, + &TimerThreadId, + TimerThreadMain, + NULL); + if (!NT_SUCCESS(Status)) DPRINT1("Win32K: Failed to create timer thread.\n"); +} + +/* EOF */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Mon Nov 1 21:31:07 2010 @@ -47,40 +47,6 @@ { UNIMPLEMENTED; return NULL; -} - -struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ) -{ - LARGE_INTEGER DueTime; - struct timeout_user *TimeoutUser; - - DueTime.QuadPart = (LONGLONG)when * 10; - - /* Allocate memory for timeout structure */ - TimeoutUser = ExAllocatePool(NonPagedPool, sizeof(struct timeout_user)); - - //DPRINT1("add_timeout_user(%p when %I64d, diff %I64d msecs, func %p)\n", TimeoutUser, when, secs, func); - - /* Initialize timer and DPC objects */ - KeInitializeTimer(&TimeoutUser->Timer); - KeInitializeDpc(&TimeoutUser->Dpc, func, private); - - /* Set the timer */ - KeSetTimer(&TimeoutUser->Timer, DueTime, &TimeoutUser->Dpc); - - return TimeoutUser; -} - -/* remove a timeout user */ -void remove_timeout_user( struct timeout_user *user ) -{ - //DPRINT1("remove_timeout_user %p, current time %I64d\n", user, current_time); - - /* Cancel the timer */ - KeCancelTimer(&user->Timer); - - /* Free memory */ - ExFreePool(user); } /* default map_access() routine for objects that behave like an fd */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] Mon Nov 1 21:31:07 2010 @@ -467,12 +467,9 @@ clear_error(); } -static -VOID -NTAPI -close_desktop_timeout( PKDPC Dpc, PVOID Context, PVOID SystemArgument1, PVOID SystemArgument2 ) -{ - struct desktop *desktop = Context; +static void close_desktop_timeout( void *private ) +{ + struct desktop *desktop = private; desktop->close_timeout = NULL; unlink_named_object( &desktop->obj ); /* make sure no other process can open it */

1 0

[jgardou] 49415: [PSDK] - add TrustedDomainAuthInformationInternal and TrustedDomainFullInformationInternalFix to _TRUSTED_INFORMATION_CLASS. Fixes build
by jgardou＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: jgardou Date: Mon Nov 1 20:55:11 2010 New Revision: 49415 URL: http://svn.reactos.org/svn/reactos?rev=49415&view=rev Log: [PSDK] - add TrustedDomainAuthInformationInternal and TrustedDomainFullInformationInternalFix to _TRUSTED_INFORMATION_CLASS. Fixes build Modified: trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Mon Nov 1 20:55:11 2010 @@ -318,7 +318,9 @@ TrustedDomainInformationBasic, TrustedDomainInformationEx, TrustedDomainAuthInformation, - TrustedDomainFullInformation + TrustedDomainFullInformation, + TrustedDomainAuthInformationInternal, + TrustedDomainFullInformationInternal } TRUSTED_INFORMATION_CLASS, *PTRUSTED_INFORMATION_CLASS; typedef enum _LSA_FOREST_TRUST_RECORD_TYPE { ForestTrustTopLevelName,

1 0

[tkreuzer] 49414: [HAL] Temporary build "fix"
by tkreuzer＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: tkreuzer Date: Mon Nov 1 19:11:27 2010 New Revision: 49414 URL: http://svn.reactos.org/svn/reactos?rev=49414&view=rev Log: [HAL] Temporary build "fix" Modified: branches/cmake-bringup/hal/halx86/generic/i386/systimer.S Modified: branches/cmake-bringup/hal/halx86/generic/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi… ============================================================================== --- branches/cmake-bringup/hal/halx86/generic/i386/systimer.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/generic/i386/systimer.S [iso-8859-1] Mon Nov 1 19:11:27 2010 @@ -39,7 +39,7 @@ /* GLOBALS *******************************************************************/ .data -ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING +//ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING PUBLIC _HalpPerfCounter _HalpLastPerfCounterLow: .long 0

1 0

[tkreuzer] 49413: {ASM] - Remove superfluous .code64 - Add some macros for MSVC
by tkreuzer＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: tkreuzer Date: Mon Nov 1 18:48:40 2010 New Revision: 49413 URL: http://svn.reactos.org/svn/reactos?rev=49413&view=rev Log: {ASM] - Remove superfluous .code64 - Add some macros for MSVC Modified: trunk/reactos/include/reactos/asm.h Modified: trunk/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.h?rev=… ============================================================================== --- trunk/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/asm.h [iso-8859-1] Mon Nov 1 18:48:40 2010 @@ -13,6 +13,7 @@ .586 .MODEL FLAT +ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING /* Hex numbers need to be in 01ABh format */ #define HEX(x) 0##x##h @@ -58,6 +59,22 @@ .code ENDM +.align MACRO alignment + ALIGN alignment +ENDM + +.byte MACRO args:VARARG + db args +ENDM + +.short MACRO args:VARARG + dw args +ENDM + +.long MACRO args:VARARG + dd args +ENDM + UNIMPLEMENTED MACRO name ENDM @@ -68,7 +85,6 @@ /* Force intel syntax */ .intel_syntax noprefix -.code64 .altmacro

1 0

[jgardou] 49412: [ASM] - no ML doesn't mean 64 bits, right?
by jgardou＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: jgardou Date: Mon Nov 1 18:42:33 2010 New Revision: 49412 URL: http://svn.reactos.org/svn/reactos?rev=49412&view=rev Log: [ASM] - no ML doesn't mean 64 bits, right? Modified: branches/cmake-bringup/include/reactos/asm.h Modified: branches/cmake-bringup/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/a… ============================================================================== --- branches/cmake-bringup/include/reactos/asm.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/asm.h [iso-8859-1] Mon Nov 1 18:42:33 2010 @@ -68,7 +68,6 @@ /* Force intel syntax */ .intel_syntax noprefix -.code64 .altmacro

1 0

[jgardou] 49411: [DXSDK] - an interface must have an uuid. If it "conflicts with uuids.h", then the problem il elsewhere.
by jgardou＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: jgardou Date: Mon Nov 1 18:24:17 2010 New Revision: 49411 URL: http://svn.reactos.org/svn/reactos?rev=49411&view=rev Log: [DXSDK] - an interface must have an uuid. If it "conflicts with uuids.h", then the problem il elsewhere. Modified: branches/cmake-bringup/include/dxsdk/amvideo.idl Modified: branches/cmake-bringup/include/dxsdk/amvideo.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/dxsdk/amv… ============================================================================== --- branches/cmake-bringup/include/dxsdk/amvideo.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/dxsdk/amvideo.idl [iso-8859-1] Mon Nov 1 18:24:17 2010 @@ -61,7 +61,7 @@ [ object, - /* uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a) conflicts with uuids.h */ + uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a), pointer_default(unique), local ] @@ -87,7 +87,7 @@ [ object, - /* uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3) conflicts with uuids.h */ + uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3), pointer_default(unique), local ] @@ -103,7 +103,7 @@ [ object, - /* uuid(dd1d7110-7836-11cf-bf47-00aa0055595a) conflicts with uuids.h */ + uuid(dd1d7110-7836-11cf-bf47-00aa0055595a), pointer_default(unique) ] interface IFullScreenVideo : IUnknown @@ -129,7 +129,7 @@ [ object, - /* uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6) conflicts with uuids.h */ + uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6), pointer_default(unique), local ] @@ -144,7 +144,7 @@ [ object, - /* uuid(61ded640-e912-11ce-a099-00aa00479a58) conflicts with uuids.h */ + uuid(61ded640-e912-11ce-a099-00aa00479a58), pointer_default(unique), local ]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs