Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[weiden] 14045: Alex Ionescu <ionucu@videotron.ca>

by weiden＠svn.reactos.com

Alex Ionescu <ionucu(a)videotron.ca> Dispatcher Objects Rewrite (minus Queues, coming in next patch). Global Changes: - Use KOBJECT enumerations for all objects, remove obsoleted ros-internal enumeration. - Reformatting, commenting, and addition of Debug Prints for easier debugging - Properly create Executive Objects. They don't need a creation routine. - Make sure to properly lock and release the Dispatcher Database. Mutex/Mutant: - Correct MUTANT_BASIC_INFORMATION - Return previous state in Kernel Functions, intead of 1 or 0 all the time. - Initialize listhead properly - Removed code duplication between mutant and mutex release. - Fix bugs in release - Add proper exeption if the mutex is not owned. Kernel Queues: - Optimize the code - Use Inserted Flag Timers: - Some changes in setting the default data to allow KiInsertTimer to be called internally by the wait code in the next patch. Events: - Optimize and simplify KeInitializeEvent - Implement KeInitializeEventPair - Fix KePulseEvent. It was completely messed up and also used unneeded Interlocked function. - Fix KeResetEvent. It was not locking the dispatcher lock but using Interlocked. - Fix KeSetEvent. It was not differentiating between Notification and Sycronization events and also signaling the Event even if nobody was waiting on it. Semaphores: - Fix KeReleaseSemaphore. It was not checking if nobody was waiting on it before unwaiting the thread. - Fix not releasing dispatcher database before raising an exception. - Add check to NtCreateSemaphore to make sure the counts make sense. Event Pairs: - Remove Thread Event Pair. They are only used for NT4 QuickLPC which is obsoleted. - Use KeInitializeEventPair Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/include/ntos/zwtypes.h Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/rundown.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Deleted: trunk/reactos/ntoskrnl/include/internal/id.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/create.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/wmi.c Modified: trunk/reactos/ntoskrnl/ke/device.c Modified: trunk/reactos/ntoskrnl/ke/event.c Modified: trunk/reactos/ntoskrnl/ke/kqueue.c Modified: trunk/reactos/ntoskrnl/ke/mutex.c Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/sem.c Modified: trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/tools/nci/sysfuncs.lst _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-03-14 01:47:18 UTC (rev 14044) +++ trunk/reactos/include/ddk/iotypes.h 2005-03-14 02:08:17 UTC (rev 14045) @@ -886,6 +886,8 @@ #endif #define IO_TYPE_DRIVER 4L +#define IO_TYPE_FILE 0x0F5L + #define DRVO_UNLOAD_INVOKED 0x1L #define DRVO_LEGACY_DRIVER 0x2L #define DRVO_BUILTIN_DRIVER 0x4L _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-03-14 01:47:18 UTC (rev 14044) +++ trunk/reactos/include/ntos/zwtypes.h 2005-03-14 02:08:17 UTC (rev 14045) @@ -58,6 +58,7 @@ ProfileTime } KPROFILE_SOURCE; + // file disposition values #define FILE_SUPERSEDE 0x0000 @@ -1271,9 +1272,9 @@ typedef struct _MUTANT_BASIC_INFORMATION { - LONG Count; - BOOLEAN Owned; - BOOLEAN Abandoned; + LONG CurrentCount; + BOOLEAN OwnedByCaller; + BOOLEAN AbandonedState; } MUTANT_BASIC_INFORMATION, *PMUTANT_BASIC_INFORMATION; _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-03-14 01:47:18 UTC (rev 14044) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-03-14 02:08:17 UTC (rev 14045) @@ -1,11 +1,11 @@ -/* $Id:$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/nt/event.c * PURPOSE: Named event support * - * PROGRAMMERS: Philip Susi and David Welch + * PROGRAMMERS: Alex Ionescu(alex(a)relsoft.net) - Fixed bugs/commented + * Philip Susi and David Welch */ /* INCLUDES *****************************************************************/ @@ -19,300 +19,287 @@ POBJECT_TYPE EXPORTED ExEventObjectType = NULL; static GENERIC_MAPPING ExpEventMapping = { - STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE, - STANDARD_RIGHTS_WRITE | SYNCHRONIZE | EVENT_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | EVENT_QUERY_STATE, - EVENT_ALL_ACCESS}; + STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE, + STANDARD_RIGHTS_WRITE | SYNCHRONIZE | EVENT_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | EVENT_QUERY_STATE, + EVENT_ALL_ACCESS}; -static const INFORMATION_CLASS_INFO ExEventInfoClass[] = -{ - ICI_SQ_SAME( sizeof(EVENT_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* EventBasicInformation */ +static const INFORMATION_CLASS_INFO ExEventInfoClass[] = { + + /* EventBasicInformation */ + ICI_SQ_SAME( sizeof(EVENT_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY), }; /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL -NtpCreateEvent(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - POBJECT_ATTRIBUTES ObjectAttributes) -{ - DPRINT("NtpCreateEvent(ObjectBody %x, Parent %x, RemainingPath %S)\n", - ObjectBody, Parent, RemainingPath); - - if (RemainingPath != NULL && wcschr(RemainingPath+1, '\\') != NULL) - { - return(STATUS_UNSUCCESSFUL); - } - - return(STATUS_SUCCESS); -} - - -VOID INIT_FUNCTION +VOID +INIT_FUNCTION ExpInitializeEventImplementation(VOID) { - ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - - RtlpCreateUnicodeString(&ExEventObjectType->TypeName, L"Event", NonPagedPool); - - ExEventObjectType->Tag = TAG('E', 'V', 'T', 'T'); - ExEventObjectType->PeakObjects = 0; - ExEventObjectType->PeakHandles = 0; - ExEventObjectType->TotalObjects = 0; - ExEventObjectType->TotalHandles = 0; - ExEventObjectType->PagedPoolCharge = 0; - ExEventObjectType->NonpagedPoolCharge = sizeof(KEVENT); - ExEventObjectType->Mapping = &ExpEventMapping; - ExEventObjectType->Dump = NULL; - ExEventObjectType->Open = NULL; - ExEventObjectType->Close = NULL; - ExEventObjectType->Delete = NULL; - ExEventObjectType->Parse = NULL; - ExEventObjectType->Security = NULL; - ExEventObjectType->QueryName = NULL; - ExEventObjectType->OkayToClose = NULL; - ExEventObjectType->Create = NtpCreateEvent; - ExEventObjectType->DuplicationNotify = NULL; - - ObpCreateTypeObject(ExEventObjectType); + /* Create the Event Object Type */ + ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); + RtlInitUnicodeString(&ExEventObjectType->TypeName, L"Event"); + ExEventObjectType->Tag = TAG('E', 'V', 'T', 'T'); + ExEventObjectType->PeakObjects = 0; + ExEventObjectType->PeakHandles = 0; + ExEventObjectType->TotalObjects = 0; + ExEventObjectType->TotalHandles = 0; + ExEventObjectType->PagedPoolCharge = 0; + ExEventObjectType->NonpagedPoolCharge = sizeof(KEVENT); + ExEventObjectType->Mapping = &ExpEventMapping; + ExEventObjectType->Dump = NULL; + ExEventObjectType->Open = NULL; + ExEventObjectType->Close = NULL; + ExEventObjectType->Delete = NULL; + ExEventObjectType->Parse = NULL; + ExEventObjectType->Security = NULL; + ExEventObjectType->QueryName = NULL; + ExEventObjectType->OkayToClose = NULL; + ExEventObjectType->Create = NULL; + ExEventObjectType->DuplicationNotify = NULL; + ObpCreateTypeObject(ExEventObjectType); } - /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtClearEvent(IN HANDLE EventHandle) { - PKEVENT Event; - NTSTATUS Status; + PKEVENT Event; + NTSTATUS Status; + + PAGED_CODE(); - PAGED_CODE(); + /* Reference the Object */ + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_MODIFY_STATE, + ExEventObjectType, + ExGetPreviousMode(), + (PVOID*)&Event, + NULL); - Status = ObReferenceObjectByHandle(EventHandle, - EVENT_MODIFY_STATE, - ExEventObjectType, - ExGetPreviousMode(), - (PVOID*)&Event, - NULL); - if(NT_SUCCESS(Status)) - { - KeClearEvent(Event); - ObDereferenceObject(Event); - } + /* Check for Success */ + if(NT_SUCCESS(Status)) { + + /* Clear the Event and Dereference */ + KeClearEvent(Event); + ObDereferenceObject(Event); + } - return Status; + /* Return Status */ + return Status; } /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtCreateEvent(OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN EVENT_TYPE EventType, - IN BOOLEAN InitialState) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN EVENT_TYPE EventType, + IN BOOLEAN InitialState) { - KPROCESSOR_MODE PreviousMode; - PKEVENT Event; - HANDLE hEvent; - NTSTATUS Status = STATUS_SUCCESS; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PKEVENT Event; + HANDLE hEvent; + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); + DPRINT("NtCreateEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode == UserMode) - { - _SEH_TRY - { - ProbeForWrite(EventHandle, - sizeof(HANDLE), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + /* Check Output Safety */ + if(PreviousMode != KernelMode) { + + _SEH_TRY { + + ProbeForWrite(EventHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; - if(!NT_SUCCESS(Status)) - { - return Status; - } - } + if(!NT_SUCCESS(Status)) return Status; + } + + /* Create the Object */ + Status = ObCreateObject(PreviousMode, + ExEventObjectType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(KEVENT), + 0, + 0, + (PVOID*)&Event); + + /* Check for Success */ + if(NT_SUCCESS(Status)) { + + /* Initalize the Event */ + KeInitializeEvent(Event, + EventType, + InitialState); + + /* Insert it */ + Status = ObInsertObject((PVOID)Event, + NULL, + DesiredAccess, + 0, + NULL, + &hEvent); + ObDereferenceObject(Event); - Status = ObCreateObject(PreviousMode, - ExEventObjectType, - ObjectAttributes, - PreviousMode, - NULL, - sizeof(KEVENT), - 0, - 0, - (PVOID*)&Event); - if(NT_SUCCESS(Status)) - { - KeInitializeEvent(Event, - EventType, - InitialState); - - - Status = ObInsertObject((PVOID)Event, - NULL, - DesiredAccess, - 0, - NULL, - &hEvent); - ObDereferenceObject(Event); - - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - *EventHandle = hEvent; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } - - return Status; + /* Check for success and return handle */ + if(NT_SUCCESS(Status)) { + + _SEH_TRY { + + *EventHandle = hEvent; + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + } + } + + /* Return Status */ + return Status; } - /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtOpenEvent(OUT PHANDLE EventHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) { - HANDLE hEvent; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + HANDLE hEvent; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - - DPRINT("NtOpenEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); + PAGED_CODE(); + DPRINT("NtOpenEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, DesiredAccess, ObjectAttributes); - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode == UserMode) - { - _SEH_TRY - { - ProbeForWrite(EventHandle, - sizeof(HANDLE), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + /* Check Output Safety */ + if(PreviousMode != KernelMode) { + + _SEH_TRY { + + ProbeForWrite(EventHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - Status = ObOpenObjectByName(ObjectAttributes, - ExEventObjectType, - NULL, - PreviousMode, - DesiredAccess, - NULL, - &hEvent); + if(!NT_SUCCESS(Status)) return Status; + } + + /* Open the Object */ + Status = ObOpenObjectByName(ObjectAttributes, + ExEventObjectType, + NULL, + PreviousMode, + DesiredAccess, + NULL, + &hEvent); - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - *EventHandle = hEvent; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } + /* Check for success and return handle */ + if(NT_SUCCESS(Status)) { + + _SEH_TRY { + + *EventHandle = hEvent; + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + } - return Status; + /* Return status */ + return Status; } - /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtPulseEvent(IN HANDLE EventHandle, - OUT PLONG PreviousState OPTIONAL) + OUT PLONG PreviousState OPTIONAL) { - PKEVENT Event; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + PKEVENT Event; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); + DPRINT("NtPulseEvent(EventHandle 0%x PreviousState 0%x)\n", + EventHandle, PreviousState); - DPRINT("NtPulseEvent(EventHandle 0%x PreviousState 0%x)\n", - EventHandle, PreviousState); + /* Check buffer validity */ + if(PreviousState && PreviousMode == UserMode) { + + _SEH_TRY { + + ProbeForWrite(PreviousState, + sizeof(LONG), + sizeof(ULONG)); + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; - PreviousMode = ExGetPreviousMode(); - - if(PreviousState != NULL && PreviousMode == UserMode) - { - _SEH_TRY - { - ProbeForWrite(PreviousState, - sizeof(LONG), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + if(!NT_SUCCESS(Status)) return Status; + } + + /* Open the Object */ + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_MODIFY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID*)&Event, + NULL); + + /* Check for success */ + if(NT_SUCCESS(Status)) { + + /* Pulse the Event */ + LONG Prev = KePulseEvent(Event, EVENT_INCREMENT, FALSE); + ObDereferenceObject(Event); - if(!NT_SUCCESS(Status)) - { - return Status; - } + /* Return it */ + if(PreviousState) { + + _SEH_TRY { + + *PreviousState = Prev; + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + } } - Status = ObReferenceObjectByHandle(EventHandle, - EVENT_MODIFY_STATE, - ExEventObjectType, - PreviousMode, - (PVOID*)&Event, - NULL); - if(NT_SUCCESS(Status)) - { - LONG Prev = KePulseEvent(Event, EVENT_INCREMENT, FALSE); - ObDereferenceObject(Event); - - if(PreviousState != NULL) - { - _SEH_TRY - { - *PreviousState = Prev; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } - + /* Return Status */ return Status; } @@ -320,230 +307,203 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtQueryEvent(IN HANDLE EventHandle, - IN EVENT_INFORMATION_CLASS EventInformationClass, - OUT PVOID EventInformation, - IN ULONG EventInformationLength, - OUT PULONG ReturnLength OPTIONAL) + IN EVENT_INFORMATION_CLASS EventInformationClass, + OUT PVOID EventInformation, + IN ULONG EventInformationLength, + OUT PULONG ReturnLength OPTIONAL) { - PKEVENT Event; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + PKEVENT Event; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PEVENT_BASIC_INFORMATION BasicInfo = (PEVENT_BASIC_INFORMATION)EventInformation; + + PAGED_CODE(); + DPRINT("NtQueryEvent(0x%x, 0x%x, 0x%x)\n", EventHandle, EventInformationClass); + + /* Check buffers and class validity */ + DefaultQueryInfoBufferCheck(EventInformationClass, + ExEventInfoClass, + EventInformation, + EventInformationLength, + ReturnLength, + PreviousMode, + &Status); + if(!NT_SUCCESS(Status)) { + + /* Invalid buffers */ + DPRINT("NtQuerySemaphore() failed, Status: 0x%x\n", Status); + return Status; + } - PAGED_CODE(); + /* Get the Object */ + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_QUERY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID*)&Event, + NULL); + + /* Check for success */ + if(NT_SUCCESS(Status)) { - PreviousMode = ExGetPreviousMode(); - - DefaultQueryInfoBufferCheck(EventInformationClass, - ExEventInfoClass, - EventInformation, - EventInformationLength, - ReturnLength, - PreviousMode, - &Status); - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryEvent() failed, Status: 0x%x\n", Status); - return Status; - } + _SEH_TRY { + + /* Return Event Type and State */ + BasicInfo->EventType = Event->Header.Type; + BasicInfo->EventState = KeReadStateEvent(Event); - Status = ObReferenceObjectByHandle(EventHandle, - EVENT_QUERY_STATE, - ExEventObjectType, - PreviousMode, - (PVOID*)&Event, - NULL); - if(NT_SUCCESS(Status)) - { - switch(EventInformationClass) - { - case EventBasicInformation: - { - PEVENT_BASIC_INFORMATION BasicInfo = (PEVENT_BASIC_INFORMATION)EventInformation; - - _SEH_TRY - { - if (Event->Header.Type == InternalNotificationEvent) - BasicInfo->EventType = NotificationEvent; - else - BasicInfo->EventType = SynchronizationEvent; - BasicInfo->EventState = KeReadStateEvent(Event); - - if(ReturnLength != NULL) - { - *ReturnLength = sizeof(EVENT_BASIC_INFORMATION); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - default: - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - ObDereferenceObject(Event); + /* Return length */ + if(ReturnLength) *ReturnLength = sizeof(EVENT_BASIC_INFORMATION); + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + + /* Dereference the Object */ + ObDereferenceObject(Event); } + /* Return status */ return Status; } - /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtResetEvent(IN HANDLE EventHandle, - OUT PLONG PreviousState OPTIONAL) + OUT PLONG PreviousState OPTIONAL) { - PKEVENT Event; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + PKEVENT Event; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); + DPRINT("NtResetEvent(EventHandle 0%x PreviousState 0%x)\n", + EventHandle, PreviousState); - DPRINT("NtResetEvent(EventHandle 0%x PreviousState 0%x)\n", - EventHandle, PreviousState); + /* Check buffer validity */ + if(PreviousState && PreviousMode == UserMode) { + + _SEH_TRY { + + ProbeForWrite(PreviousState, + sizeof(LONG), + sizeof(ULONG)); + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; - PreviousMode = ExGetPreviousMode(); + if(!NT_SUCCESS(Status)) return Status; + } - if(PreviousState != NULL && PreviousMode == UserMode) - { - _SEH_TRY - { - ProbeForWrite(PreviousState, - sizeof(LONG), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + /* Open the Object */ + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_MODIFY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID*)&Event, + NULL); + + /* Check for success */ + if(NT_SUCCESS(Status)) { + + /* Reset the Event */ + LONG Prev = KeResetEvent(Event); + ObDereferenceObject(Event); - if(!NT_SUCCESS(Status)) - { - return Status; - } + /* Return it */ + if(PreviousState) { + + _SEH_TRY { + + *PreviousState = Prev; + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + } } - Status = ObReferenceObjectByHandle(EventHandle, - EVENT_MODIFY_STATE, - ExEventObjectType, - PreviousMode, - (PVOID*)&Event, - NULL); - if(NT_SUCCESS(Status)) - { - LONG Prev = KeResetEvent(Event); - ObDereferenceObject(Event); - - if(PreviousState != NULL) - { - _SEH_TRY - { - *PreviousState = Prev; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } - + /* Return Status */ return Status; } - /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL NtSetEvent(IN HANDLE EventHandle, - OUT PLONG PreviousState OPTIONAL) + OUT PLONG PreviousState OPTIONAL) { - PKEVENT Event; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + PKEVENT Event; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); + DPRINT("NtSetEvent(EventHandle 0%x PreviousState 0%x)\n", + EventHandle, PreviousState); - DPRINT("NtSetEvent(EventHandle 0%x PreviousState 0%x)\n", - EventHandle, PreviousState); + /* Check buffer validity */ + if(PreviousState != NULL && PreviousMode == UserMode) { + + _SEH_TRY { + + ProbeForWrite(PreviousState, + sizeof(LONG), + sizeof(ULONG)); + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; - PreviousMode = ExGetPreviousMode(); + if(!NT_SUCCESS(Status)) return Status; + } - if(PreviousState != NULL && PreviousMode == UserMode) - { - _SEH_TRY - { - ProbeForWrite(PreviousState, - sizeof(LONG), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } + /* Open the Object */ + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_MODIFY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID*)&Event, + NULL); + + /* Check for success */ + if(NT_SUCCESS(Status)) { - Status = ObReferenceObjectByHandle(EventHandle, - EVENT_MODIFY_STATE, - ExEventObjectType, - PreviousMode, - (PVOID*)&Event, - NULL); - if(NT_SUCCESS(Status)) - { - LONG Prev = KeSetEvent(Event, EVENT_INCREMENT, FALSE); - ObDereferenceObject(Event); + /* Set the Event */ + LONG Prev = KeSetEvent(Event, EVENT_INCREMENT, FALSE); + ObDereferenceObject(Event); - if(PreviousState != NULL) - { - _SEH_TRY - { - *PreviousState = Prev; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } + /* Return it */ + if(PreviousState) { + + _SEH_TRY { + + *PreviousState = Prev; + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + } } + /* Return Status */ return Status; } - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -NtTraceEvent( - IN ULONG TraceHandle, - IN ULONG Flags, - IN ULONG TraceHeaderLength, - IN struct _EVENT_TRACE_HEADER* TraceHeader - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ex/evtpair.c --- trunk/reactos/ntoskrnl/ex/evtpair.c 2005-03-14 01:47:18 UTC (rev 14044) +++ trunk/reactos/ntoskrnl/ex/evtpair.c 2005-03-14 02:08:17 UTC (rev 14045) @@ -1,11 +1,12 @@ -/* $Id: evtpair.c 12779 2005-01-04 04:45:00Z gdalsnes $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/evtpair.c * PURPOSE: Support for event pairs * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Alex Ionescu (Commented, reorganized, removed Thread Pair, used + * KeInitializeEventPair, added SEH) + * David Welch (welch(a)mcmail.com) * Skywing (skywing(a)valhallalegends.com) */ @@ -15,588 +16,404 @@ #define NDEBUG #include <internal/debug.h> -#ifndef NTSYSAPI -#define NTSYSAPI [truncated at 1000 lines; 4192 more skipped]

19 years, 6 months

[weiden] 14044: don't receive the previous mode before the current thread was created, this should finally fix the boot.

by weiden＠svn.reactos.com

don't receive the previous mode before the current thread was created, this should finally fix the boot. Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/ps/create.c Modified: trunk/reactos/ntoskrnl/ps/idle.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-03-14 00:36:02 UTC (rev 14043) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-03-14 01:47:18 UTC (rev 14044) @@ -455,6 +455,7 @@ PsInitializeThread(PEPROCESS Process, PETHREAD* ThreadPtr, POBJECT_ATTRIBUTES ObjectAttributes, + KPROCESSOR_MODE AccessMode, BOOLEAN First); PACCESS_TOKEN PsReferenceEffectiveToken(PETHREAD Thread, @@ -532,6 +533,8 @@ PsApplicationProcessorInit(VOID); VOID PsPrepareForApplicationProcessorInit(ULONG Id); +VOID +PsInitReaperThread(VOID); VOID STDCALL PsIdleThreadMain(PVOID Context); _____ Modified: trunk/reactos/ntoskrnl/ps/create.c --- trunk/reactos/ntoskrnl/ps/create.c 2005-03-14 00:36:02 UTC (rev 14043) +++ trunk/reactos/ntoskrnl/ps/create.c 2005-03-14 01:47:18 UTC (rev 14044) @@ -399,17 +399,15 @@ PsInitializeThread(PEPROCESS Process, PETHREAD* ThreadPtr, POBJECT_ATTRIBUTES ObjectAttributes, + KPROCESSOR_MODE AccessMode, BOOLEAN First) { PETHREAD Thread; NTSTATUS Status; - KPROCESSOR_MODE PreviousMode; KIRQL oldIrql; PAGED_CODE(); - PreviousMode = ExGetPreviousMode(); - if (Process == NULL) { Process = PsInitialSystemProcess; @@ -418,7 +416,7 @@ /* * Create and initialize thread */ - Status = ObCreateObject(PreviousMode, + Status = ObCreateObject(AccessMode, PsThreadType, ObjectAttributes, KernelMode, @@ -730,6 +728,7 @@ Status = PsInitializeThread(Process, &Thread, ObjectAttributes, + PreviousMode, FALSE); ObDereferenceObject(Process); @@ -877,6 +876,7 @@ Status = PsInitializeThread(NULL, &Thread, ObjectAttributes, + KernelMode, FALSE); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/ntoskrnl/ps/idle.c --- trunk/reactos/ntoskrnl/ps/idle.c 2005-03-14 00:36:02 UTC (rev 14043) +++ trunk/reactos/ntoskrnl/ps/idle.c 2005-03-14 01:47:18 UTC (rev 14044) @@ -57,6 +57,7 @@ Status = PsInitializeThread(NULL, &IdleThread, NULL, + KernelMode, FALSE); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-03-14 00:36:02 UTC (rev 14043) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-03-14 01:47:18 UTC (rev 14044) @@ -30,6 +30,7 @@ PsInitProcessManagment(); PsInitThreadManagment(); PsInitIdleThread(); + PsInitReaperThread(); PsInitialiseSuspendImplementation(); PsInitialiseW32Call(); } _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-03-14 00:36:02 UTC (rev 14043) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-03-14 01:47:18 UTC (rev 14044) @@ -709,6 +709,7 @@ PsInitializeThread(NULL, &IdleThread, NULL, + KernelMode, FALSE); IdleThread->Tcb.State = THREAD_STATE_RUNNING; IdleThread->Tcb.FreezeCount = 0; @@ -731,10 +732,8 @@ * FUNCTION: Initialize thread managment */ { - PETHREAD FirstThread, ReaperThread; + PETHREAD FirstThread; ULONG i; - KIRQL oldIrql; - NTSTATUS Status; for (i=0; i < MAXIMUM_PRIORITY; i++) { @@ -766,7 +765,7 @@ ObpCreateTypeObject(PsThreadType); - PsInitializeThread(NULL, &FirstThread, NULL, TRUE); + PsInitializeThread(NULL, &FirstThread, NULL, KernelMode, TRUE); FirstThread->Tcb.State = THREAD_STATE_RUNNING; FirstThread->Tcb.FreezeCount = 0; FirstThread->Tcb.UserAffinity = (1 << 0); /* Set the affinity of the first thread to the boot processor */ @@ -776,7 +775,15 @@ DPRINT("FirstThread %x\n",FirstThread); DoneInitYet = TRUE; +} +VOID +PsInitReaperThread(VOID) +{ + PETHREAD ReaperThread; + KIRQL oldIrql; + NTSTATUS Status; + /* * Create the reaper thread */ @@ -785,6 +792,7 @@ Status = PsInitializeThread(NULL, &ReaperThread, NULL, + KernelMode, FALSE); if (!NT_SUCCESS(Status)) {

19 years, 6 months

[greatlrd] 14043: GetDeviceData

by greatlrd＠svn.reactos.com

GetDeviceData fix the choppy mouse in UT and fix some other small bugs. I can now use the mouse with out any problem in UT Modified: trunk/reactos/lib/dinput/mouse.c _____ Modified: trunk/reactos/lib/dinput/mouse.c --- trunk/reactos/lib/dinput/mouse.c 2005-03-13 23:10:25 UTC (rev 14042) +++ trunk/reactos/lib/dinput/mouse.c 2005-03-14 00:36:02 UTC (rev 14043) @@ -880,6 +880,7 @@ if (flags != DIGDD_PEEK) { +getmousesvalue(iface); b[0] = ((GetKeyState(VK_LBUTTON) & 0x80) ? 0xFF : 0x00); b[1] = ((GetKeyState(VK_RBUTTON) & 0x80) ? 0xFF : 0x00); b[2] = ((GetKeyState(VK_MBUTTON) & 0x80) ? 0xFF : 0x00); @@ -890,45 +891,59 @@ #endif + + + + + + + if (This->acquired == 0) { + WARN(" application tries to get data from an unacquired device !\n"); + //return DIERR_NOTACQUIRED; + // windows does not get any data if // we do not call manual to mouse Acquire // this is only need if some apps calling on getdevice data direcly // in windows GetdeviceData does always update first the data // then return it. - //SysMouseAImpl_Acquire(iface); < -- remove it geting UT2004 working - // less choopy but it need when user hook are implement in ros. + SysMouseAImpl_Acquire(iface); + } + - if (This->acquired == 0) { - WARN(" application tries to get data from an unacquired device !\n"); - return DIERR_NOTACQUIRED; - } #ifdef __REACTOS__ - + + if (*entries == 0) return DIERR_INVALIDPARAM; + + if (dodsize < sizeof(DIDEVICEOBJECTDATA_DX3)) { + ERR("Wrong structure size !\n"); + return DIERR_INVALIDPARAM; + } + if (This->data_queue==NULL) { + WARN("No buffer have been set up !\n"); + return DIERR_NOTINITIALIZED; + } FIXME("This is broken in Tribes ??, need right implant of the buffer!!!!!!!!\n"); - - + if (GetTickCount()-time <50) { + *entries=0; return DI_OK; } time = GetTickCount(); - if (*entries == 0) return DIERR_INVALIDPARAM; + for (count=0;count<*entries;count++) { if (save_point.x != point.x) { dod[count_ent].dwOfs = DIMOFS_X; - calc = point.x - save_point.x; - if (calc >2) dod[count_ent].dwData = 2; - else if (calc < -2) dod[count_ent].dwData = -2; - else dod[count_ent].dwData = calc; - + + dod[count_ent].dwData = point.x - save_point.x; dod[count_ent].dwTimeStamp = time +1; dod[count_ent].dwSequence = last_event++; count_ent++; @@ -936,11 +951,8 @@ } else if (save_point.y != point.y) { - dod[count_ent].dwOfs = DIMOFS_Y; - calc = point.y - save_point.y; - if (calc >2) dod[count_ent].dwData = 2; - else if (calc < -2) dod[count_ent].dwData = -2; - else dod[count_ent].dwData = calc; + dod[count_ent].dwOfs = DIMOFS_Y; + dod[count_ent].dwData = point.y - save_point.y; dod[count_ent].dwTimeStamp = time +1; dod[count_ent].dwSequence = last_event++; @@ -1102,6 +1114,7 @@ case (DWORD) DIPROP_AXISMODE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; This->absolute = !(pd->dwData); + TRACE("Using %s coordinates mode now\n", This->absolute ? "absolute" : "relative"); break; }

19 years, 6 months

[chorns] 14032: * Introduce ROS_OUTPUT

by chorns＠svn.reactos.com

* Introduce ROS_OUTPUT * Correct dependencies for ROS_INTERMEDIATE <> . in bootstrap makefiles * GNU make don't support depending on a directory, so simulate the dependency using a file Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c Modified: branches/xmlbuildsystem/reactos/tools/tools.mak Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak Modified: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak Property changes on: branches/xmlbuildsystem/reactos ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.zip *.iso *.cab *.bat doxy-doc Makefile.auto cd + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.zip *.iso *.cab *.bat obj-* output-* doxy-doc Makefile.auto cd _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-13 21:29:49 UTC (rev 14031) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-13 21:30:35 UTC (rev 14032) @@ -1,3 +1,19 @@ +# Accepted environment variables: +# +# ROS_INTERMEDIATE +# This variable controls where to put intermediate files. Intermediate +# files are generated files that are needed to generate the final +# output files. Examples of intermediate files include *.o, *.a, and +# *.coff. N.B. Don't put a path separator at the end. The variable +# defaults to .\obj-i386. +# +# ROS_OUTPUT +# This variable controls where to put output files. Output files are +# generated files that makes up the result of the build process. +# Examples of output files include *.exe, *.dll, and *.sys. N.B. Don't +# put a path separator at the end. The variable defaults to .\output-i386. +# + .PHONY: all .PHONY: clean all: makefile.auto @@ -85,7 +101,8 @@ else # mingw32-windows EXEPREFIX = EXEPOSTFIX = .exe - SEP = \$(EMPTY_VAR) + ROS_EMPTY = + SEP = \$(ROS_EMPTY) nmkdir = $(Q)mkdir gcc = $(Q)gcc gpp = $(Q)g++ @@ -100,19 +117,28 @@ endif ifneq ($(ROS_INTERMEDIATE),) -$(ROS_INTERMEDIATE): - ${nmkdir} $(ROS_INTERMEDIATE) -$(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE) - ${nmkdir} $@ -$(ROS_INTERMEDIATE)dk: $(ROS_INTERMEDIATE) - ${nkmdir} $@ -$(ROS_INTERMEDIATE)dk$(SEP)nkm: $(ROS_INTERMEDIATE)dk - ${nkmdir} $@ + INTERMEDIATE = .$(SEP)$(ROS_INTERMEDIATE)$(SEP) + INTERMEDIATE_NO_SLASH := $(ROS_INTERMEDIATE) +else + INTERMEDIATE = obj-i386$(SEP) + INTERMEDIATE_NO_SLASH = obj-i386 endif -$(ROS_INTERMEDIATE)dk$(SEP)nkm$(SEP)lib: $(ROS_INTERMEDIATE)dk$(SEP)nkm - ${nmkdir} $@ +ifneq ($(ROS_OUTPUT),) + OUTPUT = $(ROS_OUTPUT)$(SEP) + OUTPUT_NO_SLASH = $(ROS_OUTPUT) +else + OUTPUT = obj-i386$(SEP) + OUTPUT_NO_SLASH = obj-i386 +endif +mkdir = $(Q)$(INTERMEDIATE)rmkdir +CREATED = .created + +directories: + -${nmkdir} $(INTERMEDIATE_NO_SLASH) + -${nmkdir} $(OUTPUT_NO_SLASH) + NTOSKRNL_MC = .$(SEP)ntoskrnl$(SEP)ntoskrnl.mc KERNEL32_MC = .$(SEP)lib$(SEP)kernel32$(SEP)kernel32.mc BUILDNO_H = .$(SEP)include$(SEP)reactos$(SEP)buildno.h @@ -146,4 +172,6 @@ .PHONY: makefile_auto_clean makefile_auto_clean: -@$(rm) makefile.auto $(PREAUTO) 2>$(NUL) + +.PHONY: clean clean: makefile_auto_clean _____ Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak --- branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-13 21:29:49 UTC (rev 14031) +++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-13 21:30:35 UTC (rev 14032) @@ -1,7 +1,12 @@ -BUILDNO_BASE = .$(SEP)tools$(SEP)buildno +BUILDNO_BASE = tools$(SEP)buildno +BUILDNO_BASE_DIR = $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)$(CREATED) + +$(BUILDNO_BASE_DIR): $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(BUILDNO_BASE) + BUILDNO_TARGET = \ - $(ROS_INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX) + $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX) BUILDNO_SOURCES = \ $(BUILDNO_BASE)$(SEP)buildno.cpp \ @@ -10,35 +15,35 @@ $(BUILDNO_BASE)$(SEP)XML.cpp BUILDNO_OBJECTS = \ - $(BUILDNO_SOURCES:.cpp=.o) + $(addprefix $(INTERMEDIATE), $(BUILDNO_SOURCES:.cpp=.o)) BUILDNO_HOST_CFLAGS = -Iinclude/reactos -g -Werror -Wall BUILDNO_HOST_LFLAGS = -g -$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) +$(BUILDNO_TARGET): $(BUILDNO_BASE_DIR) $(BUILDNO_OBJECTS) $(ECHO_LD) ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_CFLAGS) -o $(BUILDNO_TARGET) -$(BUILDNO_OBJECTS): %.o : %.cpp include$(SEP)reactos$(SEP)version.h +$(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)buildno.cpp $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ + ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $(BUILDNO_BASE)$(SEP)buildno.cpp -o $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno.o +$(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)exception.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)exception.cpp + $(ECHO_CC) + ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $(BUILDNO_BASE)$(SEP)exception.cpp -o $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)exception.o + +$(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)ssprintf.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)ssprintf.cpp + $(ECHO_CC) + ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $(BUILDNO_BASE)$(SEP)ssprintf.cpp -o $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)ssprintf.o + +$(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)XML.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)XML.cpp + $(ECHO_CC) + ${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $(BUILDNO_BASE)$(SEP)XML.cpp -o $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)XML.o + .PHONY: buildno_clean buildno_clean: -@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL) -clean: buildno_clean -# BUILDNO_H is defined from the top-level makefile now... -#BUILDNO_H = .$(SEP)include$(SEP)reactos$(SEP)buildno.h - -.PHONY: buildno_h -buildno_h: $(BUILDNO_H) - $(BUILDNO_H): $(BUILDNO_TARGET) - $(BUILDNO_TARGET) $(BUILDNO_H) - -.PHONY: buildno_h_clean -buildno_h_clean: - -@$(rm) $(BUILDNO_H) -clean: buildno_h_clean + $(EXEPREFIX)$(BUILDNO_TARGET) $(BUILDNO_H) _____ Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak --- branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-03-13 21:29:49 UTC (rev 14031) +++ branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-03-13 21:30:35 UTC (rev 14032) @@ -1,7 +1,12 @@ -CDMAKE_BASE = .$(SEP)tools$(SEP)cdmake +CDMAKE_BASE = tools$(SEP)cdmake +CDMAKE_BASE_DIR = $(INTERMEDIATE)$(CDMAKE_BASE)$(SEP)$(CREATED) + +$(CDMAKE_BASE_DIR): $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(CDMAKE_BASE) + CDMAKE_TARGET = \ - $(ROS_INTERMEDIATE)$(CDMAKE_BASE)$(SEP)cdmake$(EXEPOSTFIX) + $(INTERMEDIATE)$(CDMAKE_BASE)$(SEP)cdmake$(EXEPOSTFIX) CDMAKE_SOURCES = \ $(CDMAKE_BASE)$(SEP)cdmake.c \ @@ -14,11 +19,11 @@ CDMAKE_HOST_LFLAGS = -g -$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) +$(CDMAKE_TARGET): $(CDMAKE_BASE_DIR) $(CDMAKE_OBJECTS) $(ECHO_LD) ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_CFLAGS) -o $(CDMAKE_TARGET) -$(CDMAKE_OBJECTS): %.o : %.c +$(CDMAKE_OBJECTS): %.o : %.c $(CDMAKE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(CDMAKE_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak --- branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-03-13 21:29:49 UTC (rev 14031) +++ branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-03-13 21:30:35 UTC (rev 14032) @@ -1,25 +1,30 @@ -NCI_BASE = .$(SEP)tools$(SEP)nci +NCI_BASE = tools$(SEP)nci +CDMAKE_BASE_DIR = $(INTERMEDIATE)$(NCI_BASE)$(SEP)$(CREATED) + +$(CDMAKE_BASE_DIR): $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(NCI_BASE) + NCI_TARGET = \ - $(ROS_INTERMEDIATE)$(NCI_BASE)$(SEP)nci$(EXEPOSTFIX) + $(INTERMEDIATE)$(NCI_BASE)$(SEP)nci$(EXEPOSTFIX) NCI_SOURCES = \ $(NCI_BASE)$(SEP)ncitool.c NCI_OBJECTS = \ - $(NCI_SOURCES:.c=.o) + $(addprefix $(INTERMEDIATE), $(NCI_SOURCES:.c=.o)) NCI_HOST_CFLAGS = -Iinclude -g -Werror -Wall NCI_HOST_LFLAGS = -g -$(NCI_TARGET): $(NCI_OBJECTS) +$(NCI_TARGET): $(CDMAKE_BASE_DIR) $(NCI_OBJECTS) $(ECHO_LD) ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_CFLAGS) -o $(NCI_TARGET) -$(NCI_OBJECTS): %.o : %.c +$(INTERMEDIATE)$(NCI_BASE)$(SEP)ncitool.o: $(CDMAKE_BASE_DIR) $(NCI_BASE)$(SEP)ncitool.c $(ECHO_CC) - ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ + ${host_gcc} $(NCI_HOST_CFLAGS) -c $(NCI_BASE)$(SEP)ncitool.c -o $(INTERMEDIATE)$(NCI_BASE)$(SEP)ncitool.o .PHONY: nci_clean nci_clean: _____ Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c --- branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-03-13 21:29:49 UTC (rev 14031) +++ branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-03-13 21:30:35 UTC (rev 14032) @@ -2,6 +2,7 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> +#include <fcntl.h> #ifdef _MSC_VER #include <direct.h> #else @@ -9,6 +10,12 @@ #include <sys/stat.h> #include <sys/types.h> #endif +#ifdef WIN32 +#include <sys/utime.h> +#include <time.h> +#else +#include <sys/time.h> +#endif #if defined(WIN32) #define DIR_SEPARATOR_CHAR '\\' @@ -24,6 +31,7 @@ { char* newpath; int i; + int length; //newpath = strdup(origpath); newpath=malloc(strlen(origpath)+1); @@ -47,6 +55,13 @@ #endif i++; } + + length = strlen(newpath); + if (length > 0) + { + if (newpath[length - 1] == DIR_SEPARATOR_CHAR) + newpath[length - 1] = 0; + } return(newpath); } @@ -80,6 +95,43 @@ return(0); } +int +write_created_file() +{ + char filename[256]; + int id; +#ifdef WIN32 + time_t now; + struct utimbuf fnow; +#endif + + strcpy(filename, ".created"); + + id = open(filename, S_IWRITE, S_IRUSR | S_IWUSR); + if (id < 0) + { + id = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); + if (id < 0) + { + fprintf(stderr, "Cannot create file %s.\n", filename); + return(1); + } + } + + close(id); + +#ifdef WIN32 + now = time(NULL); + fnow.actime = now; + fnow.modtime = now; + (int) utime(filename, &fnow); +#else + (int) utimes(filename, NULL); +#endif + + return 0; +} + int main(int argc, char* argv[]) { char* path1; @@ -113,9 +165,10 @@ while (csec != NULL) { - mkdir_p(csec); + if (mkdir_p(csec) > 0) + exit(1); csec = strtok(NULL, DIR_SEPARATOR_STRING); } - - exit(0); + + exit(write_created_file()); } _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-13 21:29:49 UTC (rev 14031) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-13 21:30:35 UTC (rev 14032) @@ -1,13 +1,17 @@ +# We have to put rmkdir in $(INTERMEDIATE) and not $(INTERMEDIATE)tools +# since GNU make will always remake directory targets and we can't do the +# .created file trick for rmkdir due to circular dependencies + RMKDIR_BASE = tools RMKDIR_TARGET = \ - $(ROS_INTERMEDIATE)$(RMKDIR_BASE)$(SEP)rmkdir$(EXEPOSTFIX) + $(INTERMEDIATE)rmkdir$(EXEPOSTFIX) RMKDIR_SOURCES = \ $(RMKDIR_BASE)$(SEP)rmkdir.c RMKDIR_OBJECTS = \ - $(RMKDIR_SOURCES:.c=.o) + $(INTERMEDIATE)rmkdir.o RMKDIR_HOST_CFLAGS = -g -Werror -Wall @@ -17,9 +21,9 @@ $(ECHO_LD) ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET) -$(RMKDIR_OBJECTS): %.o : %.c +$(INTERMEDIATE)rmkdir.o: $(RMKDIR_BASE)$(SEP)rmkdir.c $(ECHO_CC) - ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $< -o $@ + ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $(RMKDIR_BASE)$(SEP)rmkdir.c -o $(INTERMEDIATE)rmkdir.o .PHONY: rmkdir_clean rmkdir_clean: @@ -30,7 +34,7 @@ RSYM_BASE = tools RSYM_TARGET = \ - $(ROS_INTERMEDIATE)$(RSYM_BASE)$(SEP)rsym$(EXEPOSTFIX) + $(INTERMEDIATE)$(RSYM_BASE)$(SEP)rsym$(EXEPOSTFIX) RSYM_SOURCES = \ $(RSYM_BASE)$(SEP)rsym.c _____ Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak --- branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-03-13 21:29:49 UTC (rev 14031) +++ branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-03-13 21:30:35 UTC (rev 14032) @@ -1,7 +1,12 @@ -UNICODE_BASE = .$(SEP)tools$(SEP)unicode +UNICODE_BASE = tools$(SEP)unicode +UNICODE_BASE_DIR = $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)$(CREATED) + +$(UNICODE_BASE_DIR): $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(UNICODE_BASE) + UNICODE_TARGET = \ - $(ROS_INTERMEDIATE)$(UNICODE_BASE)$(SEP)libunicode.a + $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)libunicode.a UNICODE_CODEPAGES = \ 037 \ @@ -76,24 +81,288 @@ $(addprefix $(UNICODE_BASE)$(SEP), $(UNICODE_CODEPAGES:%=c_%.o)) UNICODE_OBJECTS = \ - $(UNICODE_SOURCES:.c=.o) + $(addprefix $(INTERMEDIATE), $(UNICODE_SOURCES:.c=.o)) UNICODE_HOST_CFLAGS = \ -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ - -I$(UNICODE_BASE) -Iinclude/wine -Iw32api/include + -I$(UNICODE_BASE) -Iinclude/wine .PHONY: unicode unicode: $(UNICODE_TARGET) -$(UNICODE_TARGET): $(UNICODE_OBJECTS) +$(UNICODE_TARGET): $(UNICODE_BASE_DIR) $(UNICODE_OBJECTS) $(ECHO_AR) ${host_ar} -rc $(UNICODE_TARGET) $(UNICODE_OBJECTS) -$(UNICODE_OBJECTS): %.o : %.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)casemap.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)casemap.c $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)casemap.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)casemap.o +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)compose.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)compose.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)compose.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)compose.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)cptable.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)cptable.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)cptable.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)cptable.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)mbtowc.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)mbtowc.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)mbtowc.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)mbtowc.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)string.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)string.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)string.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)string.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctomb.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)wctomb.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)wctomb.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctomb.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctype.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)wctype.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)wctype.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctype.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_037.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_037.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_037.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_037.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_424.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_424.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_424.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_424.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_437.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_437.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_437.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_437.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_500.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_500.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_500.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_500.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_737.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_737.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_737.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_737.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_775.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_775.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_775.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_775.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_850.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_850.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_850.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_850.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_852.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_852.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_852.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_852.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_855.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_855.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_855.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_855.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_856.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_856.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_856.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_856.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_857.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_857.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_857.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_857.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_860.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_860.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_860.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_860.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_861.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_861.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_861.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_861.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_862.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_862.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_862.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_862.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_863.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_863.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_863.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_863.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_864.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_864.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_864.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_864.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_865.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_865.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_865.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_865.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_866.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_866.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_866.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_866.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_869.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_869.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_869.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_869.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_874.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_874.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_874.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_874.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_875.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_875.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_875.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_875.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_878.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_878.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_878.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_878.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_932.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_932.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_932.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_932.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_936.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_936.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_936.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_936.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_949.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_949.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_949.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_949.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_950.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_950.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_950.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_950.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1006.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1006.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1006.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1006.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1026.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1026.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1026.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1026.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1250.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1250.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1250.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1250.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1251.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1251.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1251.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1251.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1252.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1252.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1252.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1252.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1253.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1253.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1253.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1253.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1254.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1254.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1254.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1254.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1255.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1255.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1255.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1255.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1256.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1256.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1256.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1256.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1257.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1257.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1257.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1257.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1258.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1258.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1258.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1258.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10000.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10000.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10000.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10000.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10006.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10006.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10006.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10006.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10007.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10007.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10007.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10007.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10029.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10029.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10029.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10029.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10079.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10079.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10079.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10079.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10081.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10081.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10081.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10081.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20866.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_20866.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_20866.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20866.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20932.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_20932.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_20932.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20932.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_21866.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_21866.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_21866.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_21866.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28591.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28591.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28591.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28591.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28592.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28592.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28592.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28592.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28593.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28593.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28593.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28593.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28594.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28594.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28594.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28594.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28595.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28595.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28595.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28595.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28596.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28596.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28596.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28596.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28597.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28597.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28597.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28597.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28598.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28598.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28598.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28598.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28599.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28599.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28599.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28599.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28600.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28600.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28600.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28600.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28603.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28603.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28603.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28603.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28604.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28604.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28604.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28604.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28605.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28605.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28605.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28605.o + +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28606.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28606.c + $(ECHO_CC) + ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28606.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28606.o + .PHONY: unicode_clean unicode_clean: -@$(rm) $(UNICODE_TARGET) $(UNICODE_OBJECTS) 2>$(NUL) _____ Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak --- branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak 2005-03-13 21:29:49 UTC (rev 14031) +++ branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak 2005-03-13 21:30:35 UTC (rev 14032) @@ -1,5 +1,10 @@ -WMC_BASE = .$(SEP)tools$(SEP)wmc +WMC_BASE = tools$(SEP)wmc +WMC_BASE_DIR = $(INTERMEDIATE)$(WMC_BASE)$(SEP)$(CREATED) + +$(WMC_BASE_DIR): $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(WMC_BASE) + WMC_TARGET = \ $(ROS_INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX) @@ -14,20 +19,48 @@ $(WMC_BASE)$(SEP)misc.c WMC_OBJECTS = \ - $(WMC_SOURCES:.c=.o) + $(addprefix $(INTERMEDIATE), $(WMC_SOURCES:.c=.o)) WMC_HOST_CXXFLAGS = -I$(WMC_BASE) -g -Werror -Wall WMC_HOST_LFLAGS = -g -$(WMC_TARGET): $(WMC_OBJECTS) +$(WMC_TARGET): $(WMC_BASE_DIR) $(WMC_OBJECTS) $(ECHO_LD) ${host_gcc} $(WMC_OBJECTS) $(WMC_HOST_LFLAGS) -o $(WMC_TARGET) -$(WMC_OBJECTS): %.o : %.c +$(INTERMEDIATE)$(WMC_BASE)$(SEP)getopt.o: $(WMC_BASE_DIR) $(WMC_BASE)$(SEP)getopt.c $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ + ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $(WMC_BASE)$(SEP)getopt.c -o $(INTERMEDIATE)$(WMC_BASE)$(SEP)getopt.o +$(INTERMEDIATE)$(WMC_BASE)$(SEP)lang.o: $(WMC_BASE_DIR) $(WMC_BASE)$(SEP)lang.c + $(ECHO_CC) + ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $(WMC_BASE)$(SEP)lang.c -o $(INTERMEDIATE)$(WMC_BASE)$(SEP)lang.o + +$(INTERMEDIATE)$(WMC_BASE)$(SEP)mcl.o: $(WMC_BASE_DIR) $(WMC_BASE)$(SEP)mcl.c + $(ECHO_CC) + ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $(WMC_BASE)$(SEP)mcl.c -o $(INTERMEDIATE)$(WMC_BASE)$(SEP)mcl.o + +$(INTERMEDIATE)$(WMC_BASE)$(SEP)utils.o: $(WMC_BASE_DIR) $(WMC_BASE)$(SEP)utils.c + $(ECHO_CC) + ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $(WMC_BASE)$(SEP)utils.c -o $(INTERMEDIATE)$(WMC_BASE)$(SEP)utils.o + +$(INTERMEDIATE)$(WMC_BASE)$(SEP)wmc.o: $(WMC_BASE_DIR) $(WMC_BASE)$(SEP)wmc.c + $(ECHO_CC) + ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $(WMC_BASE)$(SEP)wmc.c -o $(INTERMEDIATE)$(WMC_BASE)$(SEP)wmc.o + +$(INTERMEDIATE)$(WMC_BASE)$(SEP)write.o: $(WMC_BASE_DIR) $(WMC_BASE)$(SEP)write.c + $(ECHO_CC) + ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $(WMC_BASE)$(SEP)write.c -o $(INTERMEDIATE)$(WMC_BASE)$(SEP)write.o + +$(INTERMEDIATE)$(WMC_BASE)$(SEP)y_tab.o: $(WMC_BASE_DIR) $(WMC_BASE)$(SEP)y_tab.c + $(ECHO_CC) + ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $(WMC_BASE)$(SEP)y_tab.c -o $(INTERMEDIATE)$(WMC_BASE)$(SEP)y_tab.o + +$(INTERMEDIATE)$(WMC_BASE)$(SEP)misc.o: $(WMC_BASE_DIR) $(WMC_BASE)$(SEP)misc.c + $(ECHO_CC) + ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $(WMC_BASE)$(SEP)misc.c -o $(INTERMEDIATE)$(WMC_BASE)$(SEP)misc.o + .PHONY: wmc_clean wmc_clean: -@$(rm) $(WMC_TARGET) $(WMC_OBJECTS) 2>$(NUL) _____ Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak --- branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak 2005-03-13 21:29:49 UTC (rev 14031) +++ branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak 2005-03-13 21:30:35 UTC (rev 14032) @@ -1,7 +1,10 @@ -WPP_BASE = .$(SEP)tools$(SEP)wpp +WPP_BASE = tools$(SEP)wpp +$(INTERMEDIATE)$(WPP_BASE): $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(WPP_BASE) + WPP_TARGET = \ - $(ROS_INTERMEDIATE)$(WPP_BASE)$(SEP)libwpp.a + $(INTERMEDIATE)$(WPP_BASE)$(SEP)libwpp.a WPP_SOURCES = \ $(WPP_BASE)$(SEP)lex.yy.c \ @@ -10,18 +13,30 @@ $(WPP_BASE)$(SEP)wpp.tab.c WPP_OBJECTS = \ - $(WPP_SOURCES:.c=.o) + $(addprefix $(INTERMEDIATE), $(WPP_SOURCES:.c=.o)) WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude -Iinclude/wine -g -$(WPP_TARGET): $(WPP_OBJECTS) +$(WPP_TARGET): $(INTERMEDIATE)$(WPP_BASE) $(WPP_OBJECTS) $(ECHO_AR) ${host_ar} -rc $(WPP_TARGET) $(WPP_OBJECTS) -$(WPP_OBJECTS): %.o : %.c +$(INTERMEDIATE)$(WPP_BASE)$(SEP)lex.yy.o: $(INTERMEDIATE)$(WPP_BASE) $(WPP_BASE)$(SEP)lex.yy.c $(ECHO_CC) - ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ + ${host_gcc} $(WPP_HOST_CFLAGS) -c $(WPP_BASE)$(SEP)lex.yy.c -o $(INTERMEDIATE)$(WPP_BASE)$(SEP)lex.yy.o +$(INTERMEDIATE)$(WPP_BASE)$(SEP)preproc.o: $(INTERMEDIATE)$(WPP_BASE) $(WPP_BASE)$(SEP)preproc.c + $(ECHO_CC) + ${host_gcc} $(WPP_HOST_CFLAGS) -c $(WPP_BASE)$(SEP)preproc.c -o $(INTERMEDIATE)$(WPP_BASE)$(SEP)preproc.o + +$(INTERMEDIATE)$(WPP_BASE)$(SEP)wpp.o: $(INTERMEDIATE)$(WPP_BASE) $(WPP_BASE)$(SEP)wpp.c + $(ECHO_CC) + ${host_gcc} $(WPP_HOST_CFLAGS) -c $(WPP_BASE)$(SEP)wpp.c -o $(INTERMEDIATE)$(WPP_BASE)$(SEP)wpp.o + +$(INTERMEDIATE)$(WPP_BASE)$(SEP)wpp.tab.o: $(INTERMEDIATE)$(WPP_BASE) $(WPP_BASE)$(SEP)wpp.tab.c + $(ECHO_CC) + ${host_gcc} $(WPP_HOST_CFLAGS) -c $(WPP_BASE)$(SEP)wpp.tab.c -o $(INTERMEDIATE)$(WPP_BASE)$(SEP)wpp.tab.o + .PHONY: wpp_clean wpp_clean: -@$(rm) $(WPP_TARGET) $(WPP_OBJECTS) 2>$(NUL) _____ Modified: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak --- branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak 2005-03-13 21:29:49 UTC (rev 14031) +++ branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak 2005-03-13 21:30:35 UTC (rev 14032) @@ -1,7 +1,17 @@ -WRC_BASE = .$(SEP)tools$(SEP)wrc +WRC_BASE = tools$(SEP)wrc +WRC_BASE_DIR = $(INTERMEDIATE)$(WRC_BASE)$(SEP)$(CREATED) + +$(WRC_BASE_DIR): $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(WRC_BASE) + +WRC_BASE_PORT_DIR = $(INTERMEDIATE)$(WRC_BASE)$(SEP)port$(SEP)$(CREATED) + +$(WRC_BASE_PORT_DIR): $(RMKDIR_TARGET) $(WRC_BASE_DIR) + ${mkdir} $(INTERMEDIATE)$(WRC_BASE)$(SEP)port + WRC_TARGET = \ - $(ROS_INTERMEDIATE)$(WRC_BASE)$(SEP)wrc$(EXEPOSTFIX) + $(INTERMEDIATE)$(WRC_BASE)$(SEP)wrc$(EXEPOSTFIX) WRC_SOURCES = \ $(WRC_BASE)$(SEP)dumpres.c \ @@ -17,7 +27,7 @@ $(WRC_BASE)$(SEP)port$(SEP)mkstemps.o WRC_OBJECTS = \ - $(WRC_SOURCES:.c=.o) + $(addprefix $(INTERMEDIATE), $(WRC_SOURCES:.c=.o)) WRC_HOST_CFLAGS = -I$(WRC_BASE) -g -Werror -Wall \ -D__USE_W32API -DWINE_UNICODE_API= \ @@ -27,14 +37,57 @@ WRC_HOST_LFLAGS = -g -$(WRC_TARGET): $(WRC_OBJECTS) $(UNICODE_TARGET) $(WPP_TARGET) +.PHONY: wrc +wrc: $(WRC_TARGET) + +$(WRC_TARGET): $(WRC_BASE_DIR) $(WRC_OBJECTS) $(UNICODE_TARGET) $(WPP_TARGET) $(ECHO_LD) ${host_gcc} $(WRC_OBJECTS) $(UNICODE_TARGET) $(WPP_TARGET) $(WRC_HOST_LFLAGS) -o $(WRC_TARGET) -$(WRC_OBJECTS): %.o : %.c +$(INTERMEDIATE)$(WRC_BASE)$(SEP)dumpres.o: $(WRC_BASE_DIR) $(WRC_BASE)$(SEP)dumpres.c $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ + ${host_gcc} $(WRC_HOST_CFLAGS) -c $(WRC_BASE)$(SEP)dumpres.c -o $(INTERMEDIATE)$(WRC_BASE)$(SEP)dumpres.o +$(INTERMEDIATE)$(WRC_BASE)$(SEP)genres.o: $(WRC_BASE_DIR) $(WRC_BASE)$(SEP)genres.c + $(ECHO_CC) + ${host_gcc} $(WRC_HOST_CFLAGS) -c $(WRC_BASE)$(SEP)genres.c -o $(INTERMEDIATE)$(WRC_BASE)$(SEP)genres.o + +$(INTERMEDIATE)$(WRC_BASE)$(SEP)newstruc.o: $(WRC_BASE_DIR) $(WRC_BASE)$(SEP)newstruc.c + $(ECHO_CC) + ${host_gcc} $(WRC_HOST_CFLAGS) -c $(WRC_BASE)$(SEP)newstruc.c -o $(INTERMEDIATE)$(WRC_BASE)$(SEP)newstruc.o + +$(INTERMEDIATE)$(WRC_BASE)$(SEP)readres.o: $(WRC_BASE_DIR) $(WRC_BASE)$(SEP)readres.c + $(ECHO_CC) + ${host_gcc} $(WRC_HOST_CFLAGS) -c $(WRC_BASE)$(SEP)readres.c -o $(INTERMEDIATE)$(WRC_BASE)$(SEP)readres.o + +$(INTERMEDIATE)$(WRC_BASE)$(SEP)translation.o: $(WRC_BASE_DIR) $(WRC_BASE)$(SEP)translation.c + $(ECHO_CC) + ${host_gcc} $(WRC_HOST_CFLAGS) -c $(WRC_BASE)$(SEP)translation.c -o $(INTERMEDIATE)$(WRC_BASE)$(SEP)translation.o + +$(INTERMEDIATE)$(WRC_BASE)$(SEP)utils.o: $(WRC_BASE_DIR) $(WRC_BASE)$(SEP)utils.c + $(ECHO_CC) + ${host_gcc} $(WRC_HOST_CFLAGS) -c $(WRC_BASE)$(SEP)utils.c -o $(INTERMEDIATE)$(WRC_BASE)$(SEP)utils.o + +$(INTERMEDIATE)$(WRC_BASE)$(SEP)wrc.o: $(WRC_BASE_DIR) $(WRC_BASE)$(SEP)wrc.c + $(ECHO_CC) + ${host_gcc} $(WRC_HOST_CFLAGS) -c $(WRC_BASE)$(SEP)wrc.c -o $(INTERMEDIATE)$(WRC_BASE)$(SEP)wrc.o + +$(INTERMEDIATE)$(WRC_BASE)$(SEP)writeres.o: $(WRC_BASE_DIR) $(WRC_BASE)$(SEP)writeres.c + $(ECHO_CC) + ${host_gcc} $(WRC_HOST_CFLAGS) -c $(WRC_BASE)$(SEP)writeres.c -o $(INTERMEDIATE)$(WRC_BASE)$(SEP)writeres.o + +$(INTERMEDIATE)$(WRC_BASE)$(SEP)y.tab.o: $(WRC_BASE_DIR) $(WRC_BASE)$(SEP)y.tab.c + $(ECHO_CC) + ${host_gcc} $(WRC_HOST_CFLAGS) -c $(WRC_BASE)$(SEP)y.tab.c -o $(INTERMEDIATE)$(WRC_BASE)$(SEP)y.tab.o + +$(INTERMEDIATE)$(WRC_BASE)$(SEP)lex.yy.o: $(WRC_BASE_DIR) $(WRC_BASE)$(SEP)lex.yy.c + $(ECHO_CC) + ${host_gcc} $(WRC_HOST_CFLAGS) -c $(WRC_BASE)$(SEP)lex.yy.c -o $(INTERMEDIATE)$(WRC_BASE)$(SEP)lex.yy.o + +$(INTERMEDIATE)$(WRC_BASE)$(SEP)port$(SEP)mkstemps.o: $(WRC_BASE_PORT_DIR) $(WRC_BASE)$(SEP)port$(SEP)mkstemps.c + $(ECHO_CC) + ${host_gcc} $(WRC_HOST_CFLAGS) -c $(WRC_BASE)$(SEP)port$(SEP)mkstemps.c -o $(INTERMEDIATE)$(WRC_BASE)$(SEP)port$(SEP)mkstemps.o + .PHONY: wrc_clean wrc_clean: -@$(rm) $(WRC_TARGET) $(WRC_OBJECTS) 2>$(NUL)

19 years, 6 months

[gvg] 14042: tinus <o112w8r02@sneakemail.com>:

by gvg＠svn.reactos.com

tinus <o112w8r02(a)sneakemail.com>: Use RegisterShellHookWindow Modified: trunk/reactos/subsys/system/explorer/Makefile Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.h Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/subsys/system/explorer/Makefile --- trunk/reactos/subsys/system/explorer/Makefile 2005-03-13 23:08:51 UTC (rev 14041) +++ trunk/reactos/subsys/system/explorer/Makefile 2005-03-13 23:10:25 UTC (rev 14042) @@ -17,7 +17,7 @@ TARGET_CFLAGS := \ -D__USE_W32API -DWIN32 -D_ROS_ \ -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \ - -DUNICODE -fexceptions -Wall \ + -DUNICODE -fexceptions -Wall -g \ -I../../../include/expat TARGET_CPPFLAGS := $(TARGET_CFLAGS) @@ -26,7 +26,7 @@ TARGET_SDKLIBS := \ gdi32.a comctl32.a ole32.a oleaut32.a shell32.a expat.a \ - notifyhook.a ws2_32.a msimg32.a + notifyhook.a ws2_32.a msimg32.a user32.a TARGET_GCCLIBS := stdc++ uuid _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-03-13 23:08:51 UTC (rev 14041) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-03-13 23:10:25 UTC (rev 14042) @@ -55,12 +55,25 @@ TaskBar::TaskBar(HWND hwnd) : super(hwnd) { + HMODULE Module; _last_btn_width = 0; + + Module = LoadLibraryA("User32.dll"); + if (Module && GetProcAddress(Module, "RegisterShellHookWindow")) { + _HasShellHook = TRUE; + } else { + _HasShellHook = FALSE; + if (Module) + FreeLibrary(Module); + } + LOG (_HasShellHook ? L"Has shell hooks.\n" : L"Does not have shell hooks.\n"); + } TaskBar::~TaskBar() { - KillTimer(_hwnd, 0); + if (!_HasShellHook) + KillTimer(_hwnd, 0); //DeinstallShellHook(); } @@ -99,13 +112,22 @@ Refresh(); - SetTimer(_hwnd, 0, 200, NULL); + if (_HasShellHook) + RegisterShellHookWindow(_hwnd); + else + SetTimer(_hwnd, 0, 200, NULL); return 0; } LRESULT TaskBar::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) { + static UINT ShellHookNmsg = 0; + + if (!ShellHookNmsg) { + ShellHookNmsg = RegisterWindowMessage(TEXT("SHELLHOOK")); + LOG (FmtString(TEXT("Nmsg == %#x"), ShellHookNmsg)); + } switch(nmsg) { case WM_SIZE: SendMessage(_htoolbar, WM_SIZE, 0, 0); @@ -145,7 +167,19 @@ return (LRESULT)(HWND)_last_foreground_wnd; default: def: - return super::WndProc(nmsg, wparam, lparam); + if (nmsg == RegisterWindowMessage(TEXT("SHELLHOOK"))) { + LOG(FmtString(TEXT("SHELLHOOK %x"), wparam)); + switch (wparam) { + case HSHELL_WINDOWCREATED: + case HSHELL_WINDOWDESTROYED: + case HSHELL_WINDOWACTIVATED: + case HSHELL_REDRAW: + Refresh(); + break; + } + } else { + return super::WndProc(nmsg, wparam, lparam); + } } return 0; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.h --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.h 2005-03-13 23:08:51 UTC (rev 14041) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.h 2005-03-13 23:10:25 UTC (rev 14042) @@ -85,6 +85,7 @@ int _next_id; WindowHandle _last_foreground_wnd; int _last_btn_width; + BOOL _HasShellHook; LRESULT Init(LPCREATESTRUCT pcs); LRESULT WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam); _____ Modified: trunk/reactos/w32api/include/winuser.h --- trunk/reactos/w32api/include/winuser.h 2005-03-13 23:08:51 UTC (rev 14041) +++ trunk/reactos/w32api/include/winuser.h 2005-03-13 23:10:25 UTC (rev 14042) @@ -3708,6 +3708,7 @@ #if (_WIN32_WINNT >= 0x0501) BOOL WINAPI RegisterRawInputDevices(PCRAWINPUTDEVICE,UINT,UINT); #endif +BOOL WINAPI RegisterShellHookWindow(HWND); UINT WINAPI RegisterWindowMessageA(LPCSTR); UINT WINAPI RegisterWindowMessageW(LPCWSTR); BOOL WINAPI ReleaseCapture(void);

19 years, 6 months

[gvg] 14041: tinus <o112w8r02@sneakemail.com>:

by gvg＠svn.reactos.com

tinus <o112w8r02(a)sneakemail.com>: Implement RegisterShellHookWindow Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/lib/user32/windows/hook.c Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/subsys/win32k/include/desktop.h Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-03-13 23:03:31 UTC (rev 14040) +++ trunk/reactos/include/win32k/ntuser.h 2005-03-13 23:08:51 UTC (rev 14041) @@ -103,6 +103,11 @@ DWORD BufferSize, DWORD *Count); +enum { + HWND_ROUTINE_REGISTERSHELLHOOKWINDOW, + HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW +}; + DWORD STDCALL NtUserCallHwnd( _____ Modified: trunk/reactos/lib/user32/windows/hook.c --- trunk/reactos/lib/user32/windows/hook.c 2005-03-13 23:03:31 UTC (rev 14040) +++ trunk/reactos/lib/user32/windows/hook.c 2005-03-13 23:08:51 UTC (rev 14041) @@ -156,8 +156,7 @@ STDCALL DeregisterShellHookWindow(HWND hWnd) { - UNIMPLEMENTED; - return FALSE; + return NtUserCallHwnd(HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW, (DWORD)hWnd); } /* @@ -167,8 +166,7 @@ STDCALL RegisterShellHookWindow(HWND hWnd) { - UNIMPLEMENTED; - return FALSE; + return NtUserCallHwnd(HWND_ROUTINE_REGISTERSHELLHOOKWINDOW, (DWORD)hWnd); } /* _____ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h --- trunk/reactos/ntoskrnl/include/internal/ex.h 2005-03-13 23:03:31 UTC (rev 14040) +++ trunk/reactos/ntoskrnl/include/internal/ex.h 2005-03-13 23:08:51 UTC (rev 14041) @@ -68,6 +68,8 @@ HANDLE PrevActiveWindow; /* Thread blocking input */ PVOID BlockInputThread; + + LIST_ENTRY ShellHookWindows; } DESKTOP_OBJECT, *PDESKTOP_OBJECT; _____ Modified: trunk/reactos/subsys/win32k/include/desktop.h --- trunk/reactos/subsys/win32k/include/desktop.h 2005-03-13 23:03:31 UTC (rev 14040) +++ trunk/reactos/subsys/win32k/include/desktop.h 2005-03-13 23:08:51 UTC (rev 14041) @@ -14,6 +14,12 @@ extern HDC ScreenDeviceContext; extern BOOL g_PaintDesktopVersion; +typedef struct _SHELL_HOOK_WINDOW +{ + LIST_ENTRY ListEntry; + HWND hWnd; +} SHELL_HOOK_WINDOW, *PSHELL_HOOK_WINDOW; + NTSTATUS FASTCALL InitDesktopImpl(VOID); @@ -79,6 +85,11 @@ BOOL FASTCALL IntDesktopUpdatePerUserSettings(BOOL bEnable); +BOOL IntRegisterShellHookWindow(HWND hWnd); +BOOL IntDeRegisterShellHookWindow(HWND hWnd); + +VOID IntShellHookNotify(WPARAM Message, LPARAM lParam); + #define IntIsActiveDesktop(Desktop) \ ((Desktop)->WindowStation->ActiveDesktop == (Desktop)) _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-03-13 23:03:31 UTC (rev 14040) +++ trunk/reactos/subsys/win32k/include/window.h 2005-03-13 23:08:51 UTC (rev 14041) @@ -200,6 +200,9 @@ IntGetParent(PWINDOW_OBJECT Wnd); PWINDOW_OBJECT FASTCALL +IntGetOwner(PWINDOW_OBJECT Wnd); + +PWINDOW_OBJECT FASTCALL IntGetParentObject(PWINDOW_OBJECT Wnd); INT FASTCALL _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-03-13 23:03:31 UTC (rev 14040) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-03-13 23:08:51 UTC (rev 14041) @@ -534,6 +534,8 @@ void FASTCALL IntSetClassLong(PWINDOW_OBJECT WindowObject, ULONG Offset, LONG dwNewLong, BOOL Ansi) { + PWINDOW_OBJECT Parent, Owner; + if ((int)Offset >= 0) { DPRINT("SetClassLong(%x, %d, %x)\n", WindowObject->Self, Offset, dwNewLong); @@ -562,6 +564,25 @@ break; case GCL_HICON: WindowObject->Class->hIcon = (HICON)dwNewLong; + Owner = IntGetOwner(WindowObject); + Parent = IntGetParent(WindowObject); + + if ((!Owner) && (!Parent)) + { + IntShellHookNotify(HSHELL_REDRAW, (LPARAM) WindowObject->Self); + } + + if (Parent) + { + IntReleaseWindowObject(Parent); + } + + if (Owner) + { + IntReleaseWindowObject(Owner); + } + + break; case GCL_HICONSM: WindowObject->Class->hIconSm = (HICON)dwNewLong; _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-03-13 23:03:31 UTC (rev 14040) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-03-13 23:08:51 UTC (rev 14041) @@ -92,6 +92,7 @@ DPRINT("Creating desktop (0x%X) Name (%wZ)\n", Desktop, &UnicodeString); KeInitializeSpinLock(&Desktop->Lock); + InitializeListHead(&Desktop->ShellHookWindows); Desktop->WindowStation = (PWINSTATION_OBJECT)Parent; @@ -541,6 +542,147 @@ } /* + * Send the Message to the windows registered for ShellHook + * notifications. The lParam contents depend on the Message. See + * MSDN for more details (RegisterShellHookWindow) + */ +VOID IntShellHookNotify(WPARAM Message, LPARAM lParam) +{ + PDESKTOP_OBJECT Desktop = IntGetActiveDesktop(); + PLIST_ENTRY Entry, Entry2; + PSHELL_HOOK_WINDOW Current; + KIRQL OldLevel; + + static UINT MsgType = 0; + + if (!MsgType) { + + /* Too bad, this doesn't work.*/ +#if 0 + UNICODE_STRING Str; + RtlInitUnicodeString(&Str, L"SHELLHOOK"); + MsgType = NtUserRegisterWindowMessage(&Str); +#endif + MsgType = IntAddAtom(L"SHELLHOOK"); + + DPRINT("MsgType = %x\n", MsgType); + if (!MsgType) + DPRINT1("LastError: %x\n", GetLastNtError()); + } + + if (!Desktop) { + DPRINT1("IntShellHookNotify: No desktop!\n"); + return; + } + + /* We have to do some tricks because the list could change + * between calls, and we can't keep the lock during the call + */ + + KeAcquireSpinLock(&Desktop->Lock, &OldLevel); + Entry = Desktop->ShellHookWindows.Flink; + while (Entry != &Desktop->ShellHookWindows) { + Current = CONTAINING_RECORD(Entry, SHELL_HOOK_WINDOW, ListEntry); + KeReleaseSpinLock(&Desktop->Lock, OldLevel); + + DPRINT("Sending notify\n"); + IntPostOrSendMessage(Current->hWnd, + MsgType, + Message, + lParam); + + /* Loop again to find the window we were sending to. If it doesn't + * exist anymore, we just stop. This could leave an infinite loop + * if a window is removed and readded to the list. That's quite + * unlikely though. + */ + + KeAcquireSpinLock(&Desktop->Lock, &OldLevel); + Entry2 = Desktop->ShellHookWindows.Flink; + while (Entry2 != Entry && + Entry2 != &Desktop->ShellHookWindows) { + Entry2 = Entry2->Flink; + } + + if (Entry2 == Entry) + Entry = Entry->Flink; + else + break; + } + KeReleaseSpinLock(&Desktop->Lock, OldLevel); +} + +/* + * Add the window to the ShellHookWindows list. The windows + * on that list get notifications that are important to shell + * type applications. + * + * TODO: Validate the window? I'm not sure if sending these messages to + * an unsuspecting application that is not your own is a nice thing to do. + */ +BOOL IntRegisterShellHookWindow(HWND hWnd) +{ + PDESKTOP_OBJECT Desktop = PsGetWin32Thread()->Desktop; + PSHELL_HOOK_WINDOW Entry; + KIRQL OldLevel; + + DPRINT("IntRegisterShellHookWindow\n"); + + /* First deregister the window, so we can be sure it's never twice in the + * list. + */ + IntDeRegisterShellHookWindow(hWnd); + + Entry = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SHELL_HOOK_WINDOW), + TAG_WINSTA); + /* We have to walk this structure with while holding a spinlock, so we + * need NonPagedPool */ + + if (!Entry) + return FALSE; + + Entry->hWnd = hWnd; + + KeAcquireSpinLock(&Desktop->Lock, &OldLevel); + InsertTailList(&Desktop->ShellHookWindows, &Entry->ListEntry); + KeReleaseSpinLock(&Desktop->Lock, OldLevel); + + return TRUE; +} + +/* + * Remove the window from the ShellHookWindows list. The windows + * on that list get notifications that are important to shell + * type applications. + */ +BOOL IntDeRegisterShellHookWindow(HWND hWnd) +{ + PDESKTOP_OBJECT Desktop = PsGetWin32Thread()->Desktop; + PLIST_ENTRY Entry; + PSHELL_HOOK_WINDOW Current; + KIRQL OldLevel; + + KeAcquireSpinLock(&Desktop->Lock, &OldLevel); + + Entry = Desktop->ShellHookWindows.Flink; + while (Entry != &Desktop->ShellHookWindows) { + Current = CONTAINING_RECORD(Entry, SHELL_HOOK_WINDOW, ListEntry); + if (Current->hWnd == hWnd) { + RemoveEntryList(Entry); + KeReleaseSpinLock(&Desktop->Lock, OldLevel); + ExFreePool(Entry); + return TRUE; + } + Entry = Entry->Flink; + } + + KeReleaseSpinLock(&Desktop->Lock, OldLevel); + + return FALSE; +} + +/* * NtUserCreateDesktop * * Creates a new desktop. _____ Modified: trunk/reactos/subsys/win32k/ntuser/focus.c --- trunk/reactos/subsys/win32k/ntuser/focus.c 2005-03-13 23:03:31 UTC (rev 14040) +++ trunk/reactos/subsys/win32k/ntuser/focus.c 2005-03-13 23:08:51 UTC (rev 14041) @@ -62,6 +62,8 @@ VOID FASTCALL IntSendActivateMessages(HWND hWndPrev, HWND hWnd, BOOL MouseActivate) { + PWINDOW_OBJECT Window, Owner, Parent; + if (hWnd) { /* Send palette messages */ @@ -75,6 +77,22 @@ WinPosSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOSENDCHANGING); + Window = IntGetWindowObject(hWnd); + if (Window) { + Owner = IntGetOwner(Window); + if (!Owner) { + Parent = IntGetParent(Window); + if (!Parent) + IntShellHookNotify(HSHELL_WINDOWACTIVATED, (LPARAM) hWnd); + else + IntReleaseWindowObject(Parent); + } else { + IntReleaseWindowObject(Owner); + } + + IntReleaseWindowObject(Window); + } + /* FIXME: IntIsWindow */ IntPostOrSendMessage(hWnd, WM_NCACTIVATE, (WPARAM)(hWnd == NtUserGetForegroundWindow()), 0); _____ Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c --- trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-03-13 23:03:31 UTC (rev 14040) +++ trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-03-13 23:08:51 UTC (rev 14041) @@ -59,6 +59,17 @@ DWORD Unknown0, DWORD Unknown1) { + switch (Unknown0) { + case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW: + if (IntIsWindow((HWND) Unknown1)) + return IntRegisterShellHookWindow((HWND) Unknown1); + return FALSE; + break; + case HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW: + if (IntIsWindow((HWND) Unknown1)) + return IntDeRegisterShellHookWindow((HWND) Unknown1); + return FALSE; + } UNIMPLEMENTED return 0; _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-03-13 23:03:31 UTC (rev 14040) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-03-13 23:08:51 UTC (rev 14041) @@ -147,7 +147,18 @@ return NULL; } +PWINDOW_OBJECT FASTCALL +IntGetOwner(PWINDOW_OBJECT Wnd) +{ + HWND hWnd; + IntLockRelatives(Wnd); + hWnd = Wnd->Owner; + IntUnLockRelatives(Wnd); + + return IntGetWindowObject(hWnd); +} + PWINDOW_OBJECT FASTCALL IntGetParentObject(PWINDOW_OBJECT Wnd) { @@ -205,6 +216,8 @@ */ static void IntSendDestroyMsg(HWND Wnd) { + + PWINDOW_OBJECT Window, Owner, Parent; #if 0 /* FIXME */ GUITHREADINFO info; @@ -217,9 +230,28 @@ } #endif + Window = IntGetWindowObject(Wnd); + if (Window) { + Owner = IntGetOwner(Window); + if (!Owner) { + Parent = IntGetParent(Window); + if (!Parent) + IntShellHookNotify(HSHELL_WINDOWDESTROYED, (LPARAM) Wnd); + else + IntReleaseWindowObject(Parent); + } else { + IntReleaseWindowObject(Owner); + } + + IntReleaseWindowObject(Window); + } + + /* The window could already be destroyed here */ + /* * Send the WM_DESTROY to the window. */ + IntSendMessage(Wnd, WM_DESTROY, 0, 0); /* @@ -284,6 +316,8 @@ IntUnLockThreadWindows(Window->OwnerThread->Tcb.Win32Thread); BelongsToThreadData = IntWndBelongsToThread(Window, ThreadData); + + IntDeRegisterShellHookWindow(Window->Self); if(SendMessages) { @@ -1417,6 +1451,8 @@ BOOL MenuChanged; BOOL ClassFound; + BOOL HasOwner; + ParentWindowHandle = PsGetWin32Thread()->Desktop->DesktopWindow; OwnerWindowHandle = NULL; @@ -1542,9 +1578,11 @@ { WindowObject->Owner = OwnerWindowHandle; IntReleaseWindowObject(OwnerWindow); + HasOwner = TRUE; + } else { + WindowObject->Owner = NULL; + HasOwner = FALSE; } - else - WindowObject->Owner = NULL; WindowObject->UserData = 0; if ((((DWORD)ClassObject->lpfnWndProcA & 0xFFFF0000) != 0xFFFF0000) && (((DWORD)ClassObject->lpfnWndProcW & 0xFFFF0000) != 0xFFFF0000)) @@ -1969,6 +2007,13 @@ (LPARAM)WindowObject->Self); } + if ((!hWndParent) && (!HasOwner)) { + DPRINT("Sending CREATED notify\n"); + IntShellHookNotify(HSHELL_WINDOWCREATED, (LPARAM)Handle); + } else { + DPRINT("Not sending CREATED notify, %x %d\n", ParentWindow, HasOwner); + } + if (NULL != ParentWindow) { IntReleaseWindowObject(ParentWindow); @@ -4060,7 +4105,7 @@ BOOL STDCALL NtUserDefSetText(HWND WindowHandle, PUNICODE_STRING WindowText) { - PWINDOW_OBJECT WindowObject; + PWINDOW_OBJECT WindowObject, Parent, Owner; UNICODE_STRING SafeText; NTSTATUS Status; @@ -4090,6 +4135,26 @@ RtlFreeUnicodeString(&WindowObject->WindowName); WindowObject->WindowName = SafeText; + + /* Send shell notifications */ + + Owner = IntGetOwner(WindowObject); + Parent = IntGetParent(WindowObject); + + if ((!Owner) && (!Parent)) + { + IntShellHookNotify(HSHELL_REDRAW, (LPARAM) WindowHandle); + } + + if (Owner) + { + IntReleaseWindowObject(Owner); + } + + if (Parent) + { + IntReleaseWindowObject(Parent); + } IntReleaseWindowObject(WindowObject); return TRUE;

19 years, 6 months

[weiden] 14040: initialize the handle tables before creating them

by weiden＠svn.reactos.com

initialize the handle tables before creating them Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/ex/handle.c --- trunk/reactos/ntoskrnl/ex/handle.c 2005-03-13 22:33:13 UTC (rev 14039) +++ trunk/reactos/ntoskrnl/ex/handle.c 2005-03-13 23:03:31 UTC (rev 14040) @@ -77,6 +77,8 @@ #define IS_VALID_EX_HANDLE(index) \ (((index) & ~VALID_HANDLE_MASK) == 0) +static BOOLEAN ExpInitialized = FALSE; + /*********************************************************************** *******/ VOID @@ -85,6 +87,8 @@ ExpHandleShortWait.QuadPart = -50000; InitializeListHead(&ExpHandleTableHead); ExInitializeFastMutex(&ExpHandleTableListLock); + + ExpInitialized = TRUE; } PHANDLE_TABLE @@ -94,6 +98,11 @@ PAGED_CODE(); + if(!ExpInitialized) + { + KEBUGCHECK(0); + } + if(QuotaProcess != NULL) { /* FIXME - Charge process quota before allocating the handle table! */ _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-03-13 22:33:13 UTC (rev 14039) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-03-13 23:03:31 UTC (rev 14040) @@ -33,6 +33,8 @@ extern KSPIN_LOCK KiProfileLock; #endif +VOID PspPostInitSystemProcess(VOID); + /* FUNCTIONS ****************************************************************/ static @@ -479,6 +481,18 @@ /* Initialize Basic System Objects and Worker Threads */ ExInit3(); + /* Create the system handle table, assign it to the system process, create + the client id table and assign a PID for the system process. This needs + to be done before the worker threads are initialized so the system + process gets the first PID (4) */ + PspPostInitSystemProcess(); + + /* initialize the worker threads */ + ExInitializeWorkerThreads(); + + /* initialize callbacks */ + ExpInitializeCallbacks(); + /* Initialize the GDB Stub and break */ KdInit1(); @@ -656,18 +670,16 @@ VOID INIT_FUNCTION ExInit3 (VOID) { - ExInitializeWorkerThreads(); ExpInitializeEventImplementation(); ExpInitializeEventPairImplementation(); ExpInitializeMutantImplementation(); ExpInitializeSemaphoreImplementation(); ExpInitializeTimerImplementation(); - ExpInitializeHandleTables(); LpcpInitSystem(); ExpInitializeProfileImplementation(); ExpWin32kInit(); ExpInitUuids(); - ExpInitializeCallbacks(); + ExpInitializeHandleTables(); } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-03-13 22:33:13 UTC (rev 14039) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-03-13 23:03:31 UTC (rev 14040) @@ -16,6 +16,8 @@ /* GLOBALS ******************************************************************/ +VOID INIT_FUNCTION PsInitClientIDManagment(VOID); + PEPROCESS EXPORTED PsInitialSystemProcess = NULL; POBJECT_TYPE EXPORTED PsProcessType = NULL; @@ -393,7 +395,6 @@ MmInitializeAddressSpace(PsInitialSystemProcess, &PsInitialSystemProcess->AddressSpace); - ObCreateHandleTable(NULL,FALSE,PsInitialSystemProcess); KeInitializeEvent(&PsInitialSystemProcess->LockEvent, SynchronizationEvent, FALSE); PsInitialSystemProcess->LockCount = 0; @@ -421,6 +422,28 @@ SepCreateSystemProcessToken(PsInitialSystemProcess); } +VOID +PspPostInitSystemProcess(VOID) +{ + NTSTATUS Status; + + /* this routine is called directly after the exectuive handle tables were + initialized. We'll set up the Client ID handle table and assign the system + process a PID */ + PsInitClientIDManagment(); + + ObCreateHandleTable(NULL, FALSE, PsInitialSystemProcess); + + Status = PsCreateCidHandle(PsInitialSystemProcess, + PsProcessType, + &PsInitialSystemProcess->UniqueProcessId); + if(!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create CID handle (unique process id) for the system process!\n"); + KEBUGCHECK(0); + } +} + VOID STDCALL PiDeleteProcessWorker(PVOID pContext) { _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-03-13 22:33:13 UTC (rev 14039) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-03-13 23:03:31 UTC (rev 14040) @@ -14,8 +14,6 @@ #define NDEBUG #include <internal/debug.h> -VOID INIT_FUNCTION PsInitClientIDManagment(VOID); - /* FUNCTIONS ***************************************************************/ VOID PiShutdownProcessManager(VOID) @@ -28,23 +26,10 @@ VOID INIT_FUNCTION PiInitProcessManager(VOID) { - NTSTATUS Status; - - PsInitClientIDManagment(); PsInitJobManagment(); PsInitProcessManagment(); PsInitThreadManagment(); PsInitIdleThread(); - - Status = PsCreateCidHandle(PsInitialSystemProcess, - PsProcessType, - &PsInitialSystemProcess->UniqueProcessId); - if(!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create CID handle (unique process id) for the system process!\n"); - KEBUGCHECK(0); - } - PsInitialiseSuspendImplementation(); PsInitialiseW32Call(); } _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-03-13 22:33:13 UTC (rev 14039) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-03-13 23:03:31 UTC (rev 14040) @@ -731,9 +731,9 @@ * FUNCTION: Initialize thread managment */ { - HANDLE PiReaperThreadHandle; - PETHREAD FirstThread; + PETHREAD FirstThread, ReaperThread; ULONG i; + KIRQL oldIrql; NTSTATUS Status; for (i=0; i < MAXIMUM_PRIORITY; i++) @@ -782,20 +782,27 @@ */ PsInitializeThreadReaper(); KeInitializeEvent(&PiReaperThreadEvent, SynchronizationEvent, FALSE); - Status = PsCreateSystemThread(&PiReaperThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - NULL, - PiReaperThreadMain, - NULL); + Status = PsInitializeThread(NULL, + &ReaperThread, + NULL, + FALSE); if (!NT_SUCCESS(Status)) { DPRINT1("PS: Failed to create reaper thread.\n"); KEBUGCHECK(0); } - NtClose(PiReaperThreadHandle); + ReaperThread->StartAddress = PiReaperThreadMain; + Status = KiArchInitThread(&ReaperThread->Tcb, PiReaperThreadMain, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("PS: Failed to initialize reaper thread.\n"); + KEBUGCHECK(0); + } + + oldIrql = KeAcquireDispatcherDatabaseLock (); + PsUnblockThread(ReaperThread, NULL, 0); + KeReleaseDispatcherDatabaseLock(oldIrql); } /*

19 years, 6 months

[chorns] 14039: Build winebuild by bootstrap makefiles

by chorns＠svn.reactos.com

Build winebuild by bootstrap makefiles Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml Modified: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml Modified: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml Modified: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml Modified: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml Modified: branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml Modified: branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml Modified: branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml Modified: branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml Modified: branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml Modified: branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml Modified: branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml Modified: branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml Modified: branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml Modified: branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml Modified: branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml Modified: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml Modified: branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml Modified: branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml Modified: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml Modified: branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml Modified: branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml Modified: branches/xmlbuildsystem/reactos/lib/version/version.xml Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml Modified: branches/xmlbuildsystem/reactos/tools/tools.mak Modified: branches/xmlbuildsystem/reactos/tools/tools.xml Added: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak Deleted: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.xml Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-13 22:33:13 UTC (rev 14039) @@ -158,7 +158,7 @@ $(ERRCODES_RC) \ $(NCI_SERVICE_FILES) -makefile.auto: $(RMKDIR_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) +makefile.auto: $(RMKDIR_TARGET) $(WINEBUILD_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw _____ Modified: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml --- branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}"> - <dependency>winebuild</dependency> <importlibrary definition="cabinet.spec.def" /> <include base="cabinet">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml --- branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}"> - <dependency>winebuild</dependency> <importlibrary definition="comctl32.spec.def" /> <include base="comctl32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml --- branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}"> - <dependency>winebuild</dependency> <importlibrary definition="comdlg32.spec.def" /> <include base="comdlg32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml --- branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}"> - <dependency>winebuild</dependency> <importlibrary definition="dbghelp.spec.def" /> <include base="dbghelp">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml --- branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}"> - <dependency>winebuild</dependency> <importlibrary definition="devenum.spec.def" /> <include base="devenum">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml --- branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}"> - <dependency>winebuild</dependency> <importlibrary definition="dinput.spec.def" /> <include base="dinput">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml --- branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="dinput8" type="win32dll" baseaddress="${BASEADDRESS_DINPUT8}"> - <dependency>winebuild</dependency> <importlibrary definition="dinput8.spec.def" /> <include base="dinput8">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml --- branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}"> - <dependency>winebuild</dependency> <importlibrary definition="dxdiagn.spec.def" /> <include base="dxdiagn">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml --- branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}"> - <dependency>winebuild</dependency> <importlibrary definition="imagehlp.def" /> <include base="imagehlp">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml --- branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}"> - <dependency>winebuild</dependency> <importlibrary definition="iphlpapi.spec.def" /> <include base="iphlpapi">include</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml --- branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="midimap" type="win32dll" baseaddress="${BASEADDRESS_MIDIMAP}"> - <dependency>winebuild</dependency> <importlibrary definition="midimap.spec.def" /> <include base="midimap">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml --- branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}"> - <dependency>winebuild</dependency> <importlibrary definition="mpr.spec.def" /> <include base="mpr">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml --- branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}"> - <dependency>winebuild</dependency> <importlibrary definition="msacm32.spec.def" /> <include base="msacm32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml --- branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}"> - <dependency>winebuild</dependency> <importlibrary definition="netapi32.spec.def" /> <include base="netapi32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml --- branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}"> - <dependency>winebuild</dependency> <importlibrary definition="ole32.spec.def" /> <include base="ole32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml --- branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}"> - <dependency>winebuild</dependency> <importlibrary definition="oleaut32.spec.def" /> <include base="oleaut32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml --- branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}"> - <dependency>winebuild</dependency> <importlibrary definition="olepro32.spec.def" /> <include base="olepro32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml --- branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}"> - <dependency>winebuild</dependency> <importlibrary definition="riched32.spec.def" /> <include base="riched32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml --- branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}"> - <dependency>winebuild</dependency> <importlibrary definition="rpcrt4.spec.def" /> <include base="rpcrt4">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml --- branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}"> - <dependency>winebuild</dependency> <importlibrary definition="setupapi.spec.def" /> <include base="setupapi">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml --- branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}"> - <dependency>winebuild</dependency> <importlibrary definition="shdocvw.spec.def" /> <include base="shdocvw">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml --- branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}"> - <dependency>winebuild</dependency> <importlibrary definition="shell32.spec.def" /> <include base="shell32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml --- branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}"> - <dependency>winebuild</dependency> <importlibrary definition="shlwapi.spec.def" /> <include base="shlwapi">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml --- branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}"> - <dependency>winebuild</dependency> <importlibrary definition="urlmon.spec.def" /> <include base="urlmon">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/version/version.xml --- branches/xmlbuildsystem/reactos/lib/version/version.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/version/version.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}"> - <dependency>winebuild</dependency> <importlibrary definition="version.def" /> <include base="ReactOS">include/wine</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml --- branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,5 +1,4 @@ <module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}"> - <dependency>winebuild</dependency> <importlibrary definition="winmm.spec.def" /> <include base="winmm">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-13 22:33:13 UTC (rev 14039) @@ -64,6 +64,7 @@ include tools/nci/nci.mak include tools/rbuild/rbuild.mak include tools/unicode/unicode.mak +include tools/winebuild/winebuild.mak include tools/wmc/wmc.mak include tools/wpp/wpp.mak include tools/wrc/wrc.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.xml --- branches/xmlbuildsystem/reactos/tools/tools.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/tools/tools.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -4,6 +4,3 @@ <directory name="cabman"> <xi:include href="cabman/cabman.xml" /> </directory> -<directory name="winebuild"> - <xi:include href="winebuild/winebuild.xml" /> -</directory> _____ Added: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak --- branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak 2005-03-13 22:33:13 UTC (rev 14039) @@ -0,0 +1,67 @@ +WINEBUILD_BASE = tools$(SEP)winebuild + +WINEBUILD_BASE_DIR = $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)$(CREATED) + +$(WINEBUILD_BASE_DIR): $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(WINEBUILD_BASE) + +WINEBUILD_TARGET = \ + $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)winebuild$(EXEPOSTFIX) + +WINEBUILD_SOURCES = \ + $(WINEBUILD_BASE)$(SEP)import.c \ + $(WINEBUILD_BASE)$(SEP)main.c \ + $(WINEBUILD_BASE)$(SEP)parser.c \ + $(WINEBUILD_BASE)$(SEP)res16.c \ + $(WINEBUILD_BASE)$(SEP)res32.c \ + $(WINEBUILD_BASE)$(SEP)spec32.c \ + $(WINEBUILD_BASE)$(SEP)utils.c \ + $(WINEBUILD_BASE)$(SEP)mkstemps.c + +WINEBUILD_OBJECTS = \ + $(addprefix $(INTERMEDIATE), $(WINEBUILD_SOURCES:.c=.o)) + +WINEBUILD_HOST_CFLAGS = -D__USE_W32API -Iinclude/wine + +WINEBUILD_HOST_LFLAGS = -g + +$(WINEBUILD_TARGET): $(WINEBUILD_BASE_DIR) $(WINEBUILD_OBJECTS) + $(ECHO_LD) + ${host_gcc} $(WINEBUILD_OBJECTS) $(WINEBUILD_HOST_LFLAGS) -o $(WINEBUILD_TARGET) + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)import.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)import.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)import.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)import.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)main.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)main.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)main.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)main.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)parser.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)parser.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)parser.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)parser.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res16.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)res16.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)res16.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res16.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res32.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)res32.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)res32.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res32.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)spec32.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)spec32.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)spec32.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)spec32.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)utils.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)utils.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)utils.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)utils.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)mkstemps.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)mkstemps.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)mkstemps.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)mkstemps.o + +.PHONY: winebuild_clean +winebuild_clean: + -@$(rm) $(WINEBUILD_TARGET) $(WINEBUILD_OBJECTS) 2>$(NUL) +clean: winebuild_clean _____ Deleted: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.xml --- branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.xml 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.xml 2005-03-13 22:33:13 UTC (rev 14039) @@ -1,13 +0,0 @@ -<module name="winebuild" type="buildtool"> - <include base="winebuild">.</include> - <include base="ReactOS">include/wine</include> - <define name="__USE_W32API" /> - <file>import.c</file> - <file>main.c</file> - <file>mkstemps.c</file> - <file>parser.c</file> - <file>res16.c</file> - <file>res32.c</file> - <file>spec32.c</file> - <file>utils.c</file> -</module> _____ Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak --- branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak 2005-03-13 21:59:51 UTC (rev 14038) +++ branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak 2005-03-13 22:33:13 UTC (rev 14039) @@ -6,7 +6,7 @@ ${mkdir} $(INTERMEDIATE)$(WMC_BASE) WMC_TARGET = \ - $(ROS_INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX) + $(INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX) WMC_SOURCES = \ $(WMC_BASE)$(SEP)getopt.c \

19 years, 6 months

[chorns] 14038: Add missing file

by chorns＠svn.reactos.com

Add missing file Added: branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml _____ Added: branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml --- branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml 2005-03-13 21:47:04 UTC (rev 14037) +++ branches/xmlbuildsystem/reactos/lib/msacm/msacm32.xml 2005-03-13 21:59:51 UTC (rev 14038) @@ -0,0 +1,27 @@ +<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}"> + <dependency>winebuild</dependency> + <importlibrary definition="msacm32.spec.def" /> + <include base="msacm32">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>winmm</library> + <file>driver.c</file> + <file>filter.c</file> + <file>format.c</file> + <file>internal.c</file> + <file>msacm32_main.c</file> + <file>pcmconverter.c</file> + <file>stream.c</file> + <file>msacm32.spec</file> +</module>

19 years, 6 months

[gvg] 14037: Allow cancelling of listen IRPs

by gvg＠svn.reactos.com

Allow cancelling of listen IRPs Modified: trunk/reactos/drivers/lib/ip/transport/tcp/accept.c Modified: trunk/reactos/drivers/net/afd/afd/listen.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/accept.c --- trunk/reactos/drivers/lib/ip/transport/tcp/accept.c 2005-03-13 21:41:44 UTC (rev 14036) +++ trunk/reactos/drivers/lib/ip/transport/tcp/accept.c 2005-03-13 21:47:04 UTC (rev 14037) @@ -109,16 +109,16 @@ TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - for( ListEntry = Listener->ListenRequest.Flink; - ListEntry != &Listener->ListenRequest; - ListEntry = ListEntry->Flink ) { + ListEntry = Listener->ListenRequest.Flink; + while ( ListEntry != &Listener->ListenRequest ) { Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); + ListEntry = ListEntry->Flink; - if( Bucket->Request.Handle.ConnectionContext == Connection ) { + if( Bucket->AssociatedEndpoint == Connection ) { #ifdef MEMTRACK UntrackFL( __FILE__, __LINE__, Bucket->Request.RequestContext ); #endif - RemoveEntryList( ListEntry ); + RemoveEntryList( ListEntry->Blink ); ExFreePool( Bucket ); } } _____ Modified: trunk/reactos/drivers/net/afd/afd/listen.c --- trunk/reactos/drivers/net/afd/afd/listen.c 2005-03-13 21:41:44 UTC (rev 14036) +++ trunk/reactos/drivers/net/afd/afd/listen.c 2005-03-13 21:47:04 UTC (rev 14037) @@ -80,6 +80,11 @@ PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; + if ( Irp->Cancel ) { + /* FIXME: is this anything else we need to do? */ + return STATUS_SUCCESS; + } + if( !SocketAcquireStateLock( FCB ) ) return Status; FCB->ListenIrp.InFlightRequest = NULL; _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-03-13 21:41:44 UTC (rev 14036) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-03-13 21:47:04 UTC (rev 14037) @@ -219,6 +219,52 @@ } +VOID DDKAPI DispCancelListenRequest( + PDEVICE_OBJECT Device, + PIRP Irp) +/* + * FUNCTION: Cancels a listen IRP + * ARGUMENTS: + * Device = Pointer to device object + * Irp = Pointer to an I/O request packet + */ +{ + PIO_STACK_LOCATION IrpSp; + PTRANSPORT_CONTEXT TranContext; + PFILE_OBJECT FileObject; + PCONNECTION_ENDPOINT Connection; + /*NTSTATUS Status = STATUS_SUCCESS;*/ + + TI_DbgPrint(DEBUG_IRP, ("Called.\n")); + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + FileObject = IrpSp->FileObject; + TranContext = (PTRANSPORT_CONTEXT)FileObject->FsContext; + ASSERT( TDI_LISTEN == IrpSp->MinorFunction); + + TI_DbgPrint(DEBUG_IRP, ("IRP at (0x%X).\n", Irp)); + +#ifdef DBG + if (!Irp->Cancel) + TI_DbgPrint(MIN_TRACE, ("Irp->Cancel is FALSE, should be TRUE.\n")); +#endif + + /* Try canceling the request */ + Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + TCPAbortListenForSocket( + Connection->AddressFile->Listener, + Connection ); + + IoReleaseCancelSpinLock(Irp->CancelIrql); + + DispDataRequestComplete(Irp, STATUS_CANCELLED, 0); + + DispCancelComplete(FileObject); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); +} + + NTSTATUS DispTdiAccept( PIRP Irp) /* @@ -536,6 +582,12 @@ Status = TCPListen( Connection->AddressFile->Listener, 1024 ); /* BACKLOG */ } + if( NT_SUCCESS(Status) ) { + Status = DispPrepareIrpForCancel + (TranContext->Handle.ConnectionContext, + Irp, + (PDRIVER_CANCEL)DispCancelListenRequest); + } if( NT_SUCCESS(Status) ) { Status = TCPAccept

19 years, 6 months

← Newer
1
...
33
34
35
36
37
38
39
...
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 March 2005