4 modified files
reactos/iface/addsys
diff -u -r1.7 -r1.8
--- genw32k.c 7 Apr 2004 00:14:05 -0000 1.7
+++ genw32k.c 7 Apr 2004 15:02:31 -0000 1.8
@@ -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
* PROJECT: ReactOS version of ntdll
@@ -88,7 +88,7 @@
* Now write the current system call's name
* in the service table.
*/
- fprintf(out,"\t\t(PVOID (NTAPI *)(VOID))%s",name);
+ fprintf(out,"\t\t{ (ULONG)%s }",name);
/* Next system call index */
sys_call_idx++;
@@ -143,7 +143,7 @@
* Now write the current system call's ID
* 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 */
sys_call_idx++;
@@ -346,3 +346,4 @@
return(ret);
}
+
reactos/iface/native
diff -u -r1.14 -r1.15
--- genntdll.c 7 Apr 2004 00:14:05 -0000 1.14
+++ genntdll.c 7 Apr 2004 15:02:31 -0000 1.15
@@ -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
* PROJECT: ReactOS version of ntdll
@@ -135,7 +135,7 @@
* Now write the current system call's name
* 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) */
@@ -194,7 +194,7 @@
* Now write the current system call's ID
* 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 @@
return(ret);
}
+
reactos/include/ntos
diff -u -r1.4 -r1.5
--- service.h 7 Apr 2004 00:14:05 -0000 1.4
+++ service.h 7 Apr 2004 15:02:31 -0000 1.5
@@ -1,4 +1,3 @@
-
#ifndef __NTOS_SERVICE_H
#define __NTOS_SERVICE_H
@@ -9,21 +8,28 @@
#ifndef __USE_W32API
+#pragma pack(1)
+
/* System Service Dispatch Table */
-typedef PVOID (NTAPI * SSDT)(VOID);
-typedef SSDT * PSSDT;
+typedef struct t_SSDT {
+ ULONG SysCallPtr;
+} SSDT, *PSSDT;
/* System Service Parameters Table */
-typedef UCHAR SSPT, *PSSPT;
+typedef struct t_SSPT {
+ unsigned int ParamBytes;
+} SSPT, *PSSPT;
typedef struct t_KeServiceDescriptorTableEntry {
PSSDT SSDT;
PULONG ServiceCounterTable;
- ULONG NumberOfServices;
+ unsigned int NumberOfServices;
PSSPT SSPT;
} SSDT_ENTRY, *PSSDT_ENTRY;
+#pragma pack()
+
#endif /* __USE_W32API */
@@ -75,3 +81,4 @@
#endif /* __NTOS_SERVICE_H */
+
reactos/w32api/include/ddk
diff -u -r1.4 -r1.5
--- winddk.h 7 Apr 2004 00:14:05 -0000 1.4
+++ winddk.h 7 Apr 2004 15:02:31 -0000 1.5
@@ -7114,11 +7114,14 @@
OUT PKIRQL OldIrql);
/* System Service Dispatch Table */
-typedef PVOID (NTAPI * SSDT)(VOID);
-typedef SSDT * PSSDT;
+typedef struct _SSDT {
+ ULONG SysCallPtr;
+} SSDT, *PSSDT;
/* System Service Parameters Table */
-typedef UCHAR SSPT, * PSSPT;
+typedef struct _SSPT {
+ ULONG ParamBytes;
+} SSPT, *PSSPT;
typedef struct _SSDT_ENTRY {
PSSDT SSDT;
@@ -9112,3 +9115,4 @@
#endif
#endif /* __WINDDK_H */
+
CVSspam 0.2.8