Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 00:05:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor changes.

Browse source 
svn path=/trunk/; revision=1216
This commit is contained in:
Emanuele Aliberti 2000-07-01 17:07:02 +00:00
parent f3e6819471
commit 95f8770ae2
27 changed files with 342 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

151
reactos/include/internal/port.h Normal file
View file

@ -0,0 +1,151 @@
#ifndef __INCLUDE_INTERNAL_PORT_H
#define __INCLUDE_INTERNAL_PORT_H
#include <napi/lpc.h>
typedef
struct _EPORT
{
KSPIN_LOCK Lock;
KEVENT Event;
ULONG State;
struct _EPORT * OtherPort;
ULONG QueueLength;
LIST_ENTRY QueueListHead;
ULONG ConnectQueueLength;
LIST_ENTRY ConnectQueueListHead;
ULONG MaxDataLength;
ULONG MaxConnectInfoLength;
} EPORT, * PEPORT;
typedef struct _EPORT_TERMINATION_REQUEST
{
LIST_ENTRY ThreadListEntry;
PEPORT Port;
} EPORT_TERMINATION_REQUEST, *PEPORT_TERMINATION_REQUEST;
NTSTATUS
STDCALL
LpcRequestPort (
PEPORT Port,
PLPC_MESSAGE LpcMessage
);
NTSTATUS
STDCALL
LpcSendTerminationPort (
PEPORT Port,
TIME CreationTime
);
/* Port Object Access */
#define PORT_ALL_ACCESS (0x1)
/* EPORT.State */
#define EPORT_INACTIVE (0)
#define EPORT_WAIT_FOR_CONNECT (1)
#define EPORT_WAIT_FOR_ACCEPT (2)
#define EPORT_WAIT_FOR_COMPLETE_SRV (3)
#define EPORT_WAIT_FOR_COMPLETE_CLT (4)
#define EPORT_CONNECTED_CLIENT (5)
#define EPORT_CONNECTED_SERVER (6)
#define EPORT_DISCONNECTED (7)
typedef
struct _QUEUEDMESSAGE
{
PEPORT Sender;
LIST_ENTRY QueueListEntry;
LPC_MESSAGE Message;
UCHAR MessageData [MAX_MESSAGE_DATA];
} QUEUEDMESSAGE, *PQUEUEDMESSAGE;
/* Code in ntoskrnl/lpc/close.c */
VOID
NiClosePort (
PVOID ObjectBody,
ULONG HandleCount
);
VOID
NiDeletePort (
IN PVOID ObjectBody
);
/* Code in ntoskrnl/lpc/queue.c */
VOID
STDCALL
EiEnqueueConnectMessagePort (
IN OUT PEPORT Port,
IN PQUEUEDMESSAGE Message
);
VOID
STDCALL
EiEnqueueMessagePort (
IN OUT PEPORT Port,
IN PQUEUEDMESSAGE Message
);
PQUEUEDMESSAGE
STDCALL
EiDequeueConnectMessagePort (
IN OUT PEPORT Port
);
PQUEUEDMESSAGE
STDCALL
EiDequeueMessagePort (
IN OUT PEPORT Port
);
/* Code in ntoskrnl/lpc/create.c */
NTSTATUS
NiCreatePort (
PVOID ObjectBody,
PVOID Parent,
PWSTR RemainingPath,
POBJECT_ATTRIBUTES ObjectAttributes
);
/* Code in ntoskrnl/lpc/port.c */
NTSTATUS
STDCALL
NiInitializePort (
IN OUT PEPORT Port
);
NTSTATUS
NiInitPort (
VOID
);
extern POBJECT_TYPE ExPortType;
extern ULONG EiNextLpcMessageId;
/* Code in ntoskrnl/lpc/reply.c */
NTSTATUS
STDCALL
EiReplyOrRequestPort (
IN PEPORT Port,
IN PLPC_MESSAGE LpcReply,
IN ULONG MessageType,
IN PEPORT Sender
);
#endif /* __INCLUDE_INTERNAL_PORT_H */

7
reactos/include/kernel32/kernel32.h
View file

@ -1,3 +1,6 @@
#ifndef _INCLUDE_KERNEL32_KERNEL32_H
#define _INCLUDE_KERNEL32_KERNEL32_H
#include <windows.h> #include <windows.h>
#define UNIMPLEMENTED DbgPrint("%s at %s:%d is unimplemented\n",__FUNCTION__,__FILE__,__LINE__); #define UNIMPLEMENTED DbgPrint("%s at %s:%d is unimplemented\n",__FUNCTION__,__FILE__,__LINE__);
@ -39,6 +42,8 @@ BOOL KERNEL32_AnsiToUnicode(PWSTR DestStr,
ULONG MaxLen); ULONG MaxLen);
PWSTR InternalAnsiToUnicode(PWSTR Out, LPCSTR In, ULONG MaxLength); PWSTR InternalAnsiToUnicode(PWSTR Out, LPCSTR In, ULONG MaxLength);
BOOLEAN IsConsoleHandle(HANDLE Handle); BOOLEAN STDCALL IsConsoleHandle(HANDLE Handle);
WINBOOL STDCALL CloseConsoleHandle(HANDLE Handle); WINBOOL STDCALL CloseConsoleHandle(HANDLE Handle);
#endif /* ndef _INCLUDE_KERNEL32_KERNEL32_H */

7
reactos/include/ntdll/ldr.h
View file

@ -33,3 +33,10 @@ LdrGetExportByOrdinal (PDLL Module, ULONG Ordinal );
PVOID PVOID
LdrGetExportByName (PDLL Module, PUCHAR SymbolName ); LdrGetExportByName (PDLL Module, PUCHAR SymbolName );
NTSTATUS
STDCALL
LdrDisableThreadCalloutsForDll (
PVOID IN ImageBase,
BOOLEAN IN Disable
);

4
reactos/lib/kernel32/mem/global.c
View file

@ -1,4 +1,5 @@
/* /* $Id: global.c,v 1.4 2000/07/01 17:07:00 ea Exp $
*
* Win32 Global/Local heap functions (GlobalXXX, LocalXXX). * Win32 Global/Local heap functions (GlobalXXX, LocalXXX).
* These functions included in Win32 for compatibility with 16 bit Windows * These functions included in Win32 for compatibility with 16 bit Windows
* Especially the moveable blocks and handles are oldish. * Especially the moveable blocks and handles are oldish.
@ -321,3 +322,4 @@ UINT WINAPI GlobalFlags(HGLOBAL hmem)
return LocalFlags( (HLOCAL) hmem); return LocalFlags( (HLOCAL) hmem);
} }
/* EOF */

5
reactos/lib/kernel32/mem/local.c
View file

@ -1,4 +1,5 @@
/* /* $Id: local.c,v 1.4 2000/07/01 17:07:00 ea Exp $
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* Copyright (C) 1996, Onno Hovers, All rights reserved * Copyright (C) 1996, Onno Hovers, All rights reserved
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -124,3 +125,5 @@ UINT WINAPI LocalShrink(HLOCAL hmem, UINT newsize)
{ {
return (__ProcessHeap->End - (LPVOID) __ProcessHeap); return (__ProcessHeap->End - (LPVOID) __ProcessHeap);
} }
/* EOF */

4
reactos/lib/kernel32/mem/mem.c
View file

@ -1,4 +1,5 @@
/* /* $Id: mem.c,v 1.2 2000/07/01 17:07:00 ea Exp $
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user mode libraries * PROJECT: ReactOS user mode libraries
* FILE: kernel32/mem/utils.cc * FILE: kernel32/mem/utils.cc
@ -21,3 +22,4 @@ VOID CopyMemory(PVOID Destination, CONST VOID* Source, DWORD Length)
} }
/* EOF */

13
reactos/lib/kernel32/mem/procmem.c
View file

@ -1,4 +1,5 @@
/* /* $Id: procmem.c,v 1.2 2000/07/01 17:07:00 ea Exp $
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: lib/kernel32/mem/procmem.c * FILE: lib/kernel32/mem/procmem.c
@ -10,6 +11,7 @@
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <kernel32/error.h>
#include <windows.h> #include <windows.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
@ -32,7 +34,7 @@ ReadProcessMemory (
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -57,8 +59,11 @@ WriteProcessMemory (
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} }
/* EOF */

17
reactos/lib/kernel32/mem/section.c
View file

@ -1,4 +1,4 @@
/* $Id: section.c,v 1.11 2000/06/29 23:35:25 dwelch Exp $ /* $Id: section.c,v 1.12 2000/07/01 17:07:00 ea Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -10,6 +10,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <kernel32/error.h>
#include <windows.h> #include <windows.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
@ -59,7 +60,7 @@ HANDLE STDCALL CreateFileMappingA (
RtlFreeUnicodeString (&UnicodeName); RtlFreeUnicodeString (&UnicodeName);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return NULL; return NULL;
} }
@ -111,7 +112,7 @@ CreateFileMappingW (
hFile); hFile);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return NULL; return NULL;
} }
@ -168,7 +169,7 @@ LPVOID STDCALL MapViewOfFileEx(HANDLE hFileMappingObject,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return NULL; return NULL;
} }
@ -201,7 +202,7 @@ UnmapViewOfFile (
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return FALSE; return FALSE;
} }
@ -243,7 +244,7 @@ OpenFileMappingA (
RtlFreeUnicodeString (&UnicodeName); RtlFreeUnicodeString (&UnicodeName);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return NULL; return NULL;
} }
@ -280,7 +281,7 @@ OpenFileMappingW (
&ObjectAttributes); &ObjectAttributes);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return NULL; return NULL;
} }
@ -304,7 +305,7 @@ FlushViewOfFile (
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;

7
reactos/lib/kernel32/mem/utils.c
View file

@ -1,3 +1,7 @@
/* $Id: utils.c,v 1.5 2000/07/01 17:07:00 ea Exp $
*
* FILE: lib/kernel32/mem/utils.c
*/
#include <windows.h> #include <windows.h>
#include <kernel32/kernel32.h> #include <kernel32/kernel32.h>
@ -10,3 +14,6 @@ VOID CopyMemory(PVOID Destination, CONST VOID* Source, DWORD Length)
((PCH)Destination)[i] = ((PCH)Source)[i]; ((PCH)Destination)[i] = ((PCH)Source)[i];
} }
} }
/* EOF */

18
reactos/lib/kernel32/mem/virtual.c
View file

@ -1,4 +1,5 @@
/* /* $Id: virtual.c,v 1.6 2000/07/01 17:07:00 ea Exp $
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: lib/kernel32/mem/virtual.c * FILE: lib/kernel32/mem/virtual.c
@ -9,6 +10,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <kernel32/error.h>
#include <windows.h> #include <windows.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
@ -29,7 +31,7 @@ LPVOID STDCALL VirtualAllocEx(HANDLE hProcess,
flProtect); flProtect);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return(NULL); return(NULL);
} }
return(lpAddress); return(lpAddress);
@ -57,7 +59,7 @@ WINBOOL STDCALL VirtualFreeEx(HANDLE hProcess,
dwFreeType); dwFreeType);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return(FALSE); return(FALSE);
} }
return(TRUE); return(TRUE);
@ -96,7 +98,7 @@ WINBOOL STDCALL VirtualProtectEx(HANDLE hProcess,
(PULONG)lpflOldProtect); (PULONG)lpflOldProtect);
if (Status != STATUS_SUCCESS) if (Status != STATUS_SUCCESS)
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return(FALSE); return(FALSE);
} }
return(TRUE); return(TRUE);
@ -115,7 +117,7 @@ VirtualLock (
Status = NtLockVirtualMemory(NtCurrentProcess(),lpAddress,dwSize, &BytesLocked); Status = NtLockVirtualMemory(NtCurrentProcess(),lpAddress,dwSize, &BytesLocked);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -154,7 +156,7 @@ VirtualQueryEx (
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return ResultLength; return ResultLength;
} }
return ResultLength; return ResultLength;
@ -173,8 +175,10 @@ VirtualUnlock (
Status = NtUnlockVirtualMemory(NtCurrentProcess(),lpAddress,dwSize, &BytesLocked); Status = NtUnlockVirtualMemory(NtCurrentProcess(),lpAddress,dwSize, &BytesLocked);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} }
/* EOF */

3
reactos/lib/kernel32/misc/atom.c
View file

@ -1,4 +1,5 @@
/* /* $Id: atom.c,v 1.9 2000/07/01 17:07:00 ea Exp $
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
* FILE: lib/kernel32/misc/atom.c * FILE: lib/kernel32/misc/atom.c

53
reactos/lib/kernel32/misc/console.c
View file

@ -1,4 +1,5 @@
/* /* $Id: console.c,v 1.24 2000/07/01 17:07:00 ea Exp $
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
* FILE: lib/kernel32/misc/console.c * FILE: lib/kernel32/misc/console.c
@ -23,14 +24,28 @@
#define NDEBUG #define NDEBUG
#include <kernel32/kernel32.h> #include <kernel32/kernel32.h>
#include <kernel32/error.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
/*--------------------------------------------------------------
* CloseConsoleHandle
*/
WINBOOL STDCALL CloseConsoleHandle(HANDLE Handle) WINBOOL STDCALL CloseConsoleHandle(HANDLE Handle)
{ {
if (FALSE == IsConsoleHandle (Handle))
{
SetLastError (ERROR_INVALID_PARAMETER);
return FALSE;
}
/* FIXME: call CSRSS */
return FALSE;
} }
BOOLEAN IsConsoleHandle(HANDLE Handle) /*--------------------------------------------------------------
* IsConsoleHandle
*/
BOOLEAN STDCALL IsConsoleHandle(HANDLE Handle)
{ {
if ((((ULONG)Handle) & 0x10000003) == 0x3) if ((((ULONG)Handle) & 0x10000003) == 0x3)
{ {
@ -146,7 +161,7 @@ WINBOOL STDCALL WriteConsoleA(HANDLE hConsoleOutput,
if (!NT_SUCCESS(Status) || !NT_SUCCESS( Status = Reply.Status ) ) if (!NT_SUCCESS(Status) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
HeapFree( GetProcessHeap(), 0, Request ); HeapFree( GetProcessHeap(), 0, Request );
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus (Status);
return(FALSE); return(FALSE);
} }
nNumberOfCharsToWrite -= Size; nNumberOfCharsToWrite -= Size;
@ -191,7 +206,7 @@ WINBOOL STDCALL ReadConsoleA(HANDLE hConsoleInput,
if (!NT_SUCCESS(Status) || !NT_SUCCESS( Status = Reply->Status )) if (!NT_SUCCESS(Status) || !NT_SUCCESS( Status = Reply->Status ))
{ {
DbgPrint( "CSR returned error in ReadConsole\n" ); DbgPrint( "CSR returned error in ReadConsole\n" );
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
HeapFree( GetProcessHeap(), 0, Reply ); HeapFree( GetProcessHeap(), 0, Reply );
return(FALSE); return(FALSE);
} }
@ -208,7 +223,7 @@ WINBOOL STDCALL ReadConsoleA(HANDLE hConsoleInput,
Status = CsrClientCallServer( &Request, Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) + nNumberOfCharsToRead ); Status = CsrClientCallServer( &Request, Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) + nNumberOfCharsToRead );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply->Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply->Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
HeapFree( GetProcessHeap(), 0, Reply ); HeapFree( GetProcessHeap(), 0, Reply );
return FALSE; return FALSE;
} }
@ -239,7 +254,7 @@ WINBOOL STDCALL AllocConsole(VOID)
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
SetStdHandle( STD_INPUT_HANDLE, Reply.Data.AllocConsoleReply.ConsoleHandle ); SetStdHandle( STD_INPUT_HANDLE, Reply.Data.AllocConsoleReply.ConsoleHandle );
@ -278,7 +293,7 @@ GetConsoleScreenBufferInfo(
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
*lpConsoleScreenBufferInfo = Reply.Data.ScreenBufferInfoReply.Info; *lpConsoleScreenBufferInfo = Reply.Data.ScreenBufferInfoReply.Info;
@ -306,7 +321,7 @@ SetConsoleCursorPosition(
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -338,7 +353,7 @@ FillConsoleOutputCharacterA(
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
*lpNumberOfCharsWritten = nLength; *lpNumberOfCharsWritten = nLength;
@ -422,7 +437,7 @@ ReadConsoleInputA(
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
while( Status == STATUS_PENDING ) while( Status == STATUS_PENDING )
@ -430,13 +445,13 @@ ReadConsoleInputA(
Status = NtWaitForSingleObject( Reply.Data.ReadInputReply.Event, FALSE, 0 ); Status = NtWaitForSingleObject( Reply.Data.ReadInputReply.Event, FALSE, 0 );
if( !NT_SUCCESS( Status ) ) if( !NT_SUCCESS( Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
} }
@ -664,7 +679,7 @@ WriteConsoleOutputCharacterA(
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
nLength -= Size; nLength -= Size;
@ -729,7 +744,7 @@ WriteConsoleOutputAttribute(
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
nLength -= Size; nLength -= Size;
@ -766,7 +781,7 @@ FillConsoleOutputAttribute(
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
if( lpNumberOfAttrsWritten ) if( lpNumberOfAttrsWritten )
@ -846,7 +861,7 @@ GetConsoleCursorInfo(
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
*lpConsoleCursorInfo = Reply.Data.GetCursorInfoReply.Info; *lpConsoleCursorInfo = Reply.Data.GetCursorInfoReply.Info;
@ -951,7 +966,7 @@ SetConsoleCursorInfo(
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -1034,7 +1049,7 @@ SetConsoleTextAttribute(
Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) ); Status = CsrClientCallServer( &Request, &Reply, sizeof( CSRSS_API_REQUEST ), sizeof( CSRSS_API_REPLY ) );
if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) ) if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Reply.Status ) )
{ {
SetLastError( RtlNtStatusToDosError( Status ) ); SetLastErrorByStatus ( Status );
return FALSE; return FALSE;
} }
return TRUE; return TRUE;

5
reactos/lib/kernel32/misc/debug.c
View file

@ -1,4 +1,4 @@
/* $Id: debug.c,v 1.2 2000/04/14 01:49:40 ekohl Exp $ /* $Id: debug.c,v 1.3 2000/07/01 17:07:00 ea Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -11,6 +11,7 @@
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <ntdll/dbg.h> #include <ntdll/dbg.h>
#include <kernel32/error.h>
#include <windows.h> #include <windows.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
@ -36,7 +37,7 @@ ContinueDebugEvent (
dwContinueStatus); dwContinueStatus);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError (RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;

17
reactos/lib/kernel32/misc/env.c
View file

@ -1,4 +1,4 @@
/* $Id: env.c,v 1.10 2000/02/18 00:49:56 ekohl Exp $ /* $Id: env.c,v 1.11 2000/07/01 17:07:00 ea Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -17,6 +17,7 @@
#define NDEBUG #define NDEBUG
#include <kernel32/kernel32.h> #include <kernel32/kernel32.h>
#include <kernel32/error.h>
/* FUNCTIONS ******************************************************************/ /* FUNCTIONS ******************************************************************/
@ -68,7 +69,7 @@ GetEnvironmentVariableA (
/* free unicode variable name string */ /* free unicode variable name string */
RtlFreeUnicodeString (&VarNameU); RtlFreeUnicodeString (&VarNameU);
SetLastError (RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return 0; return 0;
} }
@ -113,7 +114,7 @@ GetEnvironmentVariableW (
&VarValue); &VarValue);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError (RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return 0; return 0;
} }
@ -155,7 +156,7 @@ SetEnvironmentVariableA (
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError (RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return FALSE; return FALSE;
} }
@ -185,7 +186,7 @@ SetEnvironmentVariableW (
&VarValue); &VarValue);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError (RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return FALSE; return FALSE;
} }
@ -393,7 +394,7 @@ ExpandEnvironmentStringsA (
RtlFreeHeap (RtlGetProcessHeap (), RtlFreeHeap (RtlGetProcessHeap (),
0, 0,
DestinationU.Buffer); DestinationU.Buffer);
SetLastError (RtlNtStatusToDosError (Status)); SetLastErrorByStatus (Status);
return 0; return 0;
} }
@ -435,11 +436,11 @@ ExpandEnvironmentStringsW (
&Length); &Length);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastError (RtlNtStatusToDosError (Status)); SetLastErrorByStatus (Status);
return 0; return 0;
} }
return (Length / sizeof(WCHAR)); return (Length / sizeof(WCHAR));
} }
/* EOF */ /* EOF */

17
reactos/lib/kernel32/misc/handle.c
View file

@ -1,4 +1,5 @@
/* /* $Id: handle.c,v 1.5 2000/07/01 17:07:00 ea Exp $
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
* FILE: lib/kernel32/misc/handle.c * FILE: lib/kernel32/misc/handle.c
@ -15,6 +16,7 @@
#define NDEBUG #define NDEBUG
#include <kernel32/kernel32.h> #include <kernel32/kernel32.h>
#include <kernel32/error.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
@ -31,7 +33,7 @@ WINBOOL WINAPI GetHandleInformation(HANDLE hObject, LPDWORD lpdwFlags)
&BytesWritten); &BytesWritten);
if (!NT_SUCCESS(errCode)) if (!NT_SUCCESS(errCode))
{ {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return FALSE; return FALSE;
} }
if ( HandleInfo.bInheritHandle ) if ( HandleInfo.bInheritHandle )
@ -57,7 +59,7 @@ WINBOOL STDCALL SetHandleInformation(HANDLE hObject,
&BytesWritten); &BytesWritten);
if (!NT_SUCCESS(errCode)) if (!NT_SUCCESS(errCode))
{ {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return FALSE; return FALSE;
} }
if (dwMask & HANDLE_FLAG_INHERIT) if (dwMask & HANDLE_FLAG_INHERIT)
@ -75,7 +77,7 @@ WINBOOL STDCALL SetHandleInformation(HANDLE hObject,
sizeof(OBJECT_DATA_INFORMATION)); sizeof(OBJECT_DATA_INFORMATION));
if (!NT_SUCCESS(errCode)) if (!NT_SUCCESS(errCode))
{ {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return FALSE; return FALSE;
} }
@ -102,7 +104,7 @@ WINBOOL STDCALL CloseHandle(HANDLE hObject)
errCode = NtClose(hObject); errCode = NtClose(hObject);
if (!NT_SUCCESS(errCode)) if (!NT_SUCCESS(errCode))
{ {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return FALSE; return FALSE;
} }
@ -129,7 +131,7 @@ WINBOOL STDCALL DuplicateHandle(HANDLE hSourceProcessHandle,
dwOptions); dwOptions);
if (!NT_SUCCESS(errCode)) if (!NT_SUCCESS(errCode))
{ {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return FALSE; return FALSE;
} }
@ -140,3 +142,6 @@ UINT STDCALL SetHandleCount(UINT nCount)
{ {
return(nCount); return(nCount);
} }
/* EOF */

5
reactos/lib/kernel32/misc/ldr.c
View file

@ -1,4 +1,4 @@
/* $Id: ldr.c,v 1.5 2000/04/14 01:49:40 ekohl Exp $ /* $Id: ldr.c,v 1.6 2000/07/01 17:07:00 ea Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT : ReactOS user mode libraries * PROJECT : ReactOS user mode libraries
@ -13,6 +13,7 @@
#define NDEBUG #define NDEBUG
#include <kernel32/kernel32.h> #include <kernel32/kernel32.h>
#include <kernel32/error.h>
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
@ -116,7 +117,7 @@ LoadLibraryExW (
HeapFree(GetProcessHeap(),0,lpDllName); HeapFree(GetProcessHeap(),0,lpDllName);
if ( !NT_SUCCESS(Status)) if ( !NT_SUCCESS(Status))
{ {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return NULL; return NULL;
} }

5
reactos/lib/kernel32/misc/res.c
View file

@ -1,4 +1,4 @@
/* $Id: res.c,v 1.4 2000/04/14 01:50:38 ekohl Exp $ /* $Id: res.c,v 1.5 2000/07/01 17:07:00 ea Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT : ReactOS user mode libraries * PROJECT : ReactOS user mode libraries
@ -11,6 +11,7 @@
#include <windows.h> #include <windows.h>
#include <ntdll/ldr.h> #include <ntdll/ldr.h>
#include <kernel32/kernel32.h> #include <kernel32/kernel32.h>
#include <kernel32/error.h>
HRSRC HRSRC
@ -141,7 +142,7 @@ FindResourceExW (
Status = LdrFindResource_U(hModule,&ResourceDataEntry,lpName, nType,wLanguage); Status = LdrFindResource_U(hModule,&ResourceDataEntry,lpName, nType,wLanguage);
if ( !NT_SUCCESS(Status ) ) { if ( !NT_SUCCESS(Status ) ) {
SetLastError(RtlNtStatusToDosError(Status)); SetLastErrorByStatus (Status);
return NULL; return NULL;
} }
return ResourceDataEntry; return ResourceDataEntry;

8
reactos/lib/kernel32/misc/rtl.c
View file

@ -1,4 +1,5 @@
/* /* $Id: rtl.c,v 1.3 2000/07/01 17:07:00 ea Exp $
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: lib/kernel32/misc/rtl.c * FILE: lib/kernel32/misc/rtl.c
@ -94,4 +95,7 @@ RtlUnwind (
if ( Unwind == NULL ) if ( Unwind == NULL )
return -1; return -1;
return Unwind(Unknown0, Unknown1, Unknown2, Unknown3); return Unwind(Unknown0, Unknown1, Unknown2, Unknown3);
} }
/* EOF */

13
reactos/lib/kernel32/misc/stubs.c
View file

@ -1,4 +1,4 @@
/* $Id: stubs.c,v 1.18 2000/05/14 13:09:59 dwelch Exp $ /* $Id: stubs.c,v 1.19 2000/07/01 17:07:01 ea Exp $
* *
* KERNEL32.DLL stubs (unimplemented functions) * KERNEL32.DLL stubs (unimplemented functions)
* Remove from this file, if you implement them. * Remove from this file, if you implement them.
@ -412,17 +412,6 @@ DeleteAtom (
} }
WINBOOL
STDCALL
DisableThreadLibraryCalls (
HMODULE hLibModule
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
WINBOOL WINBOOL
STDCALL STDCALL
DisconnectNamedPipe ( DisconnectNamedPipe (

13
reactos/lib/kernel32/synch/event.c
View file

@ -1,4 +1,4 @@
/* $Id: event.c,v 1.7 2000/03/16 21:50:11 ekohl Exp $ /* $Id: event.c,v 1.8 2000/07/01 17:07:02 ea Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -14,6 +14,7 @@
#define NDEBUG #define NDEBUG
#include <kernel32/kernel32.h> #include <kernel32/kernel32.h>
#include <kernel32/error.h>
WINBOOL STDCALL SetEvent(HANDLE hEvent) WINBOOL STDCALL SetEvent(HANDLE hEvent)
{ {
@ -23,7 +24,7 @@ WINBOOL STDCALL SetEvent(HANDLE hEvent)
errCode = NtSetEvent(hEvent,&Count); errCode = NtSetEvent(hEvent,&Count);
if (!NT_SUCCESS(errCode)) if (!NT_SUCCESS(errCode))
{ {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -37,7 +38,7 @@ WINBOOL STDCALL ResetEvent(HANDLE hEvent)
errCode = NtResetEvent(hEvent, &Count); errCode = NtResetEvent(hEvent, &Count);
if (!NT_SUCCESS(errCode)) if (!NT_SUCCESS(errCode))
{ {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -91,7 +92,7 @@ CreateEventW (
DPRINT( "Called\n" ); DPRINT( "Called\n" );
if (!NT_SUCCESS(errCode)) if (!NT_SUCCESS(errCode))
{ {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
@ -130,7 +131,7 @@ OpenEventW (
errCode = NtOpenEvent(hEvent,dwDesiredAccess,&ObjectAttributes); errCode = NtOpenEvent(hEvent,dwDesiredAccess,&ObjectAttributes);
if ( !NT_SUCCESS(errCode) ) { if ( !NT_SUCCESS(errCode) ) {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return NULL; return NULL;
} }
@ -218,7 +219,7 @@ PulseEvent (
NTSTATUS errCode; NTSTATUS errCode;
errCode = NtPulseEvent(hEvent,&Count); errCode = NtPulseEvent(hEvent,&Count);
if ( !NT_SUCCESS(errCode) ) { if ( !NT_SUCCESS(errCode) ) {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;

7
reactos/lib/kernel32/synch/timer.c
View file

@ -1,4 +1,4 @@
/* $Id: timer.c,v 1.4 2000/03/16 21:50:11 ekohl Exp $ /* $Id: timer.c,v 1.5 2000/07/01 17:07:02 ea Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -10,6 +10,7 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <kernel32/error.h>
#include <windows.h> #include <windows.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
@ -154,7 +155,7 @@ WINBOOL SetWaitableTimer(
lpArgToCompletionRoutine, fResume, lPeriod, &pState); lpArgToCompletionRoutine, fResume, lPeriod, &pState);
if ( !NT_SUCCESS(errCode) ) { if ( !NT_SUCCESS(errCode) ) {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -170,7 +171,7 @@ WINBOOL CancelWaitableTimer(HANDLE hTimer)
&CurrentState &CurrentState
); );
if ( !NT_SUCCESS(errCode) ) { if ( !NT_SUCCESS(errCode) ) {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;

15
reactos/lib/kernel32/synch/wait.c
View file

@ -1,4 +1,4 @@
/* $Id: wait.c,v 1.11 2000/03/18 02:39:12 ekohl Exp $ /* $Id: wait.c,v 1.12 2000/07/01 17:07:02 ea Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -10,6 +10,7 @@
*/ */
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <kernel32/error.h>
#include <windows.h> #include <windows.h>
#include <wchar.h> #include <wchar.h>
@ -84,7 +85,7 @@ CreateSemaphoreW(
); );
if (!NT_SUCCESS(errCode)) if (!NT_SUCCESS(errCode))
{ {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return NULL; return NULL;
} }
@ -153,7 +154,7 @@ CreateMutexW (
errCode = NtCreateMutant(&MutantHandle,GENERIC_ALL, &ObjectAttributes,(BOOLEAN)bInitialOwner); errCode = NtCreateMutant(&MutantHandle,GENERIC_ALL, &ObjectAttributes,(BOOLEAN)bInitialOwner);
if (!NT_SUCCESS(errCode)) if (!NT_SUCCESS(errCode))
{ {
SetLastError(RtlNtStatusToDosError(errCode)); SetLastErrorByStatus (errCode);
return NULL; return NULL;
} }
@ -182,7 +183,6 @@ WaitForSingleObjectEx(HANDLE hHandle,
NTSTATUS errCode; NTSTATUS errCode;
PLARGE_INTEGER TimePtr; PLARGE_INTEGER TimePtr;
LARGE_INTEGER Time; LARGE_INTEGER Time;
DWORD retCode;
if (dwMilliseconds == INFINITE) if (dwMilliseconds == INFINITE)
{ {
@ -206,8 +206,7 @@ WaitForSingleObjectEx(HANDLE hHandle,
return WAIT_OBJECT_0; return WAIT_OBJECT_0;
} }
retCode = RtlNtStatusToDosError(errCode); SetLastErrorByStatus (errCode);
SetLastError(retCode);
return 0xFFFFFFFF; return 0xFFFFFFFF;
} }
@ -235,7 +234,6 @@ WaitForMultipleObjectsEx(DWORD nCount,
NTSTATUS errCode; NTSTATUS errCode;
LARGE_INTEGER Time; LARGE_INTEGER Time;
PLARGE_INTEGER TimePtr; PLARGE_INTEGER TimePtr;
DWORD retCode;
if (dwMilliseconds == INFINITE) if (dwMilliseconds == INFINITE)
{ {
@ -263,8 +261,7 @@ WaitForMultipleObjectsEx(DWORD nCount,
return errCode; return errCode;
} }
retCode = RtlNtStatusToDosError(errCode); SetLastErrorByStatus (errCode);
SetLastError(retCode);
return 0xFFFFFFFF; return 0xFFFFFFFF;
} }

27
reactos/lib/kernel32/thread/thread.c
View file

@ -1,4 +1,4 @@
/* $Id: thread.c,v 1.16 2000/06/29 23:35:26 dwelch Exp $ /* $Id: thread.c,v 1.17 2000/07/01 17:07:02 ea Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -15,6 +15,7 @@
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <windows.h> #include <windows.h>
#include <kernel32/thread.h> #include <kernel32/thread.h>
#include <ntdll/ldr.h>
#include <string.h> #include <string.h>
#include <napi/i386/segment.h> #include <napi/i386/segment.h>
@ -363,4 +364,28 @@ int STDCALL GetThreadPriority(HANDLE hThread)
return ThreadBasic.BasePriority; return ThreadBasic.BasePriority;
} }
/* FIXME */
WINBOOL
STDCALL
DisableThreadLibraryCalls (
HMODULE hLibModule
)
{
NTSTATUS Status;
Status = LdrDisableThreadCalloutsForDll (
(PVOID) hLibModule,
TRUE
);
if (!NT_SUCCESS (Status))
{
SetLastErrorByStatus (Status);
return FALSE;
}
return TRUE;
}
/* EOF */ /* EOF */

4
reactos/lib/ntdll/def/ntdll.def
View file

@ -1,4 +1,4 @@
; $Id: ntdll.def,v 1.55 2000/05/25 15:51:05 ekohl Exp $ ; $Id: ntdll.def,v 1.56 2000/07/01 17:06:22 ea Exp $
; ;
; ReactOS Operating System ; ReactOS Operating System
; ;
@ -33,7 +33,7 @@ DbgUserBreakPoint@0
;KiUserCallbackDispatcher ;KiUserCallbackDispatcher
;KiUserExceptionDispatcher ;KiUserExceptionDispatcher
LdrAccessResource LdrAccessResource
;LdrDisableThreadCalloutsForDll LdrDisableThreadCalloutsForDll@8
;LdrEnumResources ;LdrEnumResources
;LdrFindResourceDirectory_U ;LdrFindResourceDirectory_U
LdrFindResource_U LdrFindResource_U

4
reactos/lib/ntdll/def/ntdll.edf
View file

@ -1,4 +1,4 @@
; $Id: ntdll.edf,v 1.44 2000/05/25 15:51:05 ekohl Exp $ ; $Id: ntdll.edf,v 1.45 2000/07/01 17:06:22 ea Exp $
; ;
; ReactOS Operating System ; ReactOS Operating System
; ;
@ -33,7 +33,7 @@ DbgUserBreakPoint=DbgUserBreakPoint@0
;KiUserCallbackDispatcher ;KiUserCallbackDispatcher
;KiUserExceptionDispatcher ;KiUserExceptionDispatcher
LdrAccessResource LdrAccessResource
;LdrDisableThreadCalloutsForDll LdrDisableThreadCalloutsForDll=LdrDisableThreadCalloutsForDll@8
;LdrEnumResources ;LdrEnumResources
;LdrFindResourceDirectory_U ;LdrFindResourceDirectory_U
LdrFindResource_U LdrFindResource_U

14
reactos/lib/ntdll/ldr/utils.c
View file

@ -1,4 +1,4 @@
/* $Id: utils.c,v 1.26 2000/06/29 23:35:27 dwelch Exp $ /* $Id: utils.c,v 1.27 2000/07/01 17:06:22 ea Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -1079,4 +1079,16 @@ NTSTATUS LdrAccessResource(DLL *Dll, IMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntr
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS
STDCALL
LdrDisableThreadCalloutsForDll (
PVOID IN ImageBase,
BOOLEAN IN Disable
)
{
return STATUS_NOT_IMPLEMENTED;
}
/* EOF */ /* EOF */

1
reactos/lib/ntdll/stubs/stubs.c
View file

@ -28,7 +28,6 @@ STUB(CsrSetPriorityClass)
STUB(KiRaiseUserExceptionDispatcher) STUB(KiRaiseUserExceptionDispatcher)
STUB(KiUserExceptionDispatcher) STUB(KiUserExceptionDispatcher)
STUB(LdrDisableThreadCalloutsForDll)
STUB(LdrEnumResources) STUB(LdrEnumResources)
STUB(LdrFindEntryForAddress) STUB(LdrFindEntryForAddress)
STUB(LdrFindResourceDirectory_U) STUB(LdrFindResourceDirectory_U)