Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 12754: Clean up the pipe type and mode mess.
by ekohl＠svn.reactos.com 03 Jan '05

03 Jan '05

Clean up the pipe type and mode mess. Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/drivers/fs/np/npfs.h Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-01-03 11:30:28 UTC (rev 12753) +++ trunk/reactos/drivers/fs/np/create.c 2005-01-03 13:50:04 UTC (rev 12754) @@ -320,11 +320,11 @@ InitializeListHead(&Pipe->ClientFcbListHead); KeInitializeMutex(&Pipe->FcbListLock, 0); - Pipe->PipeType = Buffer->NamedPipeType ? FILE_PIPE_MESSAGE_TYPE : FILE_PIPE_BYTE_STREAM_TYPE; - Pipe->PipeWriteMode = Buffer->NamedPipeType ? FILE_PIPE_MESSAGE_MODE : FILE_PIPE_BYTE_STREAM_MODE; - Pipe->PipeReadMode = Buffer->ReadMode ? FILE_PIPE_MESSAGE_MODE : FILE_PIPE_BYTE_STREAM_MODE; - Pipe->PipeBlockMode = Buffer->CompletionMode; - Pipe->PipeConfiguration = IoStack->Parameters.Create.Options & 0x3; + Pipe->PipeType = Buffer->NamedPipeType; + Pipe->WriteMode = Buffer->ReadMode; + Pipe->ReadMode = Buffer->ReadMode; + Pipe->CompletionMode = Buffer->CompletionMode; + Pipe->PipeConfiguration = IoStack->Parameters.CreatePipe.Options & 0x3; Pipe->MaximumInstances = Buffer->MaximumInstances; Pipe->CurrentInstances = 0; Pipe->TimeOut = Buffer->DefaultTimeout; _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-01-03 11:30:28 UTC (rev 12753) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-01-03 13:50:04 UTC (rev 12754) @@ -217,64 +217,31 @@ NpfsGetState(PIRP Irp, PIO_STACK_LOCATION IrpSp) { - ULONG OutputBufferLength; PNPFS_GET_STATE Reply; - NTSTATUS Status; PNPFS_PIPE Pipe; PNPFS_FCB Fcb; - OutputBufferLength = IrpSp->Parameters.DeviceIoControl.OutputBufferLength; - /* Validate parameters */ - if (OutputBufferLength >= sizeof(NPFS_GET_STATE)) + if (IrpSp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(NPFS_GET_STATE)) { - Fcb = IrpSp->FileObject->FsContext; - Reply = (PNPFS_GET_STATE)Irp->AssociatedIrp.SystemBuffer; - Pipe = Fcb->Pipe; - - if (Pipe->PipeWriteMode == FILE_PIPE_MESSAGE_MODE) - { - Reply->WriteModeMessage = TRUE; + DPRINT("Status (0x%X).\n", STATUS_INVALID_PARAMETER); + return STATUS_INVALID_PARAMETER; } - else - { - Reply->WriteModeMessage = FALSE; - } - if (Pipe->PipeReadMode == FILE_PIPE_MESSAGE_MODE) - { - Reply->ReadModeMessage = TRUE; - } - else - { - Reply->ReadModeMessage = FALSE; - } + Fcb = IrpSp->FileObject->FsContext; + Reply = (PNPFS_GET_STATE)Irp->AssociatedIrp.SystemBuffer; + Pipe = Fcb->Pipe; - if (Pipe->PipeBlockMode == FILE_PIPE_QUEUE_OPERATION) - { - Reply->NonBlocking = TRUE; - } - else - { - Reply->NonBlocking = FALSE; - } + Reply->WriteModeMessage = (Pipe->WriteMode == FILE_PIPE_MESSAGE_MODE); + Reply->ReadModeMessage = (Pipe->ReadMode == FILE_PIPE_MESSAGE_MODE); + Reply->NonBlocking = (Pipe->CompletionMode == FILE_PIPE_QUEUE_OPERATION); + Reply->InBufferSize = Pipe->InboundQuota; + Reply->OutBufferSize = Pipe->OutboundQuota; + Reply->Timeout = Pipe->TimeOut; - Reply->InBufferSize = Pipe->InboundQuota; + DPRINT("Status (0x%X).\n", STATUS_SUCCESS); - Reply->OutBufferSize = Pipe->OutboundQuota; - - Reply->Timeout = Pipe->TimeOut; - - Status = STATUS_SUCCESS; - } - else - { - Status = STATUS_INVALID_PARAMETER; - } - - DPRINT("Status (0x%X).\n", Status); - - return Status; + return STATUS_SUCCESS; } @@ -290,64 +257,34 @@ NpfsSetState(PIRP Irp, PIO_STACK_LOCATION IrpSp) { - ULONG InputBufferLength; PNPFS_SET_STATE Request; PNPFS_PIPE Pipe; - NTSTATUS Status; PNPFS_FCB Fcb; - InputBufferLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; - /* Validate parameters */ - if (InputBufferLength >= sizeof(NPFS_SET_STATE)) - { - Fcb = IrpSp->FileObject->FsContext; - Request = (PNPFS_SET_STATE)Irp->AssociatedIrp.SystemBuffer; - Pipe = Fcb->Pipe; - - if (Request->WriteModeMessage) + if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(NPFS_SET_STATE)) { - Pipe->PipeWriteMode = FILE_PIPE_MESSAGE_MODE; + DPRINT("Status (0x%X).\n", STATUS_INVALID_PARAMETER); + return STATUS_INVALID_PARAMETER; } - else - { - Pipe->PipeWriteMode = FILE_PIPE_BYTE_STREAM_MODE; - } - if (Request->ReadModeMessage) - { - Pipe->PipeReadMode = FILE_PIPE_MESSAGE_MODE; - } - else - { - Pipe->PipeReadMode = FILE_PIPE_BYTE_STREAM_MODE; - } + Fcb = IrpSp->FileObject->FsContext; + Request = (PNPFS_SET_STATE)Irp->AssociatedIrp.SystemBuffer; + Pipe = Fcb->Pipe; - if (Request->NonBlocking) - { - Pipe->PipeBlockMode = FILE_PIPE_QUEUE_OPERATION; - } - else - { - Pipe->PipeBlockMode = FILE_PIPE_COMPLETE_OPERATION; - } + Pipe->WriteMode = + Request->WriteModeMessage ? FILE_PIPE_MESSAGE_MODE : FILE_PIPE_BYTE_STREAM_MODE; + Pipe->ReadMode = + Request->WriteModeMessage ? FILE_PIPE_MESSAGE_MODE : FILE_PIPE_BYTE_STREAM_MODE; + Pipe->CompletionMode = + Request->NonBlocking ? FILE_PIPE_QUEUE_OPERATION : FILE_PIPE_COMPLETE_OPERATION; + Pipe->InboundQuota = Request->InBufferSize; + Pipe->OutboundQuota = Request->OutBufferSize; + Pipe->TimeOut = Request->Timeout; - Pipe->InboundQuota = Request->InBufferSize; + DPRINT("Status (0x%X).\n", STATUS_SUCCESS); - Pipe->OutboundQuota = Request->OutBufferSize; - - Pipe->TimeOut = Request->Timeout; - - Status = STATUS_SUCCESS; - } - else - { - Status = STATUS_INVALID_PARAMETER; - } - - DPRINT("Status (0x%X).\n", Status); - - return Status; + return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/fs/np/npfs.h --- trunk/reactos/drivers/fs/np/npfs.h 2005-01-03 11:30:28 UTC (rev 12753) +++ trunk/reactos/drivers/fs/np/npfs.h 2005-01-03 13:50:04 UTC (rev 12754) @@ -26,9 +26,9 @@ LIST_ENTRY ServerFcbListHead; LIST_ENTRY ClientFcbListHead; ULONG PipeType; - ULONG PipeReadMode; - ULONG PipeWriteMode; - ULONG PipeBlockMode; + ULONG ReadMode; + ULONG WriteMode; + ULONG CompletionMode; ULONG PipeConfiguration; ULONG MaximumInstances; ULONG CurrentInstances; _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-01-03 11:30:28 UTC (rev 12753) +++ trunk/reactos/drivers/fs/np/rw.c 2005-01-03 13:50:04 UTC (rev 12754) @@ -1,4 +1,4 @@ -/* $Id: rw.c,v 1.16 2004/12/30 16:15:10 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -168,7 +168,7 @@ KeAcquireSpinLock(&ReadFcb->DataListLock, &OldIrql); } - if (Pipe->PipeReadMode == FILE_PIPE_BYTE_STREAM_MODE) + if (Pipe->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) { DPRINT("Byte stream mode\n"); /* Byte stream mode */ @@ -363,7 +363,7 @@ KeAcquireSpinLock(&Fcb->DataListLock, &OldIrql); } - if (Pipe->PipeWriteMode == FILE_PIPE_BYTE_STREAM_MODE) + if (Pipe->WriteMode == FILE_PIPE_BYTE_STREAM_MODE) { DPRINT("Byte stream mode\n"); while (Length > 0 && Fcb->WriteQuotaAvailable > 0)

1 0

[hbirr] 12753: - Fixed the searching for uninitialized (like .bss) segments.
by hbirr＠svn.reactos.com 03 Jan '05

03 Jan '05

- Fixed the searching for uninitialized (like .bss) segments. Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-01-03 11:25:40 UTC (rev 12752) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-01-03 11:30:28 UTC (rev 12753) @@ -680,7 +680,7 @@ { Execute = TRUE; } - if (Characteristics & (IMAGE_SCN_MEM_WRITE|IMAGE_SCN_LNK_OTHER)) + if (Characteristics & (IMAGE_SCN_MEM_WRITE|IMAGE_SCN_CNT_UNINITIALIZED_DATA)) { Write = TRUE; } @@ -910,7 +910,7 @@ Protect = PAGE_EXECUTE_READ; } } - else if (Characteristics & (IMAGE_SCN_MEM_WRITE|IMAGE_SCN_LNK_OTHER)) + else if (Characteristics & (IMAGE_SCN_MEM_WRITE|IMAGE_SCN_CNT_UNINITIALIZED_DATA)) { Protect = PAGE_READWRITE; } @@ -1115,7 +1115,7 @@ PageAddress = (PVOID)((ULONG_PTR)PageAddress + PAGE_SIZE); } if (DriverBase == ModuleLoadBase && - Characteristics & IMAGE_SCN_LNK_OTHER) + Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) { /* For ntoskrnl, we must stop after the bss section */ break;

1 0

[mf] 12752: update Explorer Jamfile
by mf＠svn.reactos.com 03 Jan '05

03 Jan '05

update Explorer Jamfile Modified: trunk/reactos/subsys/system/explorer/Jamfile Modified: trunk/reactos/subsys/system/explorer/explorer.dsw Modified: trunk/reactos/subsys/system/explorer/explorer.rc Modified: trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.rc Modified: trunk/reactos/subsys/system/explorer/rc-mingw.jam Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h Property changes on: trunk/reactos/subsys/system/explorer ___________________________________________________________________ Name: svn:ignore - *.coff *.exe *.d *.o *.a *.sym *.map bin Debug Release DRelease UDebug URelease _NO_COMUTIL doxy-doc Win32 WineDll WineRelease *.ncb *.opt *.aps *.ncb *.plg *.suo buildno.h notifyhook.dll *.gch *.h.pch + *.coff *.exe *.d *.o *.a *.sym *.map bin Debug Release DRelease UDebug URelease _NO_COMUTIL doxy-doc Win32 WineDll WineRelease *.ncb *.opt *.aps *.ncb *.plg *.suo buildno.h notifyhook.dll *.gch *.h.pch pack.* .gdbinit start-gdb.bat libexpat.dll _____ Modified: trunk/reactos/subsys/system/explorer/Jamfile --- trunk/reactos/subsys/system/explorer/Jamfile 2005-01-03 10:59:19 UTC (rev 12751) +++ trunk/reactos/subsys/system/explorer/Jamfile 2005-01-03 11:25:40 UTC (rev 12752) @@ -44,7 +44,7 @@ dialogs/settings.cpp i386-stub-win32.c : <define>WIN32 <define>_WIN32_IE=0x0600 <define>_WIN32_WINNT=0x0501 <define>WINVER=0x0500 - <cxxflags>-I$(INCLUDE) + <cxxflags>-I$(INCLUDE) <cxxflags>-I. #nur für GCC: <cxxflags>-fexceptions <cxxflags>-Wall <find-shared-library>gdi32 <find-shared-library>ole32 _____ Modified: trunk/reactos/subsys/system/explorer/explorer.dsw --- trunk/reactos/subsys/system/explorer/explorer.dsw 2005-01-03 10:59:19 UTC (rev 12751) +++ trunk/reactos/subsys/system/explorer/explorer.dsw 2005-01-03 11:25:40 UTC (rev 12752) @@ -11,6 +11,9 @@ Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name notifyhook + End Project Dependency }}} ######################################################################## ####### _____ Modified: trunk/reactos/subsys/system/explorer/explorer.rc --- trunk/reactos/subsys/system/explorer/explorer.rc 2005-01-03 10:59:19 UTC (rev 12751) +++ trunk/reactos/subsys/system/explorer/explorer.rc 2005-01-03 11:25:40 UTC (rev 12752) @@ -1,4 +1,4 @@ -/* $Id: explorer.rc,v 1.6 2004/10/16 20:27:41 gvg Exp $ */ +/* $Id$ */ #include <defines.h> _____ Modified: trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.rc --- trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.rc 2005-01-03 10:59:19 UTC (rev 12751) +++ trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.rc 2005-01-03 11:25:40 UTC (rev 12752) @@ -1,4 +1,4 @@ -/* $Id: notifyhook.rc,v 1.2 2004/10/16 20:27:41 gvg Exp $ */ +/* $Id$ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "NotifyHook DLL for ROS Explorer\0" _____ Modified: trunk/reactos/subsys/system/explorer/rc-mingw.jam --- trunk/reactos/subsys/system/explorer/rc-mingw.jam 2005-01-03 10:59:19 UTC (rev 12751) +++ trunk/reactos/subsys/system/explorer/rc-mingw.jam 2005-01-03 11:25:40 UTC (rev 12752) @@ -33,12 +33,12 @@ actions quietly resource-compile-mingw { - windres -o "$(<)" -i "$(>)" + windres -D__WINDRES__ -o "$(<)" -i "$(>)" } actions quietly resource-compile-cygwin { - windres --include-dir "$(>:D)" -o "$(<)" -i "$(>)" + windres -D__WINDRES__ --include-dir "$(>:D)" -o "$(<)" -i "$(>)" } actions quietly create-empty-object _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-01-03 10:59:19 UTC (rev 12751) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-01-03 11:25:40 UTC (rev 12752) @@ -612,23 +612,6 @@ return out; } -protected: - Children _children; - AttributeMap _attributes; - - std::string _leading; - std::string _content; - std::string _end_leading; - std::string _trailing; - - XMLNode* get_first_child() const - { - if (!_children.empty()) - return _children.front(); - else - return NULL; - } - XMLNode* find(const XS_String& name, int n=0) const { for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) @@ -687,6 +670,23 @@ /// relative XPath create function XMLNode* create_relative(const char* path); +protected: + Children _children; + AttributeMap _attributes; + + std::string _leading; + std::string _content; + std::string _end_leading; + std::string _trailing; + + XMLNode* get_first_child() const + { + if (!_children.empty()) + return _children.front(); + else + return NULL; + } + void write_worker(std::ostream& out, int indent) const; void pretty_write_worker(std::ostream& out, int indent) const; void smart_write_worker(std::ostream& out, int indent) const;

1 0

[gvg] 12751: Silence stupid compiler which doesn't know what it is talking about
by gvg＠svn.reactos.com 03 Jan '05

03 Jan '05

Silence stupid compiler which doesn't know what it is talking about Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-01-03 10:06:08 UTC (rev 12750) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-01-03 10:59:19 UTC (rev 12751) @@ -411,7 +411,7 @@ HBITMAP bmpMask, bmpColor; BOOLEAN Ret; PLIST_ENTRY Search; - PCURICON_PROCESS Current; + PCURICON_PROCESS Current = NULL; PW32PROCESS W32Process = PsGetWin32Process(); ExAcquireFastMutex(&Object->Lock);

1 0

[gvg] 12750: Find other entries besides the first too...
by gvg＠svn.reactos.com 03 Jan '05

03 Jan '05

Find other entries besides the first too... Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-01-03 09:46:31 UTC (rev 12749) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-01-03 10:06:08 UTC (rev 12750) @@ -440,7 +440,7 @@ Search = Object->ProcessList.Flink; while (Search != &Object->ProcessList) { - Current = CONTAINING_RECORD(Object->ProcessList.Flink, CURICON_PROCESS, ListEntry); + Current = CONTAINING_RECORD(Search, CURICON_PROCESS, ListEntry); if (Current->Process == W32Process) { break;

1 0

[gvg] 12749: Fix ref counting bug
by gvg＠svn.reactos.com 03 Jan '05

03 Jan '05

Fix ref counting bug Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-01-03 05:17:16 UTC (rev 12748) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-01-03 09:46:31 UTC (rev 12749) @@ -343,21 +343,25 @@ { Object = CONTAINING_RECORD(CurrentEntry, CURICON_OBJECT, ListEntry); CurrentEntry = CurrentEntry->Flink; - if((Object->hModule == hModule) && (Object->hRsrc == hRsrc)) + if(NT_SUCCESS(ObmReferenceObjectByPointer(Object, otCursorIcon))) { - if(cx && ((cx != Object->Size.cx) || (cy != Object->Size.cy))) + if((Object->hModule == hModule) && (Object->hRsrc == hRsrc)) { - ObmDereferenceObject(Object); - continue; - } - if (! ReferenceCurIconByProcess(Object)) - { + if(cx && ((cx != Object->Size.cx) || (cy != Object->Size.cy))) + { + ObmDereferenceObject(Object); + continue; + } + if (! ReferenceCurIconByProcess(Object)) + { + ExReleaseFastMutex(&CurIconListLock); + return NULL; + } ExReleaseFastMutex(&CurIconListLock); - return NULL; + return Object; } - ExReleaseFastMutex(&CurIconListLock); - return Object; } + ObmDereferenceObject(Object); } ExReleaseFastMutex(&CurIconListLock);

1 0

[ion] 12748: Fix incorrect LPC Object export...we export pointers not the object itself! Also remove more TIME stuff to be properly compatible with real structures.
by ion＠svn.reactos.com 03 Jan '05

03 Jan '05

Fix incorrect LPC Object export...we export pointers not the object itself! Also remove more TIME stuff to be properly compatible with real structures. Modified: trunk/reactos/include/napi/dbg.h Modified: trunk/reactos/include/ntos/zwtypes.h Modified: trunk/reactos/ntoskrnl/include/internal/port.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/lpc/complete.c Modified: trunk/reactos/ntoskrnl/lpc/connect.c Modified: trunk/reactos/ntoskrnl/lpc/create.c Modified: trunk/reactos/ntoskrnl/lpc/port.c Modified: trunk/reactos/ntoskrnl/lpc/query.c Modified: trunk/reactos/ntoskrnl/lpc/reply.c Modified: trunk/reactos/ntoskrnl/lpc/send.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/tinfo.c _____ Modified: trunk/reactos/include/napi/dbg.h --- trunk/reactos/include/napi/dbg.h 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/include/napi/dbg.h 2005-01-03 05:17:16 UTC (rev 12748) @@ -62,7 +62,7 @@ typedef struct _LPC_TERMINATION_MESSAGE { LPC_MESSAGE Header; - TIME CreationTime; + LARGE_INTEGER CreationTime; } LPC_TERMINATION_MESSAGE, *PLPC_TERMINATION_MESSAGE; #endif /* __INCLUDE_NAPI_DBG_H */ _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/include/ntos/zwtypes.h 2005-01-03 05:17:16 UTC (rev 12748) @@ -729,10 +729,10 @@ // Information class 4 typedef struct _KERNEL_USER_TIMES { - TIME CreateTime; - TIME ExitTime; - TIME KernelTime; - TIME UserTime; + LARGE_INTEGER CreateTime; + LARGE_INTEGER ExitTime; + LARGE_INTEGER KernelTime; + LARGE_INTEGER UserTime; } KERNEL_USER_TIMES, *PKERNEL_USER_TIMES; // Information class 9 @@ -1324,9 +1324,9 @@ SIZE_T NextEntryDelta; ULONG ThreadCount; ULONG Reserved1[6]; - TIME CreateTime; - TIME UserTime; - TIME KernelTime; + LARGE_INTEGER CreateTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER KernelTime; UNICODE_STRING ProcessName; KPRIORITY BasePriority; ULONG ProcessId; @@ -1342,9 +1342,9 @@ SIZE_T NextEntryDelta; ULONG ThreadCount; ULONG Reserved1[6]; - TIME CreateTime; - TIME UserTime; - TIME KernelTime; + LARGE_INTEGER CreateTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER KernelTime; UNICODE_STRING ProcessName; KPRIORITY BasePriority; ULONG ProcessId; _____ Modified: trunk/reactos/ntoskrnl/include/internal/port.h --- trunk/reactos/ntoskrnl/include/internal/port.h 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/include/internal/port.h 2005-01-03 05:17:16 UTC (rev 12748) @@ -65,7 +65,7 @@ NTSTATUS STDCALL LpcSendTerminationPort (PEPORT Port, - TIME CreationTime); + LARGE_INTEGER CreationTime); /* EPORT.Type */ @@ -140,7 +140,7 @@ NTSTATUS NiInitPort (VOID); -extern OBJECT_TYPE LpcPortObjectType; +extern POBJECT_TYPE LpcPortObjectType; extern ULONG LpcpNextMessageId; extern FAST_MUTEX LpcpLock; _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-01-03 05:17:16 UTC (rev 12748) @@ -160,11 +160,11 @@ { KTHREAD Tcb; union { - TIME CreateTime; + LARGE_INTEGER CreateTime; UCHAR NestedFaultCount:2; UCHAR ApcNeeded:1; }; - TIME ExitTime; + LARGE_INTEGER ExitTime; LIST_ENTRY LpcReplyChain; NTSTATUS ExitStatus; PVOID OfsChain; @@ -316,14 +316,10 @@ ULONG LockCount; /* 07C */ /* Time of process creation. */ -#ifdef __USE_W32API - LARGE_INTEGER CreateTime; /* 080 */ -#else - TIME CreateTime; /* 080 */ -#endif + LARGE_INTEGER CreateTime; /* 080 */ /* Time of process exit. */ - TIME ExitTime; /* 088 */ + LARGE_INTEGER ExitTime; /* 088 */ /* Unknown. */ PKTHREAD LockOwner; /* 090 */ /* Process id. */ _____ Modified: trunk/reactos/ntoskrnl/lpc/complete.c --- trunk/reactos/ntoskrnl/lpc/complete.c 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/lpc/complete.c 2005-01-03 05:17:16 UTC (rev 12748) @@ -46,7 +46,7 @@ */ Status = ObReferenceObjectByHandle (hServerSideCommPort, PORT_ALL_ACCESS, - & LpcPortObjectType, + LpcPortObjectType, UserMode, (PVOID*)&ReplyPort, NULL); _____ Modified: trunk/reactos/ntoskrnl/lpc/connect.c --- trunk/reactos/ntoskrnl/lpc/connect.c 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/lpc/connect.c 2005-01-03 05:17:16 UTC (rev 12748) @@ -66,7 +66,7 @@ * Create a port to represent our side of the connection */ Status = ObCreateObject (KernelMode, - & LpcPortObjectType, + LpcPortObjectType, NULL, KernelMode, NULL, @@ -333,7 +333,7 @@ 0, NULL, PORT_ALL_ACCESS, /* DesiredAccess */ - & LpcPortObjectType, + LpcPortObjectType, UserMode, NULL, (PVOID*)&NamedPort); @@ -547,7 +547,7 @@ Status = ObReferenceObjectByHandle(NamedPortHandle, PORT_ALL_ACCESS, - & LpcPortObjectType, + LpcPortObjectType, UserMode, (PVOID*)&NamedPort, NULL); @@ -563,7 +563,7 @@ if (AcceptIt) { Status = ObCreateObject(ExGetPreviousMode(), - & LpcPortObjectType, + LpcPortObjectType, NULL, ExGetPreviousMode(), NULL, _____ Modified: trunk/reactos/ntoskrnl/lpc/create.c --- trunk/reactos/ntoskrnl/lpc/create.c 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/lpc/create.c 2005-01-03 05:17:16 UTC (rev 12748) @@ -134,7 +134,7 @@ /* Ask Ob to create the object */ Status = ObCreateObject (ExGetPreviousMode(), - & LpcPortObjectType, + LpcPortObjectType, ObjectAttributes, ExGetPreviousMode(), NULL, _____ Modified: trunk/reactos/ntoskrnl/lpc/port.c --- trunk/reactos/ntoskrnl/lpc/port.c 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/lpc/port.c 2005-01-03 05:17:16 UTC (rev 12748) @@ -21,7 +21,7 @@ /* GLOBALS *******************************************************************/ -OBJECT_TYPE LpcPortObjectType = {0, }; +POBJECT_TYPE LpcPortObjectType = 0; ULONG LpcpNextMessageId = 0; /* 0 is not a valid ID */ FAST_MUTEX LpcpLock; /* global internal sync in LPC facility */ @@ -37,30 +37,32 @@ NTSTATUS INIT_FUNCTION NiInitPort (VOID) { - RtlZeroMemory (& LpcPortObjectType, sizeof (OBJECT_TYPE)); + /* Allocate Memory for the LPC Object */ + LpcPortObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); + RtlZeroMemory (LpcPortObjectType, sizeof (OBJECT_TYPE)); - RtlRosInitUnicodeStringFromLiteral(&LpcPortObjectType.TypeName,L"Port"); + RtlRosInitUnicodeStringFromLiteral(&LpcPortObjectType->TypeName,L"Port") ; - LpcPortObjectType.Tag = TAG('L', 'P', 'R', 'T'); - LpcPortObjectType.MaxObjects = ULONG_MAX; - LpcPortObjectType.MaxHandles = ULONG_MAX; - LpcPortObjectType.TotalObjects = 0; - LpcPortObjectType.TotalHandles = 0; - LpcPortObjectType.PagedPoolCharge = 0; - LpcPortObjectType.NonpagedPoolCharge = sizeof(EPORT); - LpcPortObjectType.Mapping = &ExpPortMapping; - LpcPortObjectType.Dump = NULL; - LpcPortObjectType.Open = NULL; - LpcPortObjectType.Close = NiClosePort; - LpcPortObjectType.Delete = NiDeletePort; - LpcPortObjectType.Parse = NULL; - LpcPortObjectType.Security = NULL; - LpcPortObjectType.QueryName = NULL; - LpcPortObjectType.OkayToClose = NULL; - LpcPortObjectType.Create = NiCreatePort; - LpcPortObjectType.DuplicationNotify = NULL; + LpcPortObjectType->Tag = TAG('L', 'P', 'R', 'T'); + LpcPortObjectType->MaxObjects = ULONG_MAX; + LpcPortObjectType->MaxHandles = ULONG_MAX; + LpcPortObjectType->TotalObjects = 0; + LpcPortObjectType->TotalHandles = 0; + LpcPortObjectType->PagedPoolCharge = 0; + LpcPortObjectType->NonpagedPoolCharge = sizeof(EPORT); + LpcPortObjectType->Mapping = &ExpPortMapping; + LpcPortObjectType->Dump = NULL; + LpcPortObjectType->Open = NULL; + LpcPortObjectType->Close = NiClosePort; + LpcPortObjectType->Delete = NiDeletePort; + LpcPortObjectType->Parse = NULL; + LpcPortObjectType->Security = NULL; + LpcPortObjectType->QueryName = NULL; + LpcPortObjectType->OkayToClose = NULL; + LpcPortObjectType->Create = NiCreatePort; + LpcPortObjectType->DuplicationNotify = NULL; - ObpCreateTypeObject(& LpcPortObjectType); + ObpCreateTypeObject(LpcPortObjectType); LpcpNextMessageId = 0; _____ Modified: trunk/reactos/ntoskrnl/lpc/query.c --- trunk/reactos/ntoskrnl/lpc/query.c 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/lpc/query.c 2005-01-03 05:17:16 UTC (rev 12748) @@ -50,7 +50,7 @@ Status = ObReferenceObjectByHandle (PortHandle, PORT_ALL_ACCESS, /* AccessRequired */ - & LpcPortObjectType, + LpcPortObjectType, UserMode, (PVOID *) & Port, NULL); _____ Modified: trunk/reactos/ntoskrnl/lpc/reply.c --- trunk/reactos/ntoskrnl/lpc/reply.c 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/lpc/reply.c 2005-01-03 05:17:16 UTC (rev 12748) @@ -88,7 +88,7 @@ Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, /* AccessRequired */ - & LpcPortObjectType, + LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); @@ -154,7 +154,7 @@ Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - & LpcPortObjectType, + LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); _____ Modified: trunk/reactos/ntoskrnl/lpc/send.c --- trunk/reactos/ntoskrnl/lpc/send.c 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/lpc/send.c 2005-01-03 05:17:16 UTC (rev 12748) @@ -30,7 +30,7 @@ */ NTSTATUS STDCALL LpcSendTerminationPort (IN PEPORT Port, - IN TIME CreationTime) + IN LARGE_INTEGER CreationTime) { NTSTATUS Status; LPC_TERMINATION_MESSAGE Msg; @@ -180,7 +180,7 @@ Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - & LpcPortObjectType, + LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); @@ -231,7 +231,7 @@ Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - & LpcPortObjectType, + LpcPortObjectType, UserMode, (PVOID*)&Port, NULL); _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-01-03 05:17:16 UTC (rev 12748) @@ -448,7 +448,7 @@ Status = ObReferenceObjectByHandle(PortHandle, PORT_ALL_ACCESS, - & LpcPortObjectType, + LpcPortObjectType, KeGetCurrentThread()->PreviousMode, (PVOID*)&TerminationPort, NULL); _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-03 05:17:16 UTC (rev 12748) @@ -745,7 +745,7 @@ { Status = ObReferenceObjectByHandle(DebugPort, PORT_ALL_ACCESS, - & LpcPortObjectType, + LpcPortObjectType, UserMode, (PVOID*)&pDebugPort, NULL); @@ -767,7 +767,7 @@ { Status = ObReferenceObjectByHandle(ExceptionPort, PORT_ALL_ACCESS, - & LpcPortObjectType, + LpcPortObjectType, UserMode, (PVOID*)&pExceptionPort, NULL); _____ Modified: trunk/reactos/ntoskrnl/ps/tinfo.c --- trunk/reactos/ntoskrnl/ps/tinfo.c 2005-01-03 04:06:24 UTC (rev 12747) +++ trunk/reactos/ntoskrnl/ps/tinfo.c 2005-01-03 05:17:16 UTC (rev 12748) @@ -253,9 +253,9 @@ case ThreadTimes: u.TTI.KernelTime.QuadPart = Thread->Tcb.KernelTime * 100000LL; u.TTI.UserTime.QuadPart = Thread->Tcb.UserTime * 100000LL; - u.TTI.CreateTime = (TIME) Thread->CreateTime; + u.TTI.CreateTime = Thread->CreateTime; /*This works*/ - u.TTI.ExitTime = (TIME) Thread->ExitTime; + u.TTI.ExitTime = Thread->ExitTime; break; case ThreadQuerySetWin32StartAddress:

1 0

[ion] 12747: Fix more wrong structure defintions... and use proper values for Thread/Process mapping, not some weird undocumented/reversed values with no explenation.
by ion＠svn.reactos.com 03 Jan '05

03 Jan '05

Fix more wrong structure defintions... and use proper values for Thread/Process mapping, not some weird undocumented/reversed values with no explenation. Modified: trunk/reactos/include/ddk/kefuncs.h Modified: trunk/reactos/include/ntos/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ps/tinfo.c _____ Modified: trunk/reactos/include/ddk/kefuncs.h --- trunk/reactos/include/ddk/kefuncs.h 2005-01-03 03:54:00 UTC (rev 12746) +++ trunk/reactos/include/ddk/kefuncs.h 2005-01-03 04:06:24 UTC (rev 12747) @@ -113,7 +113,7 @@ #ifndef __USE_W32API #define KeGetCurrentProcessorNumber() (KeGetCurrentKPCR()->ProcessorNumber) ULONG KeGetDcacheFillSize(VOID); -ULONG STDCALL KeGetPreviousMode (VOID); +KPROCESSOR_MODE STDCALL KeGetPreviousMode (VOID); #endif struct _KTHREAD* STDCALL KeGetCurrentThread (VOID); _____ Modified: trunk/reactos/include/ntos/ps.h --- trunk/reactos/include/ntos/ps.h 2005-01-03 03:54:00 UTC (rev 12746) +++ trunk/reactos/include/ntos/ps.h 2005-01-03 04:06:24 UTC (rev 12747) @@ -47,6 +47,7 @@ /* Thread access rights */ #define THREAD_TERMINATE (0x0001L) #define THREAD_SUSPEND_RESUME (0x0002L) +#define THREAD_ALERT (0x0004L) #define THREAD_GET_CONTEXT (0x0008L) #define THREAD_SET_CONTEXT (0x0010L) #define THREAD_SET_INFORMATION (0x0020L) @@ -69,6 +70,7 @@ #define PROCESS_SET_QUOTA (0x0100L) #define PROCESS_SET_INFORMATION (0x0200L) #define PROCESS_QUERY_INFORMATION (0x0400L) +#define PROCESS_SET_PORT (0x0800L) #define PROCESS_ALL_ACCESS (0x1f0fffL) _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-03 03:54:00 UTC (rev 12746) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-03 04:06:24 UTC (rev 12747) @@ -158,15 +158,18 @@ typedef struct _SECTION_OBJECT *PSECTION_OBJECT; +typedef struct _EPROCESS_QUOTA_ENTRY { + ULONG Usage; + ULONG Limit; + ULONG Peak; + ULONG Return; +} EPROCESS_QUOTA_ENTRY, *PEPROCESS_QUOTA_ENTRY; + typedef struct _EPROCESS_QUOTA_BLOCK { -KSPIN_LOCK QuotaLock; -ULONG ReferenceCount; -ULONG QuotaPeakPoolUsage[2]; -ULONG QuotaPoolUsage[2]; -ULONG QuotaPoolLimit[2]; -ULONG PeakPagefileUsage; -ULONG PagefileUsage; -ULONG PagefileLimit; + EPROCESS_QUOTA_ENTRY QuotaEntry[3]; + LIST_ENTRY QuotaList; + ULONG ReferenceCount; + ULONG ProcessCount; } EPROCESS_QUOTA_BLOCK, *PEPROCESS_QUOTA_BLOCK; /* _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-03 03:54:00 UTC (rev 12746) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-03 04:06:24 UTC (rev 12747) @@ -27,9 +27,11 @@ static ULONG PiNextProcessUniqueId = 0; /* TODO */ static LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; -static GENERIC_MAPPING PiProcessMapping = {PROCESS_READ, - PROCESS_WRITE, - PROCESS_EXECUTE, +static GENERIC_MAPPING PiProcessMapping = {STANDARD_RIGHTS_READ | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, + STANDARD_RIGHTS_WRITE | PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | + PROCESS_VM_OPERATION | PROCESS_VM_WRITE | PROCESS_DUP_HANDLE | + PROCESS_TERMINATE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | PROCESS_SET_PORT, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, PROCESS_ALL_ACCESS}; #define MAX_PROCESS_NOTIFY_ROUTINE_COUNT 8 @@ -1191,10 +1193,10 @@ PKERNEL_USER_TIMES ProcessTimeP = (PKERNEL_USER_TIMES)ProcessInformation; - ProcessTimeP->CreateTime = (TIME) Process->CreateTime; + ProcessTimeP->CreateTime = Process->CreateTime; ProcessTimeP->UserTime.QuadPart = Process->Pcb.UserTime * 100000LL; ProcessTimeP->KernelTime.QuadPart = Process->Pcb.KernelTime * 100000LL; - ProcessTimeP->ExitTime = (TIME) Process->ExitTime; + ProcessTimeP->ExitTime = Process->ExitTime; if (ReturnLength) { @@ -2144,7 +2146,6 @@ ) { PEPROCESS_QUOTA_BLOCK QuotaBlock; - KIRQL OldValue; ULONG NewUsageSize; ULONG NewMaxQuota; @@ -2154,40 +2155,33 @@ /* Quota Operations are not to be done on the SYSTEM Process */ if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; - /* Acquire Spinlock */ - KeAcquireSpinLock(&QuotaBlock->QuotaLock, &OldValue); - /* New Size in use */ - NewUsageSize = QuotaBlock->QuotaPoolUsage[PoolType] + Amount; + NewUsageSize = QuotaBlock->QuotaEntry[PoolType].Usage + Amount; /* Does this size respect the quota? */ - if (NewUsageSize > QuotaBlock->QuotaPoolLimit[PoolType]) { + if (NewUsageSize > QuotaBlock->QuotaEntry[PoolType].Limit) { /* It doesn't, so keep raising the Quota */ - while (MiRaisePoolQuota(PoolType, QuotaBlock->QuotaPoolLimit[PoolType], &NewMaxQuota)) { + while (MiRaisePoolQuota(PoolType, QuotaBlock->QuotaEntry[PoolType].Limit, &NewMaxQuota)) { /* Save new Maximum Quota */ - QuotaBlock->QuotaPoolLimit[PoolType] = NewMaxQuota; + QuotaBlock->QuotaEntry[PoolType].Limit = NewMaxQuota; /* See if the new Maximum Quota fulfills our need */ if (NewUsageSize <= NewMaxQuota) goto QuotaChanged; } - KeReleaseSpinLock(&QuotaBlock->QuotaLock, OldValue); return STATUS_QUOTA_EXCEEDED; } QuotaChanged: /* Save new Usage */ - QuotaBlock->QuotaPoolUsage[PoolType] = NewUsageSize; + QuotaBlock->QuotaEntry[PoolType].Usage = NewUsageSize; /* Is this a new peak? */ - if (NewUsageSize > QuotaBlock->QuotaPeakPoolUsage[PoolType]) { - QuotaBlock->QuotaPeakPoolUsage[PoolType] = NewUsageSize; + if (NewUsageSize > QuotaBlock->QuotaEntry[PoolType].Peak) { + QuotaBlock->QuotaEntry[PoolType].Peak = NewUsageSize; } - /* Release spinlock */ - KeReleaseSpinLock(&QuotaBlock->QuotaLock, OldValue); - /* All went well */ return STATUS_SUCCESS; } _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-01-03 03:54:00 UTC (rev 12746) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-01-03 04:06:24 UTC (rev 12747) @@ -43,9 +43,10 @@ static KEVENT PiReaperThreadEvent; static BOOLEAN PiReaperThreadShouldTerminate = FALSE; -static GENERIC_MAPPING PiThreadMapping = {THREAD_READ, - THREAD_WRITE, - THREAD_EXECUTE, +static GENERIC_MAPPING PiThreadMapping = {STANDARD_RIGHTS_READ | THREAD_GET_CONTEXT | THREAD_QUERY_INFORMATION, + STANDARD_RIGHTS_WRITE | THREAD_TERMINATE | THREAD_SUSPEND_RESUME | THREAD_ALERT | + THREAD_SET_INFORMATION | THREAD_SET_CONTEXT, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, THREAD_ALL_ACCESS}; /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/ps/tinfo.c --- trunk/reactos/ntoskrnl/ps/tinfo.c 2005-01-03 03:54:00 UTC (rev 12746) +++ trunk/reactos/ntoskrnl/ps/tinfo.c 2005-01-03 04:06:24 UTC (rev 12747) @@ -316,7 +316,7 @@ /* * @implemented */ -ULONG STDCALL +KPROCESSOR_MODE STDCALL KeGetPreviousMode (VOID) { return (ULONG)PsGetCurrentThread()->Tcb.PreviousMode;

1 0

[sedwards] 12746: added support for building Wine tests along with CI tests
by sedwards＠svn.reactos.com 03 Jan '05

03 Jan '05

added support for building Wine tests along with CI tests Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-01-03 02:37:10 UTC (rev 12745) +++ trunk/reactos/tools/helper.mk 2005-01-03 03:54:00 UTC (rev 12746) @@ -1,4 +1,4 @@ -# $Id: helper.mk,v 1.101 2004/12/13 02:20:09 blight Exp $ +# $Id$ # # Helper makefile for ReactOS modules # Variables this makefile accepts: @@ -51,6 +51,7 @@ # $TARGET_BOOTSTRAP = Whether this file is needed to bootstrap the installation (no,yes) (optional) # $TARGET_BOOTSTRAP_NAME = Name on the installation medium (optional) # $TARGET_REGTESTS = This module has regression tests (no,yes) (optional) +# $TARGET_WINETESTS = This module Wine regression tests (no,yes) (optional) # $TARGET_INSTALL = Install the file (no,yes) (optional) # $SUBDIRS = Subdirs in which to run make (optional) @@ -692,6 +693,12 @@ MK_REGTESTS_CLEAN := endif +ifeq ($(TARGET_WINETESTS),yes) +all: + - $(MAKE) -C winetests + MK_REGTESTS_CLEAN := clean_winetests +endif + ifeq ($(TARGET_INSTALL),) MK_INSTALL := yes else @@ -709,7 +716,7 @@ TARGET_CLEAN += $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME) -all: $(REGTEST_TARGETS) $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME) +all: $(WINETEST_TARGETS) $(REGTEST_TARGETS) $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME) $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME): $(MK_OBJECTS) $(MK_DEFNAME) $(HALFVERBOSEECHO) [DLLTOOL] $(MK_IMPLIB_FULLNAME) @@ -1092,8 +1099,11 @@ - $(MAKE) -C tests TARGET_REGTESTS=no clean - $(RM) ./tests/_rtstub.c ./tests/_hooks.c ./tests/_regtests.c ./tests/_stubs.S ./tests/Makefile.tests -.PHONY: all depends implib clean install dist bootcd depends gen_regtests clean_regtests +clean_winetests: + - $(MAKE) -C winetests clean +.PHONY: all depends implib clean install dist bootcd depends gen_regtests clean_regtests clean_winetests + ifneq ($(SUBDIRS),) $(SUBDIRS:%=%_all): %_all: $(MAKE) -C $* SUBDIRS= all

1 0

[sedwards] 12745: move wine tests from tests to winetests
by sedwards＠svn.reactos.com 03 Jan '05

03 Jan '05

move wine tests from tests to winetests Deleted: trunk/reactos/lib/msvcrt/tests/ Added: trunk/reactos/lib/msvcrt/winetests/ Modified: trunk/reactos/lib/msvcrt/winetests/Makefile _____ Copied: trunk/reactos/lib/msvcrt/winetests (from rev 12740, trunk/reactos/lib/msvcrt/tests) _____ Modified: trunk/reactos/lib/msvcrt/winetests/Makefile --- trunk/reactos/lib/msvcrt/tests/Makefile 2005-01-02 23:12:40 UTC (rev 12740) +++ trunk/reactos/lib/msvcrt/winetests/Makefile 2005-01-03 02:37:10 UTC (rev 12745) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2004/12/11 19:51:31 sedwards Exp $ +# $Id$ PATH_TO_TOP = ../../..

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs