diff --git a/reactos/include/ddk/obtypes.h b/reactos/include/ddk/obtypes.h
index 1dd18ccda1c..42a43eb270f 100644
--- a/reactos/include/ddk/obtypes.h
+++ b/reactos/include/ddk/obtypes.h
@@ -1,6 +1,6 @@
 #ifndef _INCLUDE_DDK_OBTYPES_H
 #define _INCLUDE_DDK_OBTYPES_H
-/* $Id: obtypes.h,v 1.12 2001/05/05 09:30:28 ekohl Exp $ */
+/* $Id: obtypes.h,v 1.13 2001/08/26 17:23:39 ekohl Exp $ */
 struct _DIRECTORY_OBJECT;
 struct _OBJECT_ATTRIBUTES;
 
@@ -62,23 +62,24 @@ typedef struct _OBJECT_TYPE
    * PURPOSE: Dumps the object
    * NOTE: To be defined
    */
-  VOID (*Dump)(VOID);
+  VOID STDCALL (*Dump)(VOID);
   
   /*
    * PURPOSE: Opens the object
    * NOTE: To be defined
    */
-  VOID (*Open)(VOID);
+  VOID STDCALL (*Open)(VOID);
   
    /*
     * PURPOSE: Called to close an object if OkayToClose returns true
     */
-  VOID (*Close)(PVOID ObjectBody, ULONG HandleCount);
+  VOID STDCALL (*Close)(PVOID ObjectBody,
+			ULONG HandleCount);
   
   /*
    * PURPOSE: Called to delete an object when the last reference is removed
    */
-  VOID (*Delete)(PVOID ObjectBody);
+  VOID STDCALL (*Delete)(PVOID ObjectBody);
   
   /*
    * PURPOSE: Called when an open attempts to open a file apparently
@@ -88,33 +89,33 @@ typedef struct _OBJECT_TYPE
    *     STATUS_UNSUCCESSFUL  NextObject not found
    *     STATUS_REPARSE       Path changed, restart parsing the path
    */
-   NTSTATUS (*Parse)(PVOID ParsedObject,
-		     PVOID *NextObject,
-		     PUNICODE_STRING FullPath,
-		     PWSTR *Path,
-		     struct _OBJECT_TYPE* ObjectType,
-		     ULONG Attributes);
+   NTSTATUS STDCALL (*Parse)(PVOID ParsedObject,
+			     PVOID *NextObject,
+			     PUNICODE_STRING FullPath,
+			     PWSTR *Path,
+			     struct _OBJECT_TYPE* ObjectType,
+			     ULONG Attributes);
   
    /*
     */
-  NTSTATUS (*Security)(PVOID Object,
-		       ULONG InfoClass,
-		       PVOID Info,
-		       PULONG InfoLength);
+  NTSTATUS STDCALL (*Security)(PVOID Object,
+			       ULONG InfoClass,
+			       PVOID Info,
+			       PULONG InfoLength);
   
   /*
    */
-  VOID (*QueryName)(VOID);
+  VOID STDCALL (*QueryName)(VOID);
    
   /*
    * PURPOSE: Called when a process asks to close the object
    */
-  VOID (*OkayToClose)(VOID);
+  VOID STDCALL (*OkayToClose)(VOID);
   
-  NTSTATUS (*Create)(PVOID ObjectBody,
-		     PVOID Parent,
-		     PWSTR RemainingPath,
-		     struct _OBJECT_ATTRIBUTES* ObjectAttributes);
+  NTSTATUS STDCALL (*Create)(PVOID ObjectBody,
+			     PVOID Parent,
+			     PWSTR RemainingPath,
+			     struct _OBJECT_ATTRIBUTES* ObjectAttributes);
 } OBJECT_TYPE, *POBJECT_TYPE;
 
 
diff --git a/reactos/include/ddk/pnptypes.h b/reactos/include/ddk/pnptypes.h
index 4c7a71b2bca..61529f4b104 100644
--- a/reactos/include/ddk/pnptypes.h
+++ b/reactos/include/ddk/pnptypes.h
@@ -148,15 +148,13 @@ typedef enum _IO_NOTIFICATION_EVENT_CATEGORY {
 } IO_NOTIFICATION_EVENT_CATEGORY;
 
 // CallbackRoutine for IoRegisterPlugPlayNotification
-typedef
-NTSTATUS
+typedef NTSTATUS STDCALL
 (*PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(
   IN PVOID NotificationStructure,
   IN PVOID Context);
 
 // Callback for IoReportTargetDeviceChangeAsynchronous
-typedef
-VOID
+typedef VOID STDCALL
 (*PDEVICE_CHANGE_COMPLETE_CALLBACK)(
   IN PVOID Context);
 
diff --git a/reactos/include/ddk/potypes.h b/reactos/include/ddk/potypes.h
index f7ab8fd73bc..ee720e7718c 100644
--- a/reactos/include/ddk/potypes.h
+++ b/reactos/include/ddk/potypes.h
@@ -59,8 +59,7 @@ typedef enum _POWER_STATE_TYPE {
 } POWER_STATE_TYPE, *PPOWER_STATE_TYPE;
 
 // CompletionFunction for PoRequestPowerIrp
-typedef
-VOID
+typedef VOID STDCALL
 (*PREQUEST_POWER_COMPLETE) (
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN UCHAR MinorFunction,
@@ -75,8 +74,8 @@ typedef struct _POWER_SEQUENCE {
   ULONG SequenceD3;
 } POWER_SEQUENCE, *PPOWER_SEQUENCE;
 
-typedef VOID (*PINTERFACE_REFERENCE)(PVOID Context);
-typedef VOID (*PINTERFACE_DEREFERENCE)(PVOID Context);
+typedef VOID STDCALL (*PINTERFACE_REFERENCE)(PVOID Context);
+typedef VOID STDCALL (*PINTERFACE_DEREFERENCE)(PVOID Context);
 
 typedef struct _INTERFACE {
   USHORT Size;
diff --git a/reactos/include/ddk/pstypes.h b/reactos/include/ddk/pstypes.h
index 7e6593b6116..695f00eb7c8 100644
--- a/reactos/include/ddk/pstypes.h
+++ b/reactos/include/ddk/pstypes.h
@@ -18,7 +18,7 @@ struct _KPROCESS;
 struct _ETHREAD;
 struct _KTHREAD;
 
-typedef NTSTATUS (*PKSTART_ROUTINE)(PVOID StartContext);
+typedef NTSTATUS STDCALL (*PKSTART_ROUTINE)(PVOID StartContext);
 
 typedef struct _STACK_INFORMATION
 {
diff --git a/reactos/include/ntdll/ldr.h b/reactos/include/ntdll/ldr.h
index d2ad9d81819..326b0534437 100644
--- a/reactos/include/ntdll/ldr.h
+++ b/reactos/include/ntdll/ldr.h
@@ -1,7 +1,7 @@
 #include <ntos/kdbgsyms.h>
 #include "../ntoskrnl/include/internal/config.h"
 
-typedef NTSTATUS (*PEPFUNC)(PPEB);
+typedef NTSTATUS STDCALL (*PEPFUNC)(PPEB);
 
 typedef struct _LDR_MODULE
 {
diff --git a/reactos/include/ntos/types.h b/reactos/include/ntos/types.h
index dc651466f29..a13e88eddbb 100644
--- a/reactos/include/ntos/types.h
+++ b/reactos/include/ntos/types.h
@@ -421,8 +421,7 @@ typedef struct _SMALL_RECT {
 } SMALL_RECT, *PSMALL_RECT;
 
 
-typedef
-VOID
+typedef VOID STDCALL
 (*PTIMERAPCROUTINE)(
 	LPVOID lpArgToCompletionRoutine,
 	DWORD dwTimerLowValue,
diff --git a/reactos/ntoskrnl/cm/cm.h b/reactos/ntoskrnl/cm/cm.h
index bc19c680774..905e61d95bb 100644
--- a/reactos/ntoskrnl/cm/cm.h
+++ b/reactos/ntoskrnl/cm/cm.h
@@ -157,18 +157,22 @@ typedef struct _KEY_OBJECT
 } KEY_OBJECT, *PKEY_OBJECT;
 
 
-NTSTATUS CmiObjectParse(PVOID ParsedObject,
-		     PVOID *NextObject,
-		     PUNICODE_STRING FullPath,
-		     PWSTR *Path,
-		     POBJECT_TYPE ObjectType,
-		     ULONG Attribute);
-		     
-NTSTATUS CmiObjectCreate(PVOID ObjectBody,
-		      PVOID Parent,
-		      PWSTR RemainingPath,
-		      struct _OBJECT_ATTRIBUTES* ObjectAttributes);
-void  CmiObjectDelete(PVOID  DeletedObject);
+NTSTATUS STDCALL
+CmiObjectParse(PVOID ParsedObject,
+	       PVOID *NextObject,
+	       PUNICODE_STRING FullPath,
+	       PWSTR *Path,
+	       POBJECT_TYPE ObjectType,
+	       ULONG Attribute);
+
+NTSTATUS STDCALL
+CmiObjectCreate(PVOID ObjectBody,
+		PVOID Parent,
+		PWSTR RemainingPath,
+		struct _OBJECT_ATTRIBUTES* ObjectAttributes);
+
+VOID STDCALL
+CmiObjectDelete(PVOID  DeletedObject);
 
 VOID  CmiAddKeyToList(PKEY_OBJECT ParentKey,PKEY_OBJECT  NewKey);
 NTSTATUS  CmiRemoveKeyFromList(PKEY_OBJECT  NewKey);
diff --git a/reactos/ntoskrnl/cm/regobj.c b/reactos/ntoskrnl/cm/regobj.c
index 66b85b229fd..b72bc640fb6 100644
--- a/reactos/ntoskrnl/cm/regobj.c
+++ b/reactos/ntoskrnl/cm/regobj.c
@@ -11,12 +11,13 @@
 extern POBJECT_TYPE  CmiKeyType;
 extern KSPIN_LOCK  CmiKeyListLock;
 
-NTSTATUS CmiObjectParse(PVOID ParsedObject,
-		     PVOID *NextObject,
-		     PUNICODE_STRING FullPath,
-		     PWSTR *Path,
-		     POBJECT_TYPE ObjectType,
-		     ULONG Attributes)
+NTSTATUS STDCALL
+CmiObjectParse(PVOID ParsedObject,
+	       PVOID *NextObject,
+	       PUNICODE_STRING FullPath,
+	       PWSTR *Path,
+	       POBJECT_TYPE ObjectType,
+	       ULONG Attributes)
 {
  CHAR cPath[MAX_PATH];
  PWSTR end;
@@ -106,10 +107,11 @@ DPRINT("CmiObjectParse %s\n",FoundObject->Name);
    return STATUS_SUCCESS;
 }
 
-NTSTATUS CmiObjectCreate(PVOID ObjectBody,
-		      PVOID Parent,
-		      PWSTR RemainingPath,
-		      struct _OBJECT_ATTRIBUTES* ObjectAttributes)
+NTSTATUS STDCALL
+CmiObjectCreate(PVOID ObjectBody,
+		PVOID Parent,
+		PWSTR RemainingPath,
+		struct _OBJECT_ATTRIBUTES* ObjectAttributes)
 {
  PKEY_OBJECT pKey=ObjectBody;
    pKey->ParentKey = Parent;
@@ -132,8 +134,8 @@ NTSTATUS CmiObjectCreate(PVOID ObjectBody,
    return STATUS_SUCCESS;
 }
 
-void  
-CmiObjectDelete(PVOID  DeletedObject)
+VOID STDCALL
+CmiObjectDelete(PVOID DeletedObject)
 {
   PKEY_OBJECT  KeyObject;
 
diff --git a/reactos/ntoskrnl/ex/win32k.c b/reactos/ntoskrnl/ex/win32k.c
index 09468eb907e..30e3a902138 100644
--- a/reactos/ntoskrnl/ex/win32k.c
+++ b/reactos/ntoskrnl/ex/win32k.c
@@ -52,12 +52,11 @@ static GENERIC_MAPPING ExpDesktopMapping = {
 /* FUNCTIONS ****************************************************************/
 
 
-NTSTATUS
-ExpWinStaObjectCreate(
-  PVOID ObjectBody,
-	PVOID Parent,
-	PWSTR RemainingPath,
-	struct _OBJECT_ATTRIBUTES* ObjectAttributes)
+NTSTATUS STDCALL
+ExpWinStaObjectCreate(PVOID ObjectBody,
+		      PVOID Parent,
+		      PWSTR RemainingPath,
+		      struct _OBJECT_ATTRIBUTES* ObjectAttributes)
 {
   PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)ObjectBody;
   UNICODE_STRING UnicodeString;
@@ -121,9 +120,8 @@ ExpWinStaObjectCreate(
   return STATUS_SUCCESS;
 }
 
-VOID
-ExpWinStaObjectDelete(
-  PVOID DeletedObject)
+VOID STDCALL
+ExpWinStaObjectDelete(PVOID DeletedObject)
 {
   PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)DeletedObject;
 
@@ -135,10 +133,9 @@ ExpWinStaObjectDelete(
 }
 
 PVOID
-ExpWinStaObjectFind(
-  PWINSTATION_OBJECT WinStaObject,
-	PWSTR Name,
-  ULONG Attributes)
+ExpWinStaObjectFind(PWINSTATION_OBJECT WinStaObject,
+		    PWSTR Name,
+		    ULONG Attributes)
 {
   PLIST_ENTRY Current;
   PDESKTOP_OBJECT CurrentObject;
@@ -179,14 +176,13 @@ ExpWinStaObjectFind(
   return NULL;
 }
 
-NTSTATUS
-ExpWinStaObjectParse(
-  PVOID Object,
-	PVOID *NextObject,
-	PUNICODE_STRING FullPath,
-	PWSTR *Path,
-	POBJECT_TYPE ObjectType,
-	ULONG Attributes)
+NTSTATUS STDCALL
+ExpWinStaObjectParse(PVOID Object,
+		     PVOID *NextObject,
+		     PUNICODE_STRING FullPath,
+		     PWSTR *Path,
+		     POBJECT_TYPE ObjectType,
+		     ULONG Attributes)
 {
   PVOID FoundObject;
   NTSTATUS Status;
@@ -226,12 +222,11 @@ ExpWinStaObjectParse(
   return Status;
 }
 
-NTSTATUS
-ExpDesktopObjectCreate(
-  PVOID ObjectBody,
-	PVOID Parent,
-	PWSTR RemainingPath,
-	struct _OBJECT_ATTRIBUTES* ObjectAttributes)
+NTSTATUS STDCALL
+ExpDesktopObjectCreate(PVOID ObjectBody,
+		       PVOID Parent,
+		       PWSTR RemainingPath,
+		       struct _OBJECT_ATTRIBUTES* ObjectAttributes)
 {
   PDESKTOP_OBJECT Desktop = (PDESKTOP_OBJECT)ObjectBody;
   UNICODE_STRING UnicodeString;
@@ -263,9 +258,8 @@ ExpDesktopObjectCreate(
   return RtlCreateUnicodeString(&Desktop->Name, UnicodeString.Buffer);
 }
 
-VOID
-ExpDesktopObjectDelete(
-  PVOID DeletedObject)
+VOID STDCALL
+ExpDesktopObjectDelete(PVOID DeletedObject)
 {
   PDESKTOP_OBJECT Desktop = (PDESKTOP_OBJECT)DeletedObject;
   KIRQL OldIrql;
diff --git a/reactos/ntoskrnl/ex/work.c b/reactos/ntoskrnl/ex/work.c
index f13b8dee0a5..65b5ae4f58c 100644
--- a/reactos/ntoskrnl/ex/work.c
+++ b/reactos/ntoskrnl/ex/work.c
@@ -1,4 +1,4 @@
-/* $Id: work.c,v 1.10 2001/06/04 11:26:11 chorns Exp $
+/* $Id: work.c,v 1.11 2001/08/26 17:26:23 ekohl Exp $
  *
  * COPYRIGHT:          See COPYING in the top level directory
  * PROJECT:            ReactOS kernel
@@ -60,7 +60,8 @@ WORK_QUEUE EiHyperCriticalWorkQueue;
 
 /* FUNCTIONS ****************************************************************/
 
-static NTSTATUS ExWorkerThreadEntryPoint(PVOID context)
+static NTSTATUS STDCALL
+ExWorkerThreadEntryPoint(PVOID context)
 /*
  * FUNCTION: Entry point for a worker thread
  * ARGUMENTS:
diff --git a/reactos/ntoskrnl/include/internal/io.h b/reactos/ntoskrnl/include/internal/io.h
index d54e9c1b51e..86f47cfd541 100644
--- a/reactos/ntoskrnl/include/internal/io.h
+++ b/reactos/ntoskrnl/include/internal/io.h
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: io.h,v 1.11 2001/08/22 03:53:52 rex Exp $
+/* $Id: io.h,v 1.12 2001/08/26 17:25:29 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -133,14 +133,16 @@ PIRP IoBuildFilesystemControlRequest(ULONG MinorFunction,
 				     PDEVICE_OBJECT DeviceToMount);
 VOID IoSecondStageCompletion(PIRP Irp, CCHAR PriorityBoost);
 
-NTSTATUS IopCreateFile (PVOID ObjectBody,
-			PVOID Parent,
-			PWSTR RemainingPath,
-			POBJECT_ATTRIBUTES ObjectAttributes);
-NTSTATUS IopCreateDevice(PVOID ObjectBody,
-			 PVOID Parent,
-			 PWSTR RemainingPath,
-			 POBJECT_ATTRIBUTES ObjectAttributes);
+NTSTATUS STDCALL
+IopCreateFile(PVOID ObjectBody,
+	      PVOID Parent,
+	      PWSTR RemainingPath,
+	      POBJECT_ATTRIBUTES ObjectAttributes);
+NTSTATUS STDCALL
+IopCreateDevice(PVOID ObjectBody,
+		PVOID Parent,
+		PWSTR RemainingPath,
+		POBJECT_ATTRIBUTES ObjectAttributes);
 NTSTATUS IoAttachVpb(PDEVICE_OBJECT DeviceObject);
 
 PIRP IoBuildSynchronousFsdRequestWithMdl(ULONG MajorFunction,
diff --git a/reactos/ntoskrnl/include/internal/port.h b/reactos/ntoskrnl/include/internal/port.h
index e28851c82a5..e71722887c7 100644
--- a/reactos/ntoskrnl/include/internal/port.h
+++ b/reactos/ntoskrnl/include/internal/port.h
@@ -60,12 +60,12 @@ typedef struct _QUEUEDMESSAGE
 
 /* Code in ntoskrnl/lpc/close.h */
 
-VOID
+VOID STDCALL
 NiClosePort (
 	PVOID	ObjectBody,
 	ULONG	HandleCount
 	);
-VOID
+VOID STDCALL
 NiDeletePort (
 	IN	PVOID	ObjectBody
 	);
@@ -98,7 +98,7 @@ EiDequeueMessagePort (
 
 /* Code in ntoskrnl/lpc/create.c */
 
-NTSTATUS
+NTSTATUS STDCALL
 NiCreatePort (
 	PVOID			ObjectBody,
 	PVOID			Parent,
diff --git a/reactos/ntoskrnl/include/internal/ps.h b/reactos/ntoskrnl/include/internal/ps.h
index f77d9ff71e6..52a2a9d9ef1 100644
--- a/reactos/ntoskrnl/include/internal/ps.h
+++ b/reactos/ntoskrnl/include/internal/ps.h
@@ -499,8 +499,8 @@ ULONG PsUnfreezeThread(PETHREAD Thread, PNTSTATUS WaitStatus);
 ULONG PsFreezeThread(PETHREAD Thread, PNTSTATUS WaitStatus,
 		     UCHAR Alertable, ULONG WaitMode);
 VOID PiInitApcManagement(VOID);
-VOID PiDeleteThread(PVOID ObjectBody);
-VOID PiCloseThread(PVOID ObjectBody, ULONG HandleCount);
+VOID STDCALL PiDeleteThread(PVOID ObjectBody);
+VOID STDCALL PiCloseThread(PVOID ObjectBody, ULONG HandleCount);
 VOID PsReapThreads(VOID);
 NTSTATUS 
 PsInitializeThread(HANDLE ProcessHandle,
@@ -554,7 +554,7 @@ VOID HalTaskSwitch(PKTHREAD thread);
 NTSTATUS 
 Ke386InitThreadWithContext(PKTHREAD Thread, PCONTEXT Context);
 NTSTATUS HalReleaseTask(PETHREAD Thread);
-VOID PiDeleteProcess(PVOID ObjectBody);
+VOID STDCALL PiDeleteProcess(PVOID ObjectBody);
 VOID PsReapThreads(VOID);
 VOID PsUnfreezeOtherThread(PETHREAD Thread);
 VOID PsFreezeOtherThread(PETHREAD Thread);
@@ -572,7 +572,7 @@ VOID
 PsApplicationProcessorInit(VOID);
 VOID
 PsPrepareForApplicationProcessorInit(ULONG Id);
-NTSTATUS
+NTSTATUS STDCALL
 PsIdleThreadMain(PVOID Context);
 
 #endif /* ASSEMBLER */
diff --git a/reactos/ntoskrnl/io/create.c b/reactos/ntoskrnl/io/create.c
index b647b3fbfb5..ee8f1db756c 100644
--- a/reactos/ntoskrnl/io/create.c
+++ b/reactos/ntoskrnl/io/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.46 2001/07/04 20:40:21 chorns Exp $
+/* $Id: create.c,v 1.47 2001/08/26 17:27:00 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -61,11 +61,11 @@ NtDeleteFile(IN POBJECT_ATTRIBUTES ObjectAttributes)
  * REVISIONS
  * 
  */
-NTSTATUS
-IopCreateFile (PVOID			ObjectBody,
-	       PVOID			Parent,
-	       PWSTR			RemainingPath,
-	       POBJECT_ATTRIBUTES	ObjectAttributes)
+NTSTATUS STDCALL
+IopCreateFile(PVOID			ObjectBody,
+	      PVOID			Parent,
+	      PWSTR			RemainingPath,
+	      POBJECT_ATTRIBUTES	ObjectAttributes)
 {
    PDEVICE_OBJECT	DeviceObject = (PDEVICE_OBJECT) Parent;
    PFILE_OBJECT	FileObject = (PFILE_OBJECT) ObjectBody;
diff --git a/reactos/ntoskrnl/io/device.c b/reactos/ntoskrnl/io/device.c
index 2f3ec033116..488d10c74ee 100644
--- a/reactos/ntoskrnl/io/device.c
+++ b/reactos/ntoskrnl/io/device.c
@@ -1,4 +1,4 @@
-/* $Id: device.c,v 1.30 2001/08/22 03:53:52 rex Exp $
+/* $Id: device.c,v 1.31 2001/08/26 17:27:00 ekohl Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -496,7 +496,7 @@ IoAttachDevice(PDEVICE_OBJECT SourceDevice,
    UNIMPLEMENTED;
 }
 
-NTSTATUS 
+NTSTATUS STDCALL
 IopCreateDevice(PVOID ObjectBody,
 		PVOID Parent,
 		PWSTR RemainingPath,
diff --git a/reactos/ntoskrnl/io/iomgr.c b/reactos/ntoskrnl/io/iomgr.c
index e1f7cda8d04..32a618cc00e 100644
--- a/reactos/ntoskrnl/io/iomgr.c
+++ b/reactos/ntoskrnl/io/iomgr.c
@@ -1,4 +1,4 @@
-/* $Id: iomgr.c,v 1.19 2001/05/01 23:08:19 chorns Exp $
+/* $Id: iomgr.c,v 1.20 2001/08/26 17:27:00 ekohl Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -43,7 +43,9 @@ static GENERIC_MAPPING IopFileMapping = {FILE_GENERIC_READ,
 
 /* FUNCTIONS ****************************************************************/
 
-VOID IopCloseFile(PVOID ObjectBody, ULONG HandleCount)
+VOID STDCALL
+IopCloseFile(PVOID ObjectBody,
+	     ULONG HandleCount)
 {
    PFILE_OBJECT FileObject = (PFILE_OBJECT)ObjectBody;
    PIRP Irp;
@@ -75,7 +77,8 @@ VOID IopCloseFile(PVOID ObjectBody, ULONG HandleCount)
    Status = IoCallDriver(FileObject->DeviceObject, Irp);
 }
 
-VOID IopDeleteFile(PVOID ObjectBody)
+VOID STDCALL
+IopDeleteFile(PVOID ObjectBody)
 {
    PFILE_OBJECT FileObject = (PFILE_OBJECT)ObjectBody;
    PIRP Irp;
diff --git a/reactos/ntoskrnl/io/symlink.c b/reactos/ntoskrnl/io/symlink.c
index e2a5b14f872..ec6b37c213c 100644
--- a/reactos/ntoskrnl/io/symlink.c
+++ b/reactos/ntoskrnl/io/symlink.c
@@ -1,4 +1,4 @@
-/* $Id: symlink.c,v 1.21 2001/06/16 14:07:30 ekohl Exp $
+/* $Id: symlink.c,v 1.22 2001/08/26 17:27:00 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -56,7 +56,7 @@ static GENERIC_MAPPING IopSymbolicLinkMapping = {
  *
  * REVISIONS
  */
-NTSTATUS
+NTSTATUS STDCALL
 IopCreateSymbolicLink(PVOID Object,
 		      PVOID Parent,
 		      PWSTR RemainingPath,
@@ -85,7 +85,7 @@ IopCreateSymbolicLink(PVOID Object,
  *
  * REVISIONS
  */
-NTSTATUS
+NTSTATUS STDCALL
 IopParseSymbolicLink(PVOID Object,
 		     PVOID * NextObject,
 		     PUNICODE_STRING FullPath,
diff --git a/reactos/ntoskrnl/ldr/loader.c b/reactos/ntoskrnl/ldr/loader.c
index bdd9f1c989d..b2ce0ca5618 100644
--- a/reactos/ntoskrnl/ldr/loader.c
+++ b/reactos/ntoskrnl/ldr/loader.c
@@ -1,4 +1,4 @@
-/* $Id: loader.c,v 1.86 2001/08/22 03:53:52 rex Exp $
+/* $Id: loader.c,v 1.87 2001/08/26 17:27:44 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -71,10 +71,11 @@ NTSTATUS LdrProcessModule(PVOID ModuleLoadBase,
                           PMODULE_OBJECT *ModuleObject);
 PVOID  LdrGetExportAddress(PMODULE_OBJECT ModuleObject, char *Name, unsigned short Hint);
 static PMODULE_OBJECT LdrOpenModule(PUNICODE_STRING  Filename);
-static NTSTATUS LdrCreateModule(PVOID ObjectBody,
-                                PVOID Parent,
-                                PWSTR RemainingPath,
-                                POBJECT_ATTRIBUTES ObjectAttributes);
+static NTSTATUS STDCALL
+LdrCreateModule(PVOID ObjectBody,
+                PVOID Parent,
+                PWSTR RemainingPath,
+                POBJECT_ATTRIBUTES ObjectAttributes);
 static VOID LdrpBuildModuleBaseName(PUNICODE_STRING BaseName,
 				    PUNICODE_STRING FullName);
 
@@ -953,7 +954,7 @@ VOID LdrLoadAutoConfigDrivers (VOID)
 }
 
 
-static NTSTATUS 
+static NTSTATUS STDCALL
 LdrCreateModule(PVOID ObjectBody,
                 PVOID Parent,
                 PWSTR RemainingPath,
diff --git a/reactos/ntoskrnl/lpc/close.c b/reactos/ntoskrnl/lpc/close.c
index f26ecdedf5c..0a69bacaf89 100644
--- a/reactos/ntoskrnl/lpc/close.c
+++ b/reactos/ntoskrnl/lpc/close.c
@@ -1,4 +1,4 @@
-/* $Id: close.c,v 1.5 2001/06/23 19:13:33 phreak Exp $
+/* $Id: close.c,v 1.6 2001/08/26 17:28:00 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -32,7 +32,7 @@
  * REVISIONS
  *
  */
-VOID
+VOID STDCALL
 NiClosePort (PVOID	ObjectBody, ULONG	HandleCount)
 {
   PEPORT Port = (PEPORT)ObjectBody;
@@ -86,7 +86,7 @@ NiClosePort (PVOID	ObjectBody, ULONG	HandleCount)
  * REVISIONS
  *
  */
-VOID
+VOID STDCALL
 NiDeletePort (PVOID	ObjectBody)
 {
    //   PEPORT Port = (PEPORT)ObjectBody;
diff --git a/reactos/ntoskrnl/lpc/create.c b/reactos/ntoskrnl/lpc/create.c
index 182de629dad..3cb242e3141 100644
--- a/reactos/ntoskrnl/lpc/create.c
+++ b/reactos/ntoskrnl/lpc/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.4 2001/06/16 14:08:57 ekohl Exp $
+/* $Id: create.c,v 1.5 2001/08/26 17:28:00 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -59,7 +59,7 @@ NTSTATUS STDCALL VerifyCreateParameters (
 }
 
 
-NTSTATUS
+NTSTATUS STDCALL
 NiCreatePort (
 	PVOID			ObjectBody,
 	PVOID			Parent,
diff --git a/reactos/ntoskrnl/mm/mpw.c b/reactos/ntoskrnl/mm/mpw.c
index 611220d4e4d..4cee77331a2 100644
--- a/reactos/ntoskrnl/mm/mpw.c
+++ b/reactos/ntoskrnl/mm/mpw.c
@@ -1,4 +1,4 @@
-/* $Id: mpw.c,v 1.5 2001/03/16 18:11:23 dwelch Exp $
+/* $Id: mpw.c,v 1.6 2001/08/26 17:29:09 ekohl Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -88,7 +88,8 @@ VOID MmWritePagesInProcess(PEPROCESS Process)
    MmUnlockAddressSpace(&Process->AddressSpace);
 }
 
-NTSTATUS MmMpwThreadMain(PVOID Ignored)
+NTSTATUS STDCALL
+MmMpwThreadMain(PVOID Ignored)
 {
    NTSTATUS Status;
       
diff --git a/reactos/ntoskrnl/mm/pager.c b/reactos/ntoskrnl/mm/pager.c
index b40bda3e8b2..1d543419422 100644
--- a/reactos/ntoskrnl/mm/pager.c
+++ b/reactos/ntoskrnl/mm/pager.c
@@ -1,4 +1,4 @@
-/* $Id: pager.c,v 1.7 2001/03/16 18:11:23 dwelch Exp $
+/* $Id: pager.c,v 1.8 2001/08/26 17:29:09 ekohl Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -62,7 +62,8 @@ static VOID MmTryPageOutFromProcess(PEPROCESS Process)
    MmUnlockAddressSpace(&Process->AddressSpace);
 }
 
-static NTSTATUS MmPagerThreadMain(PVOID Ignored)
+static NTSTATUS STDCALL
+MmPagerThreadMain(PVOID Ignored)
 {
    NTSTATUS Status;
       
diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index 83a742ce062..4780d0bd085 100644
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: section.c,v 1.59 2001/08/03 09:36:18 ei Exp $
+/* $Id: section.c,v 1.60 2001/08/26 17:29:09 ekohl Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/mm/section.c
@@ -817,7 +817,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
    return(0);
 }
 
-VOID 
+VOID STDCALL
 MmpDeleteSection(PVOID ObjectBody)
 {
   PSECTION_OBJECT Section = (PSECTION_OBJECT)ObjectBody;
@@ -843,7 +843,7 @@ MmpDeleteSection(PVOID ObjectBody)
     }
 }
 
-VOID 
+VOID STDCALL
 MmpCloseSection(PVOID ObjectBody,
 		ULONG HandleCount)
 {
@@ -852,10 +852,11 @@ MmpCloseSection(PVOID ObjectBody,
    
 }
 
-NTSTATUS MmpCreateSection(PVOID ObjectBody,
-			  PVOID Parent,
-			  PWSTR RemainingPath,
-			  POBJECT_ATTRIBUTES ObjectAttributes)
+NTSTATUS STDCALL
+MmpCreateSection(PVOID ObjectBody,
+		 PVOID Parent,
+		 PWSTR RemainingPath,
+		 POBJECT_ATTRIBUTES ObjectAttributes)
 {
    NTSTATUS Status;
    
diff --git a/reactos/ntoskrnl/nt/evtpair.c b/reactos/ntoskrnl/nt/evtpair.c
index 57e9c9c9702..775839de431 100644
--- a/reactos/ntoskrnl/nt/evtpair.c
+++ b/reactos/ntoskrnl/nt/evtpair.c
@@ -1,4 +1,4 @@
-/* $Id: evtpair.c,v 1.8 2001/06/16 14:10:08 ekohl Exp $
+/* $Id: evtpair.c,v 1.9 2001/08/26 17:29:36 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -32,10 +32,11 @@ static GENERIC_MAPPING ExEventPairMapping = {
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS NtpCreateEventPair(PVOID ObjectBody,
-			    PVOID Parent,
-			    PWSTR RemainingPath,
-			    POBJECT_ATTRIBUTES ObjectAttributes)
+NTSTATUS STDCALL
+NtpCreateEventPair(PVOID ObjectBody,
+		   PVOID Parent,
+		   PWSTR RemainingPath,
+		   POBJECT_ATTRIBUTES ObjectAttributes)
 {
    DPRINT("NtpCreateEventPair(ObjectBody %x, Parent %x, RemainingPath %S)\n",
 	  ObjectBody, Parent, RemainingPath);
diff --git a/reactos/ntoskrnl/nt/ntevent.c b/reactos/ntoskrnl/nt/ntevent.c
index 5aa52ed1448..b045b0cdd23 100644
--- a/reactos/ntoskrnl/nt/ntevent.c
+++ b/reactos/ntoskrnl/nt/ntevent.c
@@ -51,7 +51,7 @@ static GENERIC_MAPPING ExpEventMapping = {
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS
+NTSTATUS STDCALL
 NtpCreateEvent(PVOID ObjectBody,
 	       PVOID Parent,
 	       PWSTR RemainingPath,
diff --git a/reactos/ntoskrnl/nt/ntsem.c b/reactos/ntoskrnl/nt/ntsem.c
index f9b6010c0d6..58ee48ad0a3 100644
--- a/reactos/ntoskrnl/nt/ntsem.c
+++ b/reactos/ntoskrnl/nt/ntsem.c
@@ -1,4 +1,4 @@
-/* $Id: ntsem.c,v 1.12 2001/06/16 14:10:08 ekohl Exp $
+/* $Id: ntsem.c,v 1.13 2001/08/26 17:29:36 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -33,10 +33,11 @@ static GENERIC_MAPPING ExSemaphoreMapping = {
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS NtpCreateSemaphore(PVOID ObjectBody,
-			    PVOID Parent,
-			    PWSTR RemainingPath,
-			    POBJECT_ATTRIBUTES ObjectAttributes)
+NTSTATUS STDCALL
+NtpCreateSemaphore(PVOID ObjectBody,
+		   PVOID Parent,
+		   PWSTR RemainingPath,
+		   POBJECT_ATTRIBUTES ObjectAttributes)
 {
    
    DPRINT("NtpCreateSemaphore(ObjectBody %x, Parent %x, RemainingPath %S)\n",
diff --git a/reactos/ntoskrnl/nt/nttimer.c b/reactos/ntoskrnl/nt/nttimer.c
index 8f3a434b2df..be4e902ce75 100644
--- a/reactos/ntoskrnl/nt/nttimer.c
+++ b/reactos/ntoskrnl/nt/nttimer.c
@@ -1,4 +1,4 @@
-/* $Id: nttimer.c,v 1.10 2001/06/16 14:10:08 ekohl Exp $
+/* $Id: nttimer.c,v 1.11 2001/08/26 17:29:36 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -45,7 +45,7 @@ static GENERIC_MAPPING ExpTimerMapping = {
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS
+NTSTATUS STDCALL
 NtpCreateTimer(PVOID ObjectBody,
 	       PVOID Parent,
 	       PWSTR RemainingPath,
diff --git a/reactos/ntoskrnl/nt/profile.c b/reactos/ntoskrnl/nt/profile.c
index 03e28c16c2d..258f45efb1b 100644
--- a/reactos/ntoskrnl/nt/profile.c
+++ b/reactos/ntoskrnl/nt/profile.c
@@ -300,7 +300,7 @@ VOID KiRemoveProfile(PKPROFILE Profile)
   KeReleaseSpinLock(&ProfileListLock, oldIrql);
 }
 
-VOID
+VOID STDCALL
 KiDeleteProfile(PVOID ObjectBody)
 {
   PKPROFILE Profile;
diff --git a/reactos/ntoskrnl/ob/namespc.c b/reactos/ntoskrnl/ob/namespc.c
index 1ae8d4294e8..2761abde617 100644
--- a/reactos/ntoskrnl/ob/namespc.c
+++ b/reactos/ntoskrnl/ob/namespc.c
@@ -1,4 +1,4 @@
-/* $Id: namespc.c,v 1.25 2001/06/16 14:10:55 ekohl Exp $
+/* $Id: namespc.c,v 1.26 2001/08/26 17:29:57 ekohl Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -220,7 +220,7 @@ ObpFindEntryDirectory(PDIRECTORY_OBJECT DirectoryObject,
    return(NULL);
 }
 
-NTSTATUS
+NTSTATUS STDCALL
 ObpParseDirectory(PVOID Object,
 		  PVOID * NextObject,
 		  PUNICODE_STRING FullPath,
@@ -278,7 +278,7 @@ ObpParseDirectory(PVOID Object,
    return STATUS_SUCCESS;
 }
 
-NTSTATUS
+NTSTATUS STDCALL
 ObpCreateDirectory(PVOID ObjectBody,
 		   PVOID Parent,
 		   PWSTR RemainingPath,
diff --git a/reactos/ntoskrnl/ps/create.c b/reactos/ntoskrnl/ps/create.c
index d6a30b3181d..9227f88a109 100644
--- a/reactos/ntoskrnl/ps/create.c
+++ b/reactos/ntoskrnl/ps/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.38 2001/08/07 15:44:40 ekohl Exp $
+/* $Id: create.c,v 1.39 2001/08/26 17:30:21 ekohl Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -292,7 +292,7 @@ PsBeginThread(PKSTART_ROUTINE StartRoutine, PVOID StartContext)
 }
 #endif
 
-VOID
+VOID STDCALL
 PiDeleteThread(PVOID ObjectBody)
 {
    KIRQL oldIrql;
@@ -311,7 +311,7 @@ PiDeleteThread(PVOID ObjectBody)
    DPRINT("PiDeleteThread() finished\n");
 }
 
-VOID
+VOID STDCALL
 PiCloseThread(PVOID ObjectBody,
 	      ULONG HandleCount)
 {
diff --git a/reactos/ntoskrnl/ps/idle.c b/reactos/ntoskrnl/ps/idle.c
index ac9cfbac64a..8bd0eecb87f 100644
--- a/reactos/ntoskrnl/ps/idle.c
+++ b/reactos/ntoskrnl/ps/idle.c
@@ -25,7 +25,7 @@ PETHREAD PiIdleThread;
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS 
+NTSTATUS STDCALL
 PsIdleThreadMain(PVOID Context)
 {
    KIRQL oldlvl;
diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c
index 859dbcbe633..e296fbc4a28 100644
--- a/reactos/ntoskrnl/ps/process.c
+++ b/reactos/ntoskrnl/ps/process.c
@@ -1,4 +1,4 @@
-/* $Id: process.c,v 1.66 2001/08/07 14:01:42 ekohl Exp $
+/* $Id: process.c,v 1.67 2001/08/26 17:30:21 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -256,7 +256,7 @@ PsInitProcessManagment(VOID)
 }
 
 
-VOID
+VOID STDCALL
 PiDeleteProcess(PVOID ObjectBody)
 {
    KIRQL oldIrql;