From c36596ece06a7b8e2a42dd0bb5496f328c024eef Mon Sep 17 00:00:00 2001 From: Robert Dickenson Date: Thu, 26 Dec 2002 18:14:38 +0000 Subject: [PATCH] Keep the posix module buildable, and add some CVS sugar for easier scanning. svn path=/trunk/; revision=3896 --- posix/apps/baresh/.cvsignore | 5 +++ posix/apps/posixw32/.cvsignore | 5 +++ posix/include/psx/.cvsignore | 1 + posix/include/psx/lpcproto.h | 8 +++-- posix/lib/.cvsignore | 5 +++ posix/lib/psxdll/.cvsignore | 7 ++++ posix/lib/psxdll/dirent/.cvsignore | 2 ++ posix/lib/psxdll/dlfcn/.cvsignore | 2 ++ posix/lib/psxdll/errno/.cvsignore | 2 ++ posix/lib/psxdll/fcntl/.cvsignore | 2 ++ posix/lib/psxdll/libgen/.cvsignore | 2 ++ posix/lib/psxdll/misc/.cvsignore | 2 ++ posix/lib/psxdll/misc/pdata.c | 44 +++++++++++++++++++++---- posix/lib/psxdll/misc/spawn.c | 12 +++---- posix/lib/psxdll/pthread/.cvsignore | 2 ++ posix/lib/psxdll/sched/.cvsignore | 2 ++ posix/lib/psxdll/signal/.cvsignore | 2 ++ posix/lib/psxdll/stdlib/.cvsignore | 2 ++ posix/lib/psxdll/string/.cvsignore | 2 ++ posix/lib/psxdll/sys/stat/.cvsignore | 2 ++ posix/lib/psxdll/sys/utsname/.cvsignore | 2 ++ posix/lib/psxdll/unistd/.cvsignore | 2 ++ posix/lib/psxx/.cvsignore | 7 ++++ posix/lib/psxx/misc/.cvsignore | 6 ++++ posix/server/.cvsignore | 6 ++++ posix/server/call/.cvsignore | 4 +++ posix/server/include/.cvsignore | 1 + posix/server/misc/.cvsignore | 3 ++ posix/server/ob/.cvsignore | 2 ++ posix/server/port/.cvsignore | 2 ++ posix/tools/.cvsignore | 5 +++ 31 files changed, 136 insertions(+), 15 deletions(-) create mode 100644 posix/apps/baresh/.cvsignore create mode 100644 posix/apps/posixw32/.cvsignore create mode 100644 posix/include/psx/.cvsignore create mode 100644 posix/lib/.cvsignore create mode 100644 posix/lib/psxdll/.cvsignore create mode 100644 posix/lib/psxdll/dirent/.cvsignore create mode 100644 posix/lib/psxdll/dlfcn/.cvsignore create mode 100644 posix/lib/psxdll/errno/.cvsignore create mode 100644 posix/lib/psxdll/fcntl/.cvsignore create mode 100644 posix/lib/psxdll/libgen/.cvsignore create mode 100644 posix/lib/psxdll/misc/.cvsignore create mode 100644 posix/lib/psxdll/pthread/.cvsignore create mode 100644 posix/lib/psxdll/sched/.cvsignore create mode 100644 posix/lib/psxdll/signal/.cvsignore create mode 100644 posix/lib/psxdll/stdlib/.cvsignore create mode 100644 posix/lib/psxdll/string/.cvsignore create mode 100644 posix/lib/psxdll/sys/stat/.cvsignore create mode 100644 posix/lib/psxdll/sys/utsname/.cvsignore create mode 100644 posix/lib/psxdll/unistd/.cvsignore create mode 100644 posix/lib/psxx/.cvsignore create mode 100644 posix/lib/psxx/misc/.cvsignore create mode 100644 posix/server/.cvsignore create mode 100644 posix/server/call/.cvsignore create mode 100644 posix/server/include/.cvsignore create mode 100644 posix/server/misc/.cvsignore create mode 100644 posix/server/ob/.cvsignore create mode 100644 posix/server/port/.cvsignore create mode 100644 posix/tools/.cvsignore diff --git a/posix/apps/baresh/.cvsignore b/posix/apps/baresh/.cvsignore new file mode 100644 index 00000000000..7e878167e8e --- /dev/null +++ b/posix/apps/baresh/.cvsignore @@ -0,0 +1,5 @@ +*.o +*.d +*.exe +*.coff +*.sym diff --git a/posix/apps/posixw32/.cvsignore b/posix/apps/posixw32/.cvsignore new file mode 100644 index 00000000000..7e878167e8e --- /dev/null +++ b/posix/apps/posixw32/.cvsignore @@ -0,0 +1,5 @@ +*.o +*.d +*.exe +*.coff +*.sym diff --git a/posix/include/psx/.cvsignore b/posix/include/psx/.cvsignore new file mode 100644 index 00000000000..4143547671c --- /dev/null +++ b/posix/include/psx/.cvsignore @@ -0,0 +1 @@ +syscall.h diff --git a/posix/include/psx/lpcproto.h b/posix/include/psx/lpcproto.h index ed777012657..bd7c836db3e 100644 --- a/posix/include/psx/lpcproto.h +++ b/posix/include/psx/lpcproto.h @@ -1,4 +1,4 @@ -/* $Id: lpcproto.h,v 1.5 2002/10/29 04:45:13 rex Exp $ +/* $Id: lpcproto.h,v 1.6 2002/12/26 18:14:34 robd Exp $ * * ReactOS POSIX+ Environment Subsystem * LPC protocol spoken by PSXSS.EXE, PSXDLL.DLL, CSRTERM.EXE. @@ -56,7 +56,8 @@ typedef PSX_MESSAGE_HEADER PSX_MESSAGE, * PPSX_MESSAGE; typedef struct _PSX_MAX_MESSAGE { - LPC_MESSAGE_HEADER Header; + //LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; PSX_MESSAGE_HEADER PsxHeader; BYTE Data [PSX_MAX_LPC_DATA_SIZE]; } PSX_MAX_MESSAGE, * PPSX_MAX_MESSAGE; @@ -75,7 +76,8 @@ typedef enum { typedef struct _PSX_TERMINAL_IO { - LPC_MESSAGE_HEADER Header; + //LPC_MESSAGE_HEADER Header; + LPC_MESSAGE Header; PSX_MESSAGE_HEADER PsxHeader; ULONG Size; ULONG Offset; diff --git a/posix/lib/.cvsignore b/posix/lib/.cvsignore new file mode 100644 index 00000000000..7e878167e8e --- /dev/null +++ b/posix/lib/.cvsignore @@ -0,0 +1,5 @@ +*.o +*.d +*.exe +*.coff +*.sym diff --git a/posix/lib/psxdll/.cvsignore b/posix/lib/psxdll/.cvsignore new file mode 100644 index 00000000000..541cdb996ea --- /dev/null +++ b/posix/lib/psxdll/.cvsignore @@ -0,0 +1,7 @@ +*.o +*.d +*.a +*.exe +*.dll +*.coff +*.sym diff --git a/posix/lib/psxdll/dirent/.cvsignore b/posix/lib/psxdll/dirent/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/dirent/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/dlfcn/.cvsignore b/posix/lib/psxdll/dlfcn/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/dlfcn/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/errno/.cvsignore b/posix/lib/psxdll/errno/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/errno/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/fcntl/.cvsignore b/posix/lib/psxdll/fcntl/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/fcntl/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/libgen/.cvsignore b/posix/lib/psxdll/libgen/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/libgen/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/misc/.cvsignore b/posix/lib/psxdll/misc/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/misc/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/misc/pdata.c b/posix/lib/psxdll/misc/pdata.c index a82781e2f15..a61a9b0cdf0 100644 --- a/posix/lib/psxdll/misc/pdata.c +++ b/posix/lib/psxdll/misc/pdata.c @@ -1,4 +1,4 @@ -/* $Id: pdata.c,v 1.5 2002/10/29 04:45:33 rex Exp $ +/* $Id: pdata.c,v 1.6 2002/12/26 18:14:36 robd Exp $ */ /* * COPYRIGHT: See COPYING in the top level directory @@ -121,26 +121,58 @@ __PdxProcessDataToProcessParameters fdDescriptor = __fdtable_entry_get(&ProcessData->FdTable, STDIN_FILENO); if(fdDescriptor != NULL) - (*ProcessParameters)->InputHandle = fdDescriptor->FileHandle; + (*ProcessParameters)->hStdInput = fdDescriptor->FileHandle; /* standard output handle */ fdDescriptor = __fdtable_entry_get(&ProcessData->FdTable, STDOUT_FILENO); if(fdDescriptor != NULL) - (*ProcessParameters)->OutputHandle = fdDescriptor->FileHandle; + (*ProcessParameters)->hStdOutput = fdDescriptor->FileHandle; /* standard error handle */ fdDescriptor = __fdtable_entry_get(&ProcessData->FdTable, STDERR_FILENO); if(fdDescriptor != NULL) - (*ProcessParameters)->ErrorHandle = fdDescriptor->FileHandle; + (*ProcessParameters)->hStdError = fdDescriptor->FileHandle; /* POSIX+ and NT environments are incompatible, we set the environment to nothing */ (*ProcessParameters)->Environment = NULL; - (*ProcessParameters)->ConsoleHandle = (PVOID)-1; - (*ProcessParameters)->ConsoleFlags = 0; +/* +typedef struct _RTL_USER_PROCESS_PARAMETERS { + ULONG AllocationSize; + ULONG Size; + ULONG Flags; + ULONG DebugFlags; + HANDLE hConsole; + ULONG ProcessGroup; + HANDLE hStdInput; + HANDLE hStdOutput; + HANDLE hStdError; + UNICODE_STRING CurrentDirectoryName; + HANDLE CurrentDirectoryHandle; + UNICODE_STRING DllPath; + UNICODE_STRING ImagePathName; + UNICODE_STRING CommandLine; + PWSTR Environment; + ULONG dwX; + ULONG dwY; + ULONG dwXSize; + ULONG dwYSize; + ULONG dwXCountChars; + ULONG dwYCountChars; + ULONG dwFillAttribute; + ULONG dwFlags; + ULONG wShowWindow; + UNICODE_STRING WindowTitle; + UNICODE_STRING DesktopInfo; + UNICODE_STRING ShellInfo; + UNICODE_STRING RuntimeInfo; +} RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS; + */ + (*ProcessParameters)->hConsole = (PVOID)-1; + (*ProcessParameters)->Flags = 0; return (STATUS_SUCCESS); } diff --git a/posix/lib/psxdll/misc/spawn.c b/posix/lib/psxdll/misc/spawn.c index 87e45c6ad6d..4ac8e6c4ade 100644 --- a/posix/lib/psxdll/misc/spawn.c +++ b/posix/lib/psxdll/misc/spawn.c @@ -1,4 +1,4 @@ -/* $Id: spawn.c,v 1.8 2002/10/29 04:45:35 rex Exp $ +/* $Id: spawn.c,v 1.9 2002/12/26 18:14:36 robd Exp $ */ /* * COPYRIGHT: See COPYING in the top level directory @@ -222,7 +222,7 @@ NTSTATUS STDCALL __PdxSpawnPosixProcess } /* 3.3.2: process parameters */ - nDestBufferSize = pppProcessParameters->Length; + nDestBufferSize = pppProcessParameters->Size; nErrCode = NtAllocateVirtualMemory ( @@ -317,7 +317,7 @@ NTSTATUS STDCALL __PdxSpawnPosixProcess hProcess, pParamsBuffer, pppProcessParameters, - pppProcessParameters->Length, + pppProcessParameters->Size, NULL ); @@ -417,7 +417,7 @@ undoPData: NtCurrentProcess(), ProcessData->FdTable.Descriptors[i].FileHandle, hProcess, - (PHANDLE)((ULONG)pParamsBuffer + offsetof(RTL_USER_PROCESS_PARAMETERS, InputHandle)), + (PHANDLE)((ULONG)pParamsBuffer + offsetof(RTL_USER_PROCESS_PARAMETERS, hStdInput)), 0, 0, DUPLICATE_SAME_ACCESS | 4 /* | DUPLICATE_SAME_ATTRIBUTES */ /* FIXME */ @@ -438,7 +438,7 @@ undoPData: NtCurrentProcess(), ProcessData->FdTable.Descriptors[i].FileHandle, hProcess, - (PHANDLE)((ULONG)pParamsBuffer + offsetof(RTL_USER_PROCESS_PARAMETERS, OutputHandle)), + (PHANDLE)((ULONG)pParamsBuffer + offsetof(RTL_USER_PROCESS_PARAMETERS, hStdOutput)), 0, 0, DUPLICATE_SAME_ACCESS | 4 /* | DUPLICATE_SAME_ATTRIBUTES */ /* FIXME */ @@ -459,7 +459,7 @@ undoPData: NtCurrentProcess(), ProcessData->FdTable.Descriptors[i].FileHandle, hProcess, - (PHANDLE)((ULONG)pParamsBuffer + offsetof(RTL_USER_PROCESS_PARAMETERS, ErrorHandle)), + (PHANDLE)((ULONG)pParamsBuffer + offsetof(RTL_USER_PROCESS_PARAMETERS, hStdError)), 0, 0, DUPLICATE_SAME_ACCESS | 4 /* | DUPLICATE_SAME_ATTRIBUTES */ /* FIXME */ diff --git a/posix/lib/psxdll/pthread/.cvsignore b/posix/lib/psxdll/pthread/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/pthread/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/sched/.cvsignore b/posix/lib/psxdll/sched/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/sched/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/signal/.cvsignore b/posix/lib/psxdll/signal/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/signal/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/stdlib/.cvsignore b/posix/lib/psxdll/stdlib/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/stdlib/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/string/.cvsignore b/posix/lib/psxdll/string/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/string/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/sys/stat/.cvsignore b/posix/lib/psxdll/sys/stat/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/sys/stat/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/sys/utsname/.cvsignore b/posix/lib/psxdll/sys/utsname/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/sys/utsname/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxdll/unistd/.cvsignore b/posix/lib/psxdll/unistd/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/lib/psxdll/unistd/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/lib/psxx/.cvsignore b/posix/lib/psxx/.cvsignore new file mode 100644 index 00000000000..541cdb996ea --- /dev/null +++ b/posix/lib/psxx/.cvsignore @@ -0,0 +1,7 @@ +*.o +*.d +*.a +*.exe +*.dll +*.coff +*.sym diff --git a/posix/lib/psxx/misc/.cvsignore b/posix/lib/psxx/misc/.cvsignore new file mode 100644 index 00000000000..f0022c19403 --- /dev/null +++ b/posix/lib/psxx/misc/.cvsignore @@ -0,0 +1,6 @@ +*.o +*.d +*.exe +*.dll +*.coff +*.sym diff --git a/posix/server/.cvsignore b/posix/server/.cvsignore new file mode 100644 index 00000000000..f0022c19403 --- /dev/null +++ b/posix/server/.cvsignore @@ -0,0 +1,6 @@ +*.o +*.d +*.exe +*.dll +*.coff +*.sym diff --git a/posix/server/call/.cvsignore b/posix/server/call/.cvsignore new file mode 100644 index 00000000000..fb1d79a92b5 --- /dev/null +++ b/posix/server/call/.cvsignore @@ -0,0 +1,4 @@ +stubs.c +syscall.c +*.o +*.d diff --git a/posix/server/include/.cvsignore b/posix/server/include/.cvsignore new file mode 100644 index 00000000000..4143547671c --- /dev/null +++ b/posix/server/include/.cvsignore @@ -0,0 +1 @@ +syscall.h diff --git a/posix/server/misc/.cvsignore b/posix/server/misc/.cvsignore new file mode 100644 index 00000000000..0a94a2b5b10 --- /dev/null +++ b/posix/server/misc/.cvsignore @@ -0,0 +1,3 @@ +*.o +*.d +*.coff diff --git a/posix/server/ob/.cvsignore b/posix/server/ob/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/server/ob/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/server/port/.cvsignore b/posix/server/port/.cvsignore new file mode 100644 index 00000000000..6142305dc12 --- /dev/null +++ b/posix/server/port/.cvsignore @@ -0,0 +1,2 @@ +*.o +*.d diff --git a/posix/tools/.cvsignore b/posix/tools/.cvsignore new file mode 100644 index 00000000000..7e878167e8e --- /dev/null +++ b/posix/tools/.cvsignore @@ -0,0 +1,5 @@ +*.o +*.d +*.exe +*.coff +*.sym