Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 09:50:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

First fixes to support fastcall:

Browse source 
- moved FILETIME
- removed inclusion of <windows.h> from ntoskrnl
- fixed typos

svn path=/trunk/; revision=1990
This commit is contained in:
Eric Kohl 2001-06-20 13:00:53 +00:00
parent c79b121347
commit 93eeaf2b3e
7 changed files with 48 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/include/ntos/types.h
View file

@ -155,6 +155,12 @@ typedef union _ULARGE_INTEGER
ULONGLONG QuadPart; ULONGLONG QuadPart;
} ULARGE_INTEGER, *PULARGE_INTEGER; } ULARGE_INTEGER, *PULARGE_INTEGER;
typedef struct _FILETIME
{
DWORD dwLowDateTime;
DWORD dwHighDateTime;
} FILETIME, *LPFILETIME, *PFILETIME;
#define CONST const #define CONST const
#ifdef i386 #ifdef i386

5
reactos/include/structs.h
View file

@ -293,11 +293,6 @@ typedef struct _browseinfo {
int iImage; int iImage;
} BROWSEINFO, *PBROWSEINFO, *LPBROWSEINFO; } BROWSEINFO, *PBROWSEINFO, *LPBROWSEINFO;
typedef struct _FILETIME {
DWORD dwLowDateTime;
DWORD dwHighDateTime;
} FILETIME, *LPFILETIME, *PFILETIME;
typedef struct _BY_HANDLE_FILE_INFORMATION { typedef struct _BY_HANDLE_FILE_INFORMATION {
DWORD dwFileAttributes; DWORD dwFileAttributes;
FILETIME ftCreationTime; FILETIME ftCreationTime;

1
reactos/ntoskrnl/cm/cm.h
View file

@ -2,7 +2,6 @@
#ifndef __INCLUDE_CM_H #ifndef __INCLUDE_CM_H
#define __INCLUDE_CM_H #define __INCLUDE_CM_H
#include <windows.h>
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <internal/config.h> #include <internal/config.h>
#include <internal/ob.h> #include <internal/ob.h>

6
reactos/ntoskrnl/ex/fmutex.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: fmutex.c,v 1.9 2001/03/16 18:11:21 dwelch Exp $ /* $Id: fmutex.c,v 1.10 2001/06/20 12:57:32 ekohl Exp $
* *
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: ntoskrnl/ex/fmutex.c * FILE: ntoskrnl/ex/fmutex.c
@ -36,7 +36,7 @@
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
VOID FASTCALL EXPORTED VOID FASTCALL
ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex)
{ {
if (InterlockedDecrement(&FastMutex->Count) == 0) if (InterlockedDecrement(&FastMutex->Count) == 0)
@ -52,7 +52,7 @@ ExAcquireFastMutexUnsafe (PFAST_MUTEX FastMutex)
FastMutex->Owner = KeGetCurrentThread(); FastMutex->Owner = KeGetCurrentThread();
} }
VOID FASTCALL EXPORTED VOID FASTCALL
ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex) ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex)
{ {
assert(FastMutex->Owner == KeGetCurrentThread()); assert(FastMutex->Owner == KeGetCurrentThread());

8
reactos/ntoskrnl/hal/x86/fmutex.c
View file

@ -1,4 +1,4 @@
/* $Id: fmutex.c,v 1.2 2000/08/30 19:33:28 dwelch Exp $ /* $Id: fmutex.c,v 1.3 2001/06/20 12:59:18 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -18,7 +18,7 @@
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
VOID FASTCALL EXPORTED VOID FASTCALL
ExAcquireFastMutex (PFAST_MUTEX FastMutex) ExAcquireFastMutex (PFAST_MUTEX FastMutex)
{ {
KeEnterCriticalRegion(); KeEnterCriticalRegion();
@ -36,7 +36,7 @@ ExAcquireFastMutex (PFAST_MUTEX FastMutex)
} }
VOID FASTCALL EXPORTED VOID FASTCALL
ExReleaseFastMutex (PFAST_MUTEX FastMutex) ExReleaseFastMutex (PFAST_MUTEX FastMutex)
{ {
assert(FastMutex->Owner == KeGetCurrentThread()); assert(FastMutex->Owner == KeGetCurrentThread());
@ -51,7 +51,7 @@ ExReleaseFastMutex (PFAST_MUTEX FastMutex)
} }
BOOLEAN FASTCALL EXPORTED BOOLEAN FASTCALL
ExTryToAcquireFastMutex (PFAST_MUTEX FastMutex) ExTryToAcquireFastMutex (PFAST_MUTEX FastMutex)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;

2
reactos/ntoskrnl/include/internal/xhal.h
View file

@ -25,7 +25,7 @@ xHalIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject,
IN ULONG PartitionNumber, IN ULONG PartitionNumber,
IN ULONG PartitionType); IN ULONG PartitionType);
NTSTATUS STDCALL NTSTATUS FASTCALL
xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject,
IN ULONG SectorSize, IN ULONG SectorSize,
IN ULONG SectorsPerTrack, IN ULONG SectorsPerTrack,

33
reactos/ntoskrnl/rtl/error.c
View file

@ -1,4 +1,4 @@
/* $Id: error.c,v 1.1 2000/07/04 01:30:18 ekohl Exp $ /* $Id: error.c,v 1.2 2001/06/20 13:00:53 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -20,12 +20,13 @@
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <windows.h>
#include <errors.h> #include <errors.h>
#define NDEBUG #define NDEBUG
#include <internal/debug.h> #include <internal/debug.h>
#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF))
#define LOWORD(l) ((WORD)(l))
/* TYPES *******************************************************************/ /* TYPES *******************************************************************/
@ -825,14 +826,11 @@ RPC_NT_SS_CONTEXT_MISMATCH ERROR_INVALID_HANDLE
/* FUNCTIONS ***************************************************************/ /* FUNCTIONS ***************************************************************/
VOID VOID STDCALL
STDCALL RtlAssert(PVOID FailedAssertion,
RtlAssert (
PVOID FailedAssertion,
PVOID FileName, PVOID FileName,
ULONG LineNumber, ULONG LineNumber,
PCHAR Message PCHAR Message)
)
{ {
DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n", DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n",
(PCHAR)FailedAssertion, (PCHAR)FailedAssertion,
@ -859,9 +857,8 @@ RtlAssert (
* REMARK * REMARK
* RtlNtStatusToDosErrorNoTeb() does the real work. * RtlNtStatusToDosErrorNoTeb() does the real work.
*/ */
DWORD DWORD STDCALL
STDCALL RtlNtStatusToDosErrorNoTeb(IN NTSTATUS Status)
RtlNtStatusToDosErrorNoTeb (NTSTATUS Status)
{ {
PERROR_TABLE Table = (PERROR_TABLE)ErrorTable; PERROR_TABLE Table = (PERROR_TABLE)ErrorTable;
@ -918,11 +915,8 @@ RtlNtStatusToDosErrorNoTeb (NTSTATUS Status)
* REMARK * REMARK
* RtlNtStatusToDosErrorNoTeb() does the real work. * RtlNtStatusToDosErrorNoTeb() does the real work.
*/ */
DWORD DWORD STDCALL
STDCALL RtlNtStatusToDosError(IN NTSTATUS Status)
RtlNtStatusToDosError (
NTSTATUS Status
)
{ {
PNT_TEB Teb = NtCurrentTeb (); PNT_TEB Teb = NtCurrentTeb ();
@ -955,11 +949,8 @@ RtlNtStatusToDosError (
* REVISIONS * REVISIONS
* 1999-11-30 ea * 1999-11-30 ea
*/ */
INT INT STDCALL
STDCALL RtlNtStatusToPsxErrno(IN NTSTATUS Status)
RtlNtStatusToPsxErrno (
IN NTSTATUS Status
)
{ {
#if 0 #if 0
switch (Status) switch (Status)