From 99af0f4db6247389903d61f528f7e3aa2c8058d6 Mon Sep 17 00:00:00 2001 From: Emanuele Aliberti Date: Sun, 21 Dec 2003 20:11:46 +0000 Subject: [PATCH] Minor changes to make the posix module partially compile. svn path=/trunk/; revision=7165 --- posix/server/ob/process.c | 10 +++++----- posix/server/ob/session.c | 26 +++++++++++++------------- posix/server/port/api.c | 19 ++++++++++--------- posix/server/port/sbapi.c | 4 ++-- posix/server/port/session.c | 21 +++++++++++---------- posix/server/port/utils.c | 8 +++++--- posix/tools/mksystab/mksystab.c | 12 ++++++------ posix/tools/mksystab/postbuild.cmd | 20 ++++++++++++++++++++ 8 files changed, 72 insertions(+), 48 deletions(-) create mode 100644 posix/tools/mksystab/postbuild.cmd diff --git a/posix/server/ob/process.c b/posix/server/ob/process.c index ca27d76c34d..3dad481e832 100644 --- a/posix/server/ob/process.c +++ b/posix/server/ob/process.c @@ -1,4 +1,4 @@ -/* $Id: process.c,v 1.3 2002/10/29 04:45:54 rex Exp $ +/* $Id: process.c,v 1.4 2003/12/21 20:11:46 ea Exp $ * * PROJECT : ReactOS / POSIX+ Environment Subsystem Server * FILE : reactos/subsys/psx/server/ob/session.c @@ -33,9 +33,9 @@ NTSTATUS STDCALL PsxInitializeProcesses (VOID) { - debug_print (L"PSXSS: ->"__FUNCTION__); + debug_print (L"PSXSS: ->%s", __FUNCTION__); /* TODO */ - debug_print (L"PSXSS: <-"__FUNCTION__); + debug_print (L"PSXSS: <-%s", __FUNCTION__); return STATUS_SUCCESS; } /********************************************************************** @@ -48,9 +48,9 @@ PsxCreateProcess ( ULONG ulPortIdentifier ) { - debug_print (L"PSXSS: ->"__FUNCTION__); + debug_print (L"PSXSS: ->%s", __FUNCTION__); /* TODO */ - debug_print (L"PSXSS: <-"__FUNCTION__); + debug_print (L"PSXSS: <-%s", __FUNCTION__); return STATUS_SUCCESS; } /* EOF */ diff --git a/posix/server/ob/session.c b/posix/server/ob/session.c index 8c9a55fa184..c8d2685bd71 100644 --- a/posix/server/ob/session.c +++ b/posix/server/ob/session.c @@ -1,4 +1,4 @@ -/* $Id: session.c,v 1.3 2002/10/29 04:45:54 rex Exp $ +/* $Id: session.c,v 1.4 2003/12/21 20:11:46 ea Exp $ * * PROJECT : ReactOS / POSIX+ Environment Subsystem Server * FILE : reactos/subsys/psx/server/ob/session.c @@ -59,7 +59,7 @@ static struct NTSTATUS STDCALL PsxInitializeSessions (VOID) { - debug_print (L"PSXSS: ->"__FUNCTION__); + debug_print (L"PSXSS: ->%s", __FUNCTION__); /* Initalize the attributes */ Sessions.NextFreeId = 0; Sessions.Count = 0; @@ -91,9 +91,9 @@ PsxCreateSessionObjects ( PSX_NS_SESSION_PORT_TEMPLATE, PSX_NS_SUBSYSTEM_DIRECTORY_NAME, PSX_NS_SESSION_DIRECTORY_NAME, - pRequest->Header.Cid.UniqueProcess + pRequest->Header.ClientId.UniqueProcess ); - debug_print (L"PSXSS: "__FUNCTION__": %s", NameBuffer); + debug_print (L"PSXSS: %s: %s", __FUNCTION__, NameBuffer); RtlInitUnicodeString (& Name, NameBuffer); InitializeObjectAttributes (& Oa, & Name, 0, NULL, NULL); RtlZeroMemory (& Sqos, sizeof Sqos); @@ -112,7 +112,7 @@ PsxCreateSessionObjects ( ); if (!NT_SUCCESS(Status)) { - debug_print (L"PSXSS: "__FUNCTION__": NtConnectPort failed with %08x\n", Status); + debug_print (L"PSXSS: %s: NtConnectPort failed with %08x\n", __FUNCTION__, Status); return Status; } /* TODO: */ @@ -122,9 +122,9 @@ PsxCreateSessionObjects ( PSX_NS_SESSION_DATA_TEMPLATE, PSX_NS_SUBSYSTEM_DIRECTORY_NAME, PSX_NS_SESSION_DIRECTORY_NAME, - pRequest->Header.Cid.UniqueProcess + pRequest->Header.ClientId.UniqueProcess ); - debug_print (L"PSXSS: "__FUNCTION__": %s", NameBuffer); + debug_print (L"PSXSS: : %s", __FUNCTION__, NameBuffer); RtlInitUnicodeString (& Name, NameBuffer); InitializeObjectAttributes (& Oa, & Name, 0, 0, 0); Status = NtOpenSection ( @@ -135,7 +135,7 @@ PsxCreateSessionObjects ( if (!NT_SUCCESS(Status)) { NtClose (pSession->TerminalChannel.hPort); - debug_print (L"PSXSS: "__FUNCTION__": NtOpenSection failed with %08x\n", Status); + debug_print (L"PSXSS: %s: NtOpenSection failed with %08x\n", __FUNCTION__, Status); return Status; } pSession->TerminalChannel.Section.BaseAddress = NULL; @@ -156,7 +156,7 @@ PsxCreateSessionObjects ( { NtClose (pSession->TerminalChannel.hPort); NtClose (pSession->TerminalChannel.Section.Handle); - debug_print (L"PSXSS: "__FUNCTION__": NtMapViewOfSection failed with %08x\n", Status); + debug_print (L"PSXSS: %s: NtMapViewOfSection failed with %08x\n", __FUNCTION__, Status); return Status; } return Status; @@ -182,12 +182,12 @@ PsxCreateSession ( { PPSX_SESSION Session = NULL; - debug_print (L"PSXSS: ->"__FUNCTION__); + debug_print (L"PSXSS: ->%s", __FUNCTION__); /* Create the PSX_SESSION object */ Session = RtlAllocateHeap (Server.Heap, 0, sizeof (PSX_SESSION)); if (NULL == Session) { - debug_print (L"PSXSS: "__FUNCTION__": failed to create a new session object"); + debug_print (L"PSXSS: %s: failed to create a new session object", __FUNCTION__); return STATUS_MEMORY_NOT_ALLOCATED; } RtlZeroMemory (Session, sizeof (PSX_SESSION)); @@ -210,7 +210,7 @@ PsxCreateSession ( if (INVALID_HANDLE_VALUE == Session->Heap) { RtlFreeHeap (Server.Heap, 0, Session); - debug_print (L"PSX: "__FUNCTION__": failed to create a new heap for session # %d", Session->Id); + debug_print (L"PSX: %s: failed to create a new heap for session # %d", __FUNCTION__, Session->Id); return STATUS_MEMORY_NOT_ALLOCATED; } RtlInitializeCriticalSection (& Session->Lock); @@ -229,7 +229,7 @@ PsxCreateSession ( ++ Sessions.Count; UNLOCK_ALL_SESSIONS; /* DONE */ - debug_print (L""__FUNCTION__": session # %d created", Session->Id); + debug_print (L"%s: session # %d created", __FUNCTION__, Session->Id); Session->Status = SESSION_STATUS_READY; return STATUS_SUCCESS; } diff --git a/posix/server/port/api.c b/posix/server/port/api.c index 7168a26229b..d6d8b27db2c 100644 --- a/posix/server/port/api.c +++ b/posix/server/port/api.c @@ -1,4 +1,4 @@ -/* $Id: api.c,v 1.3 2002/10/29 04:45:58 rex Exp $ +/* $Id: api.c,v 1.4 2003/12/21 20:11:46 ea Exp $ * * PROJECT : ReactOS / POSIX+ Environment Subsystem Server * FILE : reactos/subsys/psx/server/port/api.c @@ -43,7 +43,7 @@ ProcessConnectionRequest (PLPC_MAX_MESSAGE pRequest) HANDLE hConnectedPort; ULONG ulPortIdentifier; - debug_print (L"PSXSS: ->"__FUNCTION__); + debug_print (L"PSXSS: ->%s", __FUNCTION__); /* Check if the caller is a process */ Status = PsxCheckConnectionRequest ( pConnectData, @@ -62,7 +62,8 @@ ProcessConnectionRequest (PLPC_MAX_MESSAGE pRequest) if (!NT_SUCCESS(Status)) { debug_print( - L"PSXSS: "__FUNCTION__": NtAcceptConnectPort failed with status=%08x", + L"PSXSS: %s: NtAcceptConnectPort failed with status=%08x", + __FUNCTION__, Status ); } @@ -79,22 +80,22 @@ ProcessConnectionRequest (PLPC_MAX_MESSAGE pRequest) ); if (!NT_SUCCESS(Status)) { - debug_print(L"PSXSS: "__FUNCTION__": NtAcceptConnectPort failed with status=%08x", Status); + debug_print(L"PSXSS: %s: NtAcceptConnectPort failed with status=%08x", __FUNCTION__, Status); return Status; } Status = PsxCreateProcess (pRequest,hConnectedPort,ulPortIdentifier); if (!NT_SUCCESS(Status)) { - debug_print(L"PSXSS: "__FUNCTION__": PsxCreateProcess failed with status=%08x", Status); + debug_print(L"PSXSS: %s: PsxCreateProcess failed with status=%08x", __FUNCTION__, Status); return Status; } Status = NtCompleteConnectPort (hConnectedPort); if (!NT_SUCCESS(Status)) { - debug_print(L"PSXSS: "__FUNCTION__": NtCompleteConnectPort failed with status=%08x", Status); + debug_print(L"PSXSS: %s: NtCompleteConnectPort failed with status=%08x", __FUNCTION__, Status); return Status; } - debug_print (L"PSXSS: <-"__FUNCTION__); + debug_print (L"PSXSS: <-%s", __FUNCTION__); return STATUS_SUCCESS; } /********************************************************************** @@ -106,7 +107,7 @@ ProcessConnectionRequest (PLPC_MAX_MESSAGE pRequest) PRIVATE NTSTATUS STDCALL ProcessRequest (PPSX_MAX_MESSAGE pRequest) { - debug_print (L"PSXSS: ->"__FUNCTION__); + debug_print (L"PSXSS: ->%s", __FUNCTION__); if (pRequest->PsxHeader.Procedure < PSX_SYSCALL_APIPORT_COUNT) { @@ -137,7 +138,7 @@ ApiPortListener (PVOID pArg) PPSX_MAX_MESSAGE Reply = NULL; BOOL NullReply = FALSE; - debug_print (L"PSXSS: ->"__FUNCTION__" pArg=%d", ulIndex); + debug_print (L"PSXSS: ->%s pArg=%d", __FUNCTION__, ulIndex); while (TRUE) { diff --git a/posix/server/port/sbapi.c b/posix/server/port/sbapi.c index 091a06404f7..c29ee14fded 100644 --- a/posix/server/port/sbapi.c +++ b/posix/server/port/sbapi.c @@ -1,4 +1,4 @@ -/* $Id: sbapi.c,v 1.3 2002/10/29 04:45:58 rex Exp $ +/* $Id: sbapi.c,v 1.4 2003/12/21 20:11:46 ea Exp $ * * PROJECT : ReactOS / POSIX+ Environment Subsystem Server * FILE : reactos/subsys/psx/server/port/sbapi.c @@ -62,7 +62,7 @@ SbApiPortListener (PVOID pArg) PSX_MAX_MESSAGE Request; PPSX_MAX_MESSAGE Reply = NULL; - debug_print (L"PSXSS: ->"__FUNCTION__" pArg=%d", (ULONG) pArg); + debug_print (L"PSXSS: ->%s pArg=%d", TEXT(__FUNCTION__), (ULONG) pArg); RtlZeroMemory (& Request, sizeof Request); /* TODO */ diff --git a/posix/server/port/session.c b/posix/server/port/session.c index 6b82a6f32b0..abd0889521d 100644 --- a/posix/server/port/session.c +++ b/posix/server/port/session.c @@ -1,4 +1,4 @@ -/* $Id: session.c,v 1.3 2002/10/29 04:45:58 rex Exp $ +/* $Id: session.c,v 1.4 2003/12/21 20:11:46 ea Exp $ * * PROJECT : ReactOS / POSIX+ Environment Subsystem Server * FILE : reactos/subsys/psx/server/port/session.c @@ -40,7 +40,7 @@ ProcessConnectionRequest (PLPC_MAX_MESSAGE pRequest) HANDLE hConnectedPort; ULONG ulPortIdentifier; - debug_print (L"PSXSS: ->"__FUNCTION__); + debug_print (L"PSXSS: ->%s", TEXT(__FUNCTION__)); /* Check if the caller is a terminal */ Status = PsxCheckConnectionRequest ( @@ -60,7 +60,8 @@ ProcessConnectionRequest (PLPC_MAX_MESSAGE pRequest) if (!NT_SUCCESS(Status)) { debug_print( - L"PSXSS: "__FUNCTION__": NtAcceptConnectPort failed with status=%08x", + L"PSXSS: %s: NtAcceptConnectPort failed with status=%08x", + TEXT(__FUNCTION__), Status ); } @@ -77,7 +78,7 @@ ProcessConnectionRequest (PLPC_MAX_MESSAGE pRequest) ); if (!NT_SUCCESS(Status)) { - debug_print(L"PSXSS: "__FUNCTION__": NtAcceptConnectPort failed with status=%08x", Status); + debug_print(L"PSXSS: %s: NtAcceptConnectPort failed with status=%08x", TEXT(__FUNCTION__), Status); return Status; } /* OK, now create a new PSX_SESSION object */ @@ -88,16 +89,16 @@ ProcessConnectionRequest (PLPC_MAX_MESSAGE pRequest) ); if (!NT_SUCCESS(Status)) { - debug_print(L"PSXSS: "__FUNCTION__": PsxCreateSession failed with status=%08x", Status); + debug_print(L"PSXSS: %s: PsxCreateSession failed with status=%08x", TEXT(__FUNCTION__), Status); return Status; } Status = NtCompleteConnectPort (hConnectedPort); if (!NT_SUCCESS(Status)) { - debug_print(L"PSXSS: "__FUNCTION__": NtCompleteConnectPort failed with status=%08x", Status); + debug_print(L"PSXSS: %s: NtCompleteConnectPort failed with status=%08x", TEXT(__FUNCTION__), Status); return Status; } - debug_print (L"PSXSS: <-"__FUNCTION__); + debug_print (L"PSXSS: <-%s", TEXT(__FUNCTION__)); return STATUS_SUCCESS; } /********************************************************************** @@ -106,10 +107,10 @@ ProcessConnectionRequest (PLPC_MAX_MESSAGE pRequest) PRIVATE NTSTATUS STDCALL ProcessRequest (PPSX_MAX_MESSAGE pRequest) { - debug_print (L"PSXSS: ->"__FUNCTION__); + debug_print (L"PSXSS: ->%s", TEXT(__FUNCTION__)); /* TODO: Read data from the section */ /* TODO: send data to the process */ - debug_print (L"PSXSS: <-"__FUNCTION__); + debug_print (L"PSXSS: <-%s", TEXT(__FUNCTION__)); return STATUS_NOT_IMPLEMENTED; } /********************************************************************** @@ -136,7 +137,7 @@ SessionPortListener (PVOID pArg) PPSX_MAX_MESSAGE Reply = NULL; BOOL NullReply = FALSE; - debug_print (L"PSXSS: ->"__FUNCTION__" pArg=%d", ulIndex); + debug_print (L"PSXSS: ->%s pArg=%d", TEXT(__FUNCTION__), ulIndex); while (TRUE) { diff --git a/posix/server/port/utils.c b/posix/server/port/utils.c index 3ba0d6fe7b7..6e3c16e0d81 100644 --- a/posix/server/port/utils.c +++ b/posix/server/port/utils.c @@ -1,4 +1,4 @@ -/* $Id: utils.c,v 1.3 2002/10/29 04:45:58 rex Exp $ +/* $Id: utils.c,v 1.4 2003/12/21 20:11:46 ea Exp $ * * PROJECT : ReactOS / POSIX+ Environment Subsystem Server * FILE : reactos/subsys/psx/server/port/utils.c @@ -45,7 +45,8 @@ PsxCheckConnectionRequest ( if (ConnectionType != pConnectData->ConnectionType) { debug_print( - L"PSXSS: "__FUNCTION__": ConnectionType=%d, expected %d", + L"PSXSS: %s: ConnectionType=%d, expected %d", + TEXT(__FUNCTION__), pConnectData->ConnectionType, ConnectionType ); @@ -55,7 +56,8 @@ PsxCheckConnectionRequest ( if (PSX_LPC_PROTOCOL_VERSION != pConnectData->Version) { debug_print( - L"PSXSS: "__FUNCTION__": Version=%d, expected %d", + L"PSXSS: %s: Version=%d, expected %d", + TEXT(__FUNCTION__), pConnectData->Version, PSX_LPC_PROTOCOL_VERSION ); diff --git a/posix/tools/mksystab/mksystab.c b/posix/tools/mksystab/mksystab.c index 83aa53e3667..4f998ee9eed 100644 --- a/posix/tools/mksystab/mksystab.c +++ b/posix/tools/mksystab/mksystab.c @@ -1,4 +1,4 @@ -/* $Id: mksystab.c,v 1.1 2003/01/05 18:08:11 robd Exp $ +/* $Id: mksystab.c,v 1.2 2003/12/21 20:11:46 ea Exp $ * * PROJECT : ReactOS / POSIX+ Subsystem * DESCRIPTION: Build the system calls table for @@ -185,8 +185,8 @@ METHOD_TYPE systab_iter (int self, PPARSER_CONTEXT context) METHOD_TYPE systab_epilog (int self, PPARSER_CONTEXT context) { - fprintf (mf[self].fp, "0\n};\n"); - fputs ("/* EOF */", mf[self].fp); + fprintf (mf[self].fp, "0\n};\n"); + fprintf (mf[self].fp, "/* EOF */\n"); return METHOD_SUCCESS; } @@ -218,7 +218,7 @@ METHOD_TYPE server_include_iter (int self, PPARSER_CONTEXT context) METHOD_TYPE server_include_epilog (int self, PPARSER_CONTEXT context) { fprintf (mf[self].fp, "#endif /* ndef _SERVER_SYSCALL_H */\n"); - fputs ("/* EOF */", mf[self].fp); + fprintf (mf[self].fp, "/* EOF */\n"); return METHOD_SUCCESS; } @@ -251,7 +251,7 @@ METHOD_TYPE psx_include_epilog (int self, PPARSER_CONTEXT context) { fprintf (mf[self].fp, "#define PSX_SYSCALL_APIPORT_COUNT %d\n", context->id ++); fprintf (mf[self].fp, "#endif /* ndef _PSX_SYSCALL_H */\n"); - fputs ("/* EOF */", mf[self].fp); + fprintf (mf[self].fp, "/* EOF */\n"); return METHOD_SUCCESS; } @@ -287,7 +287,7 @@ METHOD_TYPE stubs_iter (int self, PPARSER_CONTEXT context) METHOD_TYPE stubs_epilog (int self, PPARSER_CONTEXT context) { - fputs ("/* EOF */", mf[self].fp); + fprintf (mf[self].fp, "/* EOF */\n"); return METHOD_SUCCESS; } diff --git a/posix/tools/mksystab/postbuild.cmd b/posix/tools/mksystab/postbuild.cmd new file mode 100644 index 00000000000..998c134eedc --- /dev/null +++ b/posix/tools/mksystab/postbuild.cmd @@ -0,0 +1,20 @@ +@echo off + +setlocal + +set PATH_TO_TOP=..\..\..\reactos + +set PATH_TO_PSX_TOP=..\.. + +set TARGET_NAME=mksystab + +set SYSCALL_DB=syscall.db +set SYSTAB_C=%PATH_TO_PSX_TOP%\server\call\syscall.c +set SYSTAB_H=%PATH_TO_PSX_TOP%\server\include\syscall.h +set SYSCALL_H=%PATH_TO_PSX_TOP%\include\psx\syscall.h +set STUBS_C=%PATH_TO_PSX_TOP%\server\call\stubs.c + + +mksystab %SYSCALL_DB% %SYSTAB_C% %SYSTAB_H% %SYSCALL_H% %STUBS_C% + +endlocal