patch reverted because ros crashes ntoskrnl

svn path=/trunk/; revision=9003
This commit is contained in:
Thomas Bluemel 2004-04-07 15:02:31 +00:00
parent 6d228618c2
commit 879e613c5d
4 changed files with 27 additions and 14 deletions

View file

@ -1,4 +1,4 @@
/* $Id: genw32k.c,v 1.7 2004/04/07 00:14:05 hyperion Exp $ /* $Id: genw32k.c,v 1.8 2004/04/07 15:02:31 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS version of ntdll * PROJECT: ReactOS version of ntdll
@ -88,7 +88,7 @@ char *stmp;
* Now write the current system call's name * Now write the current system call's name
* in the service table. * in the service table.
*/ */
fprintf(out,"\t\t(PVOID (NTAPI *)(VOID))%s",name); fprintf(out,"\t\t{ (ULONG)%s }",name);
/* Next system call index */ /* Next system call index */
sys_call_idx++; sys_call_idx++;
@ -143,7 +143,7 @@ char *stmp;
* Now write the current system call's ID * Now write the current system call's ID
* in the service table along with its Parameters Size. * in the service table along with its Parameters Size.
*/ */
fprintf(out,"\t\t%d",atoi(nr_args) * sizeof(void*)); fprintf(out,"\t\t{ %d }",atoi(nr_args) * sizeof(void*));
/* Next system call index */ /* Next system call index */
sys_call_idx++; sys_call_idx++;
@ -346,3 +346,4 @@ int main(int argc, char* argv[])
return(ret); return(ret);
} }

View file

@ -1,4 +1,4 @@
/* $Id: genntdll.c,v 1.14 2004/04/07 00:14:05 hyperion Exp $ /* $Id: genntdll.c,v 1.15 2004/04/07 15:02:31 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS version of ntdll * PROJECT: ReactOS version of ntdll
@ -135,7 +135,7 @@ char *stmp;
* Now write the current system call's name * Now write the current system call's name
* in the service table. * in the service table.
*/ */
fprintf(out,"\t\t(PVOID (NTAPI *)(VOID))%s",name); fprintf(out,"\t\t{ (ULONG)%s }",name);
} }
} }
/* Close the service table (C syntax) */ /* Close the service table (C syntax) */
@ -194,7 +194,7 @@ char *stmp;
* Now write the current system call's ID * Now write the current system call's ID
* in the service table along with its Parameters Size. * in the service table along with its Parameters Size.
*/ */
fprintf(out,"\t\t%s",nr_args); fprintf(out,"\t\t{ %s }",nr_args);
} }
} }
/* /*
@ -368,3 +368,4 @@ int main(int argc, char* argv[])
return(ret); return(ret);
} }

View file

@ -1,4 +1,3 @@
#ifndef __NTOS_SERVICE_H #ifndef __NTOS_SERVICE_H
#define __NTOS_SERVICE_H #define __NTOS_SERVICE_H
@ -9,21 +8,28 @@
#ifndef __USE_W32API #ifndef __USE_W32API
#pragma pack(1)
/* System Service Dispatch Table */ /* System Service Dispatch Table */
typedef PVOID (NTAPI * SSDT)(VOID); typedef struct t_SSDT {
typedef SSDT * PSSDT; ULONG SysCallPtr;
} SSDT, *PSSDT;
/* System Service Parameters Table */ /* System Service Parameters Table */
typedef UCHAR SSPT, *PSSPT; typedef struct t_SSPT {
unsigned int ParamBytes;
} SSPT, *PSSPT;
typedef struct t_KeServiceDescriptorTableEntry { typedef struct t_KeServiceDescriptorTableEntry {
PSSDT SSDT; PSSDT SSDT;
PULONG ServiceCounterTable; PULONG ServiceCounterTable;
ULONG NumberOfServices; unsigned int NumberOfServices;
PSSPT SSPT; PSSPT SSPT;
} SSDT_ENTRY, *PSSDT_ENTRY; } SSDT_ENTRY, *PSSDT_ENTRY;
#pragma pack()
#endif /* __USE_W32API */ #endif /* __USE_W32API */
@ -75,3 +81,4 @@ KeAddSystemServiceTable (
#endif /* __NTOS_SERVICE_H */ #endif /* __NTOS_SERVICE_H */

View file

@ -7114,11 +7114,14 @@ KeAcquireSpinLock(
OUT PKIRQL OldIrql); OUT PKIRQL OldIrql);
/* System Service Dispatch Table */ /* System Service Dispatch Table */
typedef PVOID (NTAPI * SSDT)(VOID); typedef struct _SSDT {
typedef SSDT * PSSDT; ULONG SysCallPtr;
} SSDT, *PSSDT;
/* System Service Parameters Table */ /* System Service Parameters Table */
typedef UCHAR SSPT, * PSSPT; typedef struct _SSPT {
ULONG ParamBytes;
} SSPT, *PSSPT;
typedef struct _SSDT_ENTRY { typedef struct _SSDT_ENTRY {
PSSDT SSDT; PSSDT SSDT;
@ -9112,3 +9115,4 @@ extern NTOSAPI PBOOLEAN KdDebuggerEnabled;
#endif #endif
#endif /* __WINDDK_H */ #endif /* __WINDDK_H */