Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[arty] 14602: Added DHCP and dhcpcapi to the makefile.

by arty＠svn.reactos.com

Added DHCP and dhcpcapi to the makefile. Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-04-12 23:27:59 UTC (rev 14601) +++ trunk/reactos/Makefile 2005-04-12 23:33:29 UTC (rev 14602) @@ -63,7 +63,8 @@ msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ packet psapi riched20 richedit rpcrt4 samlib secur32 serialui setupapi shell32 shlwapi smlib smdll snmpapi \ syssetup twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ - urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) + urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv dhcpcapi \ + $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) SUBSYS = smss win32k csrss ntvdm @@ -105,7 +106,7 @@ # autochk cmd format services setup usetup welcome winlogon msiexec SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regsvr32 \ reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \ - winlogon regedit winefile notepad reactos lsass + winlogon regedit winefile notepad reactos lsass dhcp # System services SYS_SVC = rpcss eventlog umpnpmgr

19 years, 5 months

[arty] 14601: Patch by tinus_ to fix a persistent problem with kdbg. Fixes the y umlaut

by arty＠svn.reactos.com

Patch by tinus_ to fix a persistent problem with kdbg. Fixes the y umlaut bug. Modified: trunk/reactos/ntoskrnl/dbg/kdb_cli.c _____ Modified: trunk/reactos/ntoskrnl/dbg/kdb_cli.c --- trunk/reactos/ntoskrnl/dbg/kdb_cli.c 2005-04-12 23:25:14 UTC (rev 14600) +++ trunk/reactos/ntoskrnl/dbg/kdb_cli.c 2005-04-12 23:27:59 UTC (rev 14601) @@ -1969,6 +1969,7 @@ if (KdDebugState & KD_DEBUG_KDSERIAL) { Key = (NextKey == '\0') ? KdbpGetCharSerial() : NextKey; + NextKey = '\0'; ScanCode = 0; if (Key == KEY_ESC) /* ESC */ { @@ -1996,6 +1997,7 @@ { ScanCode = 0; Key = (NextKey == '\0') ? KdbpGetCharKeyboard(&ScanCode) : NextKey; + NextKey = '\0'; } if ((Buffer - Orig) >= (Size - 1)) @@ -2014,7 +2016,7 @@ NextKey = KdbpTryGetCharSerial(5); else NextKey = KdbpTryGetCharKeyboard(&ScanCode, 5); - if (NextKey == '\n') + if (NextKey == '\n' || NextKey == -1) /* \n or no response at all */ NextKey = '\0'; DbgPrint("\n"); /*

19 years, 5 months

[arty] 14600: First instance of DHCP client API. Not tested yet. Next, the control

by arty＠svn.reactos.com

First instance of DHCP client API. Not tested yet. Next, the control panel. Added: trunk/reactos/lib/dhcpcapi/ Added: trunk/reactos/lib/dhcpcapi/dhcpcapi.c Added: trunk/reactos/lib/dhcpcapi/dhcpcapi.def Added: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc Added: trunk/reactos/lib/dhcpcapi/makefile _____ Added: trunk/reactos/lib/dhcpcapi/dhcpcapi.c --- trunk/reactos/lib/dhcpcapi/dhcpcapi.c 2005-04-12 23:23:26 UTC (rev 14599) +++ trunk/reactos/lib/dhcpcapi/dhcpcapi.c 2005-04-12 23:25:14 UTC (rev 14600) @@ -0,0 +1,140 @@ +/* $Id: dllmain.c 12852 2005-01-06 13:58:04Z mf $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/dhcpcapi/dhcpcapi.c + * PURPOSE: Client API for DHCP + * PROGRAMMER: arty (ayerkes(a)speakeasy.net) + * UPDATE HISTORY: + * Created 12/04/2005 + */ + +#include <roscfg.h> +#include <winsock2.h> +#include <dhcpcsdk.h> +#include <rosdhcp_public.h> + +#define DHCP_TIMEOUT 1000 + +#define EXPORT __declspec(dllexport) WINAPI + +DWORD EXPORT DhcpCApiInitialize(LPDWORD Version) { + *Version = 2; + return 0; +} + +VOID EXPORT DhcpCApiCleanup() { +} + +DWORD EXPORT DhcpQueryHWInfo( DWORD AdapterIndex, + PDWORD MediaType, + PDWORD Mtu, + PDWORD Speed ) { + COMM_DHCP_REQ Req; + COMM_DHCP_REPLY Reply; + DWORD BytesRead; + BOOL Result; + + Req.Type = DhcpReqQueryHWInfo; + Req.AdapterIndex = AdapterIndex; + + Result = CallNamedPipe + ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), + &BytesRead, DHCP_TIMEOUT ); + + if( !Reply.Reply ) return 0; + else { + *MediaType = Reply.QueryHWInfo.MediaType; + *Mtu = Reply.QueryHWInfo.Mtu; + *Speed = Reply.QueryHWInfo.Speed; + return 1; + } +} + +DWORD EXPORT DhcpLeaseIpAddress( DWORD AdapterIndex ) { + COMM_DHCP_REQ Req; + COMM_DHCP_REPLY Reply; + DWORD BytesRead; + BOOL Result; + + Req.Type = DhcpReqLeaseIpAddress; + Req.AdapterIndex = AdapterIndex; + + Result = CallNamedPipe + ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), + &BytesRead, DHCP_TIMEOUT ); + + return Reply.Reply; +} + +DWORD EXPORT DhcpReleaseIpAddressLease( DWORD AdapterIndex ) { + COMM_DHCP_REQ Req; + COMM_DHCP_REPLY Reply; + DWORD BytesRead; + BOOL Result; + + Req.Type = DhcpReqReleaseIpAddress; + Req.AdapterIndex = AdapterIndex; + + Result = CallNamedPipe + ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), + &BytesRead, DHCP_TIMEOUT ); + + return Reply.Reply; +} + +DWORD EXPORT DhcpRenewIpAddressLease( DWORD AdapterIndex ) { + COMM_DHCP_REQ Req; + COMM_DHCP_REPLY Reply; + DWORD BytesRead; + BOOL Result; + + Req.Type = DhcpReqRenewIpAddress; + Req.AdapterIndex = AdapterIndex; + + Result = CallNamedPipe + ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), + &BytesRead, DHCP_TIMEOUT ); + + return Reply.Reply; +} + +DWORD EXPORT DhcpStaticRefreshParams( DWORD AdapterIndex, + DWORD Address, + DWORD Netmask ) { + COMM_DHCP_REQ Req; + COMM_DHCP_REPLY Reply; + DWORD BytesRead; + BOOL Result; + + Req.Type = DhcpReqStaticRefreshParams; + Req.AdapterIndex = AdapterIndex; + Req.Body.StaticRefreshParams.IPAddress = Address; + Req.Body.StaticRefreshParams.Netmask = Netmask; + + Result = CallNamedPipe + ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply), + &BytesRead, DHCP_TIMEOUT ); + + return Reply.Reply; +} + +INT STDCALL +DllMain(PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDll); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} + +/* EOF */ _____ Added: trunk/reactos/lib/dhcpcapi/dhcpcapi.def --- trunk/reactos/lib/dhcpcapi/dhcpcapi.def 2005-04-12 23:23:26 UTC (rev 14599) +++ trunk/reactos/lib/dhcpcapi/dhcpcapi.def 2005-04-12 23:25:14 UTC (rev 14600) @@ -0,0 +1,16 @@ +; $Id: dhcpcapi.def 14337 2005-03-26 22:10:04Z $ +; +; dhcpcapi.def +; +; ReactOS Operating System +; +LIBRARY dhcpcapi.dll +EXPORTS +DhcpCApiInitialize@4 +DhcpCApiCleanup@0 +DhcpQueryHWInfo@16 +DhcpLeaseIpAddress@4 +DhcpReleaseIpAddressLease@4 +DhcpRenewIpAddressLease@4 +DhcpStaticRefreshParams@12 +; EOF _____ Added: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc --- trunk/reactos/lib/dhcpcapi/dhcpcapi.rc 2005-04-12 23:23:26 UTC (rev 14599) +++ trunk/reactos/lib/dhcpcapi/dhcpcapi.rc 2005-04-12 23:25:14 UTC (rev 14600) @@ -0,0 +1,7 @@ +#include <defines.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "DHCP Client API\0" +#define REACTOS_STR_INTERNAL_NAME "dhcpcapi\0" +#define REACTOS_STR_ORIGINAL_FILENAME "dhcpcapi.dll\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/lib/dhcpcapi/makefile --- trunk/reactos/lib/dhcpcapi/makefile 2005-04-12 23:23:26 UTC (rev 14599) +++ trunk/reactos/lib/dhcpcapi/makefile 2005-04-12 23:25:14 UTC (rev 14600) @@ -0,0 +1,27 @@ +# $Id: makefile 12852 2005-01-06 13:58:04Z mf $ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = dynlink + +TARGET_NAME = dhcpcapi + +TARGET_CFLAGS = -Wall -Werror \ + -D__USE_W32API \ + -D_WIN32_IE=0x0500 \ + -D_WIN32_WINNT=0x501 \ + -DWINVER=0x600 \ + +TARGET_LFLAGS = -nostartfiles -nostdlib + +TARGET_SDKLIBS = ntdll.a kernel32.a + +TARGET_OBJECTS = dhcpcapi.o + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk

19 years, 5 months

[arty] 14599: Added client API interface.

by arty＠svn.reactos.com

Added client API interface. Modified: trunk/reactos/subsys/system/dhcp/Makefile Added: trunk/reactos/subsys/system/dhcp/api.c Modified: trunk/reactos/subsys/system/dhcp/dhclient.c Modified: trunk/reactos/subsys/system/dhcp/dispatch.c Modified: trunk/reactos/subsys/system/dhcp/include/dhcpd.h Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h Added: trunk/reactos/subsys/system/dhcp/pipe.c _____ Modified: trunk/reactos/subsys/system/dhcp/Makefile --- trunk/reactos/subsys/system/dhcp/Makefile 2005-04-12 21:25:58 UTC (rev 14598) +++ trunk/reactos/subsys/system/dhcp/Makefile 2005-04-12 23:23:26 UTC (rev 14599) @@ -10,8 +10,9 @@ TARGET_CFLAGS = -D__REACTOS__ -D_WIN32_WINNT=0x0501 -D__USE_W32API -Iinclude -TARGET_OBJECTS = adapter.o alloc.o compat.o dhclient.o dispatch.o hash.o \ - options.o privsep.o socket.o tables.o timer.o util.o +TARGET_OBJECTS = adapter.o alloc.o api.o compat.o dhclient.o dispatch.o \ + hash.o options.o pipe.o privsep.o socket.o tables.o timer.o \ + util.o TARGET_SDKLIBS = iphlpapi.a ws2_32.a ntdll.a _____ Added: trunk/reactos/subsys/system/dhcp/api.c --- trunk/reactos/subsys/system/dhcp/api.c 2005-04-12 21:25:58 UTC (rev 14598) +++ trunk/reactos/subsys/system/dhcp/api.c 2005-04-12 23:23:26 UTC (rev 14599) @@ -0,0 +1,136 @@ +/* $Id: $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: subsys/system/dhcp/api.c + * PURPOSE: DHCP client api handlers + * PROGRAMMER: arty + */ + +#include <winsock2.h> +#include <iphlpapi.h> +#include "rosdhcp.h" + +static CRITICAL_SECTION ApiCriticalSection; + +VOID ApiInit() { + InitializeCriticalSection( &ApiCriticalSection ); +} + +VOID ApiLock() { + EnterCriticalSection( &ApiCriticalSection ); +} + +VOID ApiUnlock() { + LeaveCriticalSection( &ApiCriticalSection ); +} + +/* This represents the service portion of the DHCP client API */ + +DWORD DSLeaseIpAddress( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { + COMM_DHCP_REPLY Reply; + PDHCP_ADAPTER Adapter; + + ApiLock(); + + Adapter = AdapterFindIndex( Req->AdapterIndex ); + + Reply.Reply = Adapter ? 1 : 0; + + if( Adapter ) { + Adapter->DhclientState.state = S_REBOOTING; + send_discover( &Adapter->DhclientInfo ); + } + + ApiUnlock(); + + return Send( &Reply ); +} + +DWORD DSQueryHWInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { + COMM_DHCP_REPLY Reply; + PDHCP_ADAPTER Adapter; + + ApiLock(); + + Adapter = AdapterFindIndex( Req->AdapterIndex ); + + Reply.QueryHWInfo.AdapterIndex = Req->AdapterIndex; + Reply.QueryHWInfo.MediaType = Adapter->IfMib.dwType; + Reply.QueryHWInfo.Mtu = Adapter->IfMib.dwMtu; + Reply.QueryHWInfo.Speed = Adapter->IfMib.dwSpeed; + + ApiUnlock(); + + return Send( &Reply ); +} + +DWORD DSReleaseIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { + COMM_DHCP_REPLY Reply; + PDHCP_ADAPTER Adapter; + + ApiLock(); + + Adapter = AdapterFindIndex( Req->AdapterIndex ); + + Reply.Reply = Adapter ? 1 : 0; + + if( Adapter ) { + DeleteIPAddress( Adapter->NteContext ); + } + + ApiUnlock(); + + return Send( &Reply ); +} + +DWORD DSRenewIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { + COMM_DHCP_REPLY Reply; + PDHCP_ADAPTER Adapter; + + ApiLock(); + + Adapter = AdapterFindIndex( Req->AdapterIndex ); + + Reply.Reply = Adapter ? 1 : 0; + + if( !Adapter || Adapter->DhclientState.state != S_BOUND ) { + Reply.Reply = 0; + return Send( &Reply ); + } + + Adapter->DhclientState.state = S_BOUND; + + state_bound( &Adapter->DhclientInfo ); + + ApiUnlock(); + + return Send( &Reply ); +} + +DWORD DSStaticRefreshParams( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { + NTSTATUS Status; + COMM_DHCP_REPLY Reply; + PDHCP_ADAPTER Adapter; + + ApiLock(); + + Adapter = AdapterFindIndex( Req->AdapterIndex ); + + Reply.Reply = Adapter ? 1 : 0; + + if( Adapter ) { + DeleteIPAddress( Adapter->NteContext ); + Adapter->DhclientState.state = S_BOUND; + Status = AddIPAddress( Req->Body.StaticRefreshParams.IPAddress, + Req->Body.StaticRefreshParams.Netmask, + Req->AdapterIndex, + &Adapter->NteContext, + &Adapter->NteInstance ); + Reply.Reply = NT_SUCCESS(Status); + } + + ApiUnlock(); + + return Send( &Reply ); +} _____ Modified: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-12 21:25:58 UTC (rev 14598) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-12 23:23:26 UTC (rev 14599) @@ -259,7 +259,9 @@ int pipe_fd[2]; struct passwd *pw; + ApiInit(); AdapterInit(); + PipeInit(); tzset(); time(&cur_time); _____ Modified: trunk/reactos/subsys/system/dhcp/dispatch.c --- trunk/reactos/subsys/system/dhcp/dispatch.c 2005-04-12 21:25:58 UTC (rev 14598) +++ trunk/reactos/subsys/system/dhcp/dispatch.c 2005-04-12 23:23:26 UTC (rev 14599) @@ -199,6 +199,8 @@ time_t howlong; struct timeval timeval; + ApiLock(); + for (l = protocols; l; l = l->next) nfds++; @@ -269,9 +271,14 @@ timeval.tv_usec = (to_msec % 1000) * 1000; DH_DbgPrint(MID_TRACE,("select(%d,%d.%03d) =>\n", nfds,timeval.tv_sec,timeval.tv_usec/1000)); + + ApiUnlock(); + count = select(nfds, &fds, NULL, NULL, &timeval); DH_DbgPrint(MID_TRACE,(" => %d\n", count)); + ApiLock(); + /* Not likely to be transitory... */ if (count == SOCKET_ERROR) { if (errno == EAGAIN || errno == EINTR) { @@ -304,6 +311,8 @@ } DH_DbgPrint(MID_TRACE,("Done\n")); } while (1); + + ApiUnlock(); /* Not reached currently */ } void _____ Modified: trunk/reactos/subsys/system/dhcp/include/dhcpd.h --- trunk/reactos/subsys/system/dhcp/include/dhcpd.h 2005-04-12 21:25:58 UTC (rev 14598) +++ trunk/reactos/subsys/system/dhcp/include/dhcpd.h 2005-04-12 23:23:26 UTC (rev 14599) @@ -93,33 +93,17 @@ #define USE_SOCKET_SEND #include <sys/types.h> - -//#include <sys/socket.h> -//#include <sys/sockio.h> #include <sys/stat.h> #include <sys/time.h> -//#include <sys/un.h> -//#include <sys/wait.h> - -//#include <net/if.h> -//#include <net/if_dl.h> -//#include <net/route.h> - -//#include <netinet/in.h> -//#include <arpa/inet.h> - #include <ctype.h> #include <errno.h> #include <fcntl.h> #include <limits.h> -//#include <netdb.h> -//#include <paths.h> #include <unistd.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -//#include <syslog.h> #include <time.h> #include <unistd.h> _____ Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h --- trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-04-12 21:25:58 UTC (rev 14598) +++ trunk/reactos/subsys/system/dhcp/include/rosdhcp.h 2005-04-12 23:23:26 UTC (rev 14599) @@ -7,6 +7,7 @@ #include <iprtrmib.h> #include <iphlpapi.h> #include <winsock2.h> +#include <dhcpcsdk.h> #include <stdio.h> #include <setjmp.h> #include "stdint.h" @@ -41,6 +42,7 @@ MIB_IFROW IfMib; MIB_IPADDRROW IfAddr; SOCKADDR Address; + ULONG NteContext,NteInstance; struct interface_info DhclientInfo; struct client_state DhclientState; struct client_config DhclientConfig; @@ -49,7 +51,20 @@ char recv_buf[1]; } DHCP_ADAPTER, *PDHCP_ADAPTER; +#include <rosdhcp_public.h> + +typedef DWORD (*PipeSendFunc)( COMM_DHCP_REPLY *Reply ); + #define random rand #define srandom srand +extern PDHCP_ADAPTER AdapterFindIndex( unsigned int AdapterIndex ); +extern VOID ApiInit(); +extern VOID ApiLock(); +extern VOID ApiUnlock(); +extern DWORD DSQueryHWInfo( PipeSendFunc Send, COMM_DHCP_REQ *Req ); +extern DWORD DSLeaseIpAddress( PipeSendFunc Send, COMM_DHCP_REQ *Req ); +extern DWORD DSRenewIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ); +extern DWORD DSReleaseIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ); + #endif/*ROSDHCP_H*/ _____ Added: trunk/reactos/subsys/system/dhcp/pipe.c --- trunk/reactos/subsys/system/dhcp/pipe.c 2005-04-12 21:25:58 UTC (rev 14598) +++ trunk/reactos/subsys/system/dhcp/pipe.c 2005-04-12 23:23:26 UTC (rev 14599) @@ -0,0 +1,90 @@ +/* $Id: $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: subsys/system/dhcp/pipe.c + * PURPOSE: DHCP client pipe + * PROGRAMMER: arty + */ + +#include <rosdhcp.h> + +static HANDLE CommPipe = INVALID_HANDLE_VALUE, CommThread; +DWORD CommThrId; + +#define COMM_PIPE_OUTPUT_BUFFER sizeof(COMM_DHCP_REQ) +#define COMM_PIPE_INPUT_BUFFER sizeof(COMM_DHCP_REPLY) +#define COMM_PIPE_DEFAULT_TIMEOUT 1000 + +DWORD PipeSend( COMM_DHCP_REPLY *Reply ) { + DWORD Written = 0; + BOOL Success = + WriteFile( CommPipe, + Reply, + sizeof(*Reply), + &Written, + NULL ); + return Success ? Written : -1; +} + +DWORD WINAPI PipeThreadProc( LPVOID Parameter ) { + DWORD BytesRead, BytesWritten; + COMM_DHCP_REQ Req; + BOOL Result; + HANDLE Connection; + + while( (Connection = ConnectNamedPipe( CommPipe, NULL )) ) { + Result = ReadFile( Connection, &Req, sizeof(Req), &BytesRead, NULL ); + if( Result ) { + switch( Req.Type ) { + case DhcpReqQueryHWInfo: + BytesWritten = DSQueryHWInfo( PipeSend, &Req ); + break; + + case DhcpReqLeaseIpAddress: + BytesWritten = DSLeaseIpAddress( PipeSend, &Req ); + break; + + case DhcpReqReleaseIpAddress: + BytesWritten = DSReleaseIpAddressLease( PipeSend, &Req ); + break; + + case DhcpReqRenewIpAddress: + BytesWritten = DSRenewIpAddressLease( PipeSend, &Req ); + break; + } + } + CloseHandle( Connection ); + } +} + +HANDLE PipeInit() { + CommPipe = CreateNamedPipe + ( DHCP_PIPE_NAME, + PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, + COMM_PIPE_OUTPUT_BUFFER, + COMM_PIPE_INPUT_BUFFER, + COMM_PIPE_DEFAULT_TIMEOUT, + NULL ); + + if( CommPipe == INVALID_HANDLE_VALUE ) { + DbgPrint("DHCP: Could not create named pipe\n"); + return CommPipe; + } + + CommThread = CreateThread( NULL, 0, PipeThreadProc, NULL, 0, &CommThrId ); + + if( !CommThread ) { + CloseHandle( CommPipe ); + CommPipe = INVALID_HANDLE_VALUE; + } + + return CommPipe; +} + +VOID PipeDestroy() { + CloseHandle( CommPipe ); + CommPipe = INVALID_HANDLE_VALUE; +}

19 years, 5 months

[ea] 14598: SM: some server side code for SM_API_QUERY_INFORMATION

by ea＠svn.reactos.com

SM: some server side code for SM_API_QUERY_INFORMATION Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/makefile Modified: trunk/reactos/subsys/smss/smapiquery.c Modified: trunk/reactos/subsys/smss/smss.c Modified: trunk/reactos/subsys/smss/smss.h _____ Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-04-11 22:38:53 UTC (rev 14597) +++ trunk/reactos/subsys/smss/client.c 2005-04-12 21:25:58 UTC (rev 14598) @@ -276,4 +276,49 @@ return Status; } +/* === Utilities for SmQryInfo === */ + +/********************************************************************** + * SmGetClientBasicInformation/1 + */ +NTSTATUS FASTCALL +SmGetClientBasicInformation (PSM_BASIC_INFORMATION i) +{ + INT Index = 0; + PSM_CLIENT_DATA Client = NULL; + + DPRINT("SM: %s called\n", __FUNCTION__); + + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + + i->SubSystemCount = SmpClientDirectory.Count; + i->Unused = 0; + + if (SmpClientDirectory.Count > 0) + { + Client = SmpClientDirectory.Client; + while ((NULL != Client) && (Index < SM_QRYINFO_MAX_SS_COUNT)) + { + i->SubSystem[Index].Id = Client->SubsystemId; + i->SubSystem[Index].Flags = 0; /* TODO */ + i->SubSystem[Index].ProcessId = 0; /* TODO */ + Client = Client->Next; + } + } + + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return STATUS_SUCCESS; +} + +/********************************************************************** + * SmGetSubSystemInformation/1 + */ +NTSTATUS FASTCALL +SmGetSubSystemInformation (PSM_SUBSYSTEM_INFORMATION i) +{ + DPRINT("SM: %s called\n", __FUNCTION__); + + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */ _____ Modified: trunk/reactos/subsys/smss/makefile --- trunk/reactos/subsys/smss/makefile 2005-04-11 22:38:53 UTC (rev 14597) +++ trunk/reactos/subsys/smss/makefile 2005-04-12 21:25:58 UTC (rev 14598) @@ -24,8 +24,12 @@ smapi.o smapicomp.o smapiexec.o smapiquery.o \ client.o debug.o print.o +DEP_OBJECTS = $(TARGET_OBJECTS) + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk +include $(TOOLS_PATH)/depend.mk + # EOF _____ Modified: trunk/reactos/subsys/smss/smapiquery.c --- trunk/reactos/subsys/smss/smapiquery.c 2005-04-11 22:38:53 UTC (rev 14597) +++ trunk/reactos/subsys/smss/smapiquery.c 2005-04-12 21:25:58 UTC (rev 14598) @@ -1,4 +1,4 @@ -/* $Id: $ +/* $Id$ * * smapiquery.c - SM_API_QUERY_INFORMATION * @@ -37,8 +37,33 @@ NTSTATUS Status = STATUS_SUCCESS; DPRINT("SM: %s called\n", __FUNCTION__); - - Request->SmHeader.Status = STATUS_NOT_IMPLEMENTED; + + switch (Request->Request.QryInfo.SmInformationClass) + { + case SmBasicInformation: + if(Request->Request.QryInfo.DataLength != sizeof (SM_BASIC_INFORMATION)) + { + Request->Reply.QryInfo.DataLength = sizeof (SM_BASIC_INFORMATION); + Request->SmHeader.Status = STATUS_INFO_LENGTH_MISMATCH; + }else{ + Request->SmHeader.Status = + SmGetClientBasicInformation (& Request->Reply.QryInfo.BasicInformation); + } + break; + case SmSubSystemInformation: + if(Request->Request.QryInfo.DataLength != sizeof (SM_SUBSYSTEM_INFORMATION)) + { + Request->Reply.QryInfo.DataLength = sizeof (SM_SUBSYSTEM_INFORMATION); + Request->SmHeader.Status = STATUS_INFO_LENGTH_MISMATCH; + }else{ + Request->SmHeader.Status = + SmGetSubSystemInformation (& Request->Reply.QryInfo.SubSystemInformation); + } + break; + default: + Request->SmHeader.Status = STATUS_NOT_IMPLEMENTED; + break; + } return Status; } _____ Modified: trunk/reactos/subsys/smss/smss.c --- trunk/reactos/subsys/smss/smss.c 2005-04-11 22:38:53 UTC (rev 14597) +++ trunk/reactos/subsys/smss/smss.c 2005-04-12 21:25:58 UTC (rev 14598) @@ -56,6 +56,7 @@ } /* Initialize the system */ Status = InitSessionManager(); + /* Watch required subsystems TODO */ #if 0 if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/subsys/smss/smss.h --- trunk/reactos/subsys/smss/smss.h 2005-04-11 22:38:53 UTC (rev 14597) +++ trunk/reactos/subsys/smss/smss.h 2005-04-12 21:25:58 UTC (rev 14598) @@ -96,6 +96,8 @@ NTSTATUS STDCALL SmCreateClient(PSM_PORT_MESSAGE,PSM_CLIENT_DATA*); NTSTATUS STDCALL SmDestroyClient(ULONG); NTSTATUS STDCALL SmCompleteClientInitialization (HANDLE hProcess); +NTSTATUS FASTCALL SmGetClientBasicInformation (PSM_BASIC_INFORMATION); +NTSTATUS FASTCALL SmGetSubSystemInformation (PSM_SUBSYSTEM_INFORMATION); /* debug.c */ extern HANDLE DbgSsApiPort;

19 years, 5 months

[hpoussin] 14597: Remove unneeded hack. DriverEntry is now called only once.

by hpoussin＠svn.reactos.com

Remove unneeded hack. DriverEntry is now called only once. Modified: trunk/reactos/drivers/dd/serial/serial.c _____ Modified: trunk/reactos/drivers/dd/serial/serial.c --- trunk/reactos/drivers/dd/serial/serial.c 2005-04-11 22:38:05 UTC (rev 14596) +++ trunk/reactos/drivers/dd/serial/serial.c 2005-04-11 22:38:53 UTC (rev 14597) @@ -26,7 +26,6 @@ IN PUNICODE_STRING RegPath) { ULONG i; - static BOOLEAN FirstTime = TRUE; DriverObject->DriverUnload = DriverUnload; DriverObject->DriverExtension->AddDevice = SerialAddDevice; @@ -43,16 +42,5 @@ DriverObject->MajorFunction[IRP_MJ_PNP] = SerialPnp; DriverObject->MajorFunction[IRP_MJ_POWER] = SerialPower; - /* FIXME: It seems that DriverEntry function may be called more - * than once. Do only legacy detection the first time. */ - if (FirstTime) - { - FirstTime = FALSE; - return DetectLegacyDevices(DriverObject); - } - else - { - DPRINT1("Serial: DriverEntry called for the second time!\n"); - return STATUS_SUCCESS; - } + return DetectLegacyDevices(DriverObject); }

19 years, 5 months

[hpoussin] 14596: Respect OBJ_OPENIF flag in ObCreateObject

by hpoussin＠svn.reactos.com

Respect OBJ_OPENIF flag in ObCreateObject Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-04-11 22:37:46 UTC (rev 14595) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-04-11 22:38:05 UTC (rev 14596) @@ -60,7 +60,7 @@ InitializeObjectAttributes(&ObjectAttributes, ObjectPath, - Attributes, + Attributes | OBJ_OPENIF, NULL, NULL); Status = ObFindObject(&ObjectAttributes, _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-04-11 22:37:46 UTC (rev 14595) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-04-11 22:38:05 UTC (rev 14596) @@ -712,7 +712,8 @@ if (ParentHeader && RemainingPath.Buffer == NULL) { - if (ParentHeader->ObjectType != Type) + if (ParentHeader->ObjectType != Type + || !(ObjectAttributes->Attributes & OBJ_OPENIF)) { ObDereferenceObject(Parent); return STATUS_OBJECT_NAME_COLLISION;

19 years, 5 months

[hpoussin] 14595: Open \Windows directory if it exists

by hpoussin＠svn.reactos.com

Open \Windows directory if it exists Modified: trunk/reactos/subsys/csrss/init.c _____ Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-04-11 22:29:31 UTC (rev 14594) +++ trunk/reactos/subsys/csrss/init.c 2005-04-11 22:37:46 UTC (rev 14595) @@ -131,7 +131,7 @@ InitializeObjectAttributes (&Attributes, &CsrDirectoryName, - 0, + OBJ_OPENIF, NULL, NULL);

19 years, 5 months

[hpoussin] 14594: Don't call DriverEntry more than once. Fix suggested by Filip Navara.

by hpoussin＠svn.reactos.com

Don't call DriverEntry more than once. Fix suggested by Filip Navara. Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-04-11 21:50:15 UTC (rev 14593) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-04-11 22:29:31 UTC (rev 14594) @@ -478,6 +478,7 @@ IopCreateDriverObject( PDRIVER_OBJECT *DriverObject, PUNICODE_STRING ServiceName, + ULONG CreateAttributes, BOOLEAN FileSystemDriver, PVOID DriverImageStart, ULONG DriverImageSize); _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-04-11 21:50:15 UTC (rev 14593) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-04-11 22:29:31 UTC (rev 14594) @@ -199,6 +199,7 @@ IopCreateDriverObject( PDRIVER_OBJECT *DriverObject, PUNICODE_STRING ServiceName, + ULONG CreateAttributes, BOOLEAN FileSystem, PVOID DriverImageStart, ULONG DriverImageSize) @@ -240,7 +241,7 @@ InitializeObjectAttributes( &ObjectAttributes, &DriverName, - OBJ_PERMANENT, + CreateAttributes | OBJ_PERMANENT, NULL, NULL); @@ -265,9 +266,14 @@ Object->DriverSize = DriverImageSize; if (Buffer) { - Object->DriverName.Buffer = Buffer; - Object->DriverName.Length = Object->DriverName.MaximumLength = DriverName.Length; - RtlCopyMemory(Object->DriverName.Buffer, DriverName.Buffer, DriverName.Length); + if (!Object->DriverName.Buffer) + { + Object->DriverName.Buffer = Buffer; + Object->DriverName.Length = Object->DriverName.MaximumLength = DriverName.Length; + RtlCopyMemory(Object->DriverName.Buffer, DriverName.Buffer, DriverName.Length); + } + else + ExFreePool(Buffer); } *DriverObject = Object; @@ -479,7 +485,7 @@ else { DPRINT("Module already loaded\n"); - Status = STATUS_SUCCESS; + Status = STATUS_IMAGE_ALREADY_LOADED; } RtlFreeUnicodeString(&ServiceImagePath); @@ -538,6 +544,7 @@ Status = IopCreateDriverObject( DriverObject, ServiceName, + 0, FileSystemDriver, ModuleObject->Base, ModuleObject->Length); @@ -614,13 +621,29 @@ /* Load and initialize the filter driver */ Status = IopLoadServiceModule(&ServiceName, &ModuleObject); - if (!NT_SUCCESS(Status)) - continue; + if (Status != STATUS_IMAGE_ALREADY_LOADED) + { + if (!NT_SUCCESS(Status)) + continue; - Status = IopInitializeDriverModule(DeviceNode, ModuleObject, &ServiceName, - FALSE, &DriverObject); - if (!NT_SUCCESS(Status)) - continue; + Status = IopInitializeDriverModule(DeviceNode, ModuleObject, &ServiceName, + FALSE, &DriverObject); + if (!NT_SUCCESS(Status)) + continue; + } + else + { + /* get existing DriverObject pointer */ + Status = IopCreateDriverObject( + &DriverObject, + &ServiceName, + OBJ_OPENIF, + FALSE, + ModuleObject->Base, + ModuleObject->Length); + if (!NT_SUCCESS(Status)) + continue; + } Status = IopInitializeDevice(DeviceNode, DriverObject); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-04-11 21:50:15 UTC (rev 14593) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-04-11 22:29:31 UTC (rev 14594) @@ -1499,10 +1499,22 @@ PDRIVER_OBJECT DriverObject; Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) { - Status = IopInitializeDriverModule(DeviceNode, ModuleObject, - &DeviceNode->ServiceName, FALSE, &DriverObject); + if (Status != STATUS_IMAGE_ALREADY_LOADED) + Status = IopInitializeDriverModule(DeviceNode, ModuleObject, + &DeviceNode->ServiceName, FALSE, &DriverObject); + else + { + /* get existing DriverObject pointer */ + Status = IopCreateDriverObject( + &DriverObject, + &DeviceNode->ServiceName, + OBJ_OPENIF, + FALSE, + ModuleObject->Base, + ModuleObject->Length); + } if (NT_SUCCESS(Status)) { /* Attach lower level filter drivers. */ @@ -1787,7 +1799,7 @@ * Create root device node */ - Status = IopCreateDriverObject(&IopRootDriverObject, NULL, FALSE, NULL, 0); + Status = IopCreateDriverObject(&IopRootDriverObject, NULL, 0, FALSE, NULL, 0); if (!NT_SUCCESS(Status)) { CPRINT("IoCreateDriverObject() failed\n");

19 years, 5 months

[weiden] 14593: support kernel handles, creating them is however not yet supported

by weiden＠svn.reactos.com

support kernel handles, creating them is however not yet supported Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/ob/handle.c Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-04-11 20:27:20 UTC (rev 14592) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-04-11 21:50:15 UTC (rev 14593) @@ -242,7 +242,15 @@ extern PDIRECTORY_OBJECT NameSpaceRoot; extern POBJECT_TYPE ObSymbolicLinkType; +extern PHANDLE_TABLE ObpKernelHandleTable; +#define KERNEL_HANDLE_FLAG (1 << ((sizeof(HANDLE) * 8) - 1)) +#define ObIsKernelHandle(Handle, ProcessorMode) \ + (((ULONG_PTR)(Handle) & KERNEL_HANDLE_FLAG) && \ + ((ProcessorMode) == KernelMode)) +#define ObKernelHandleToHandle(Handle) \ + (HANDLE)((ULONG_PTR)(Handle) & ~KERNEL_HANDLE_FLAG) + VOID ObpAddEntryDirectory(PDIRECTORY_OBJECT Parent, POBJECT_HEADER Header, PWSTR Name); @@ -267,10 +275,6 @@ VOID ObDeleteHandleTable(struct _EPROCESS* Process); NTSTATUS -ObDeleteHandle(PEPROCESS Process, - HANDLE Handle); - -NTSTATUS ObpQueryHandleAttributes(HANDLE Handle, POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo); _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-04-11 20:27:20 UTC (rev 14592) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-04-11 21:50:15 UTC (rev 14593) @@ -42,6 +42,10 @@ #define GENERIC_ANY (GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL) +/* GLOBALS *****************************************************************/ + +PHANDLE_TABLE ObpKernelHandleTable = NULL; + /* FUNCTIONS ***************************************************************/ VOID @@ -51,7 +55,7 @@ ObDeleteHandleTable(Process); } -VOID +static VOID ObpDecrementHandleCount(PVOID ObjectBody) { POBJECT_HEADER ObjectHeader = BODY_TO_HEADER(ObjectBody); @@ -76,19 +80,28 @@ ObpQueryHandleAttributes(HANDLE Handle, POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo) { - PEPROCESS Process; + PHANDLE_TABLE HandleTable; PHANDLE_TABLE_ENTRY HandleTableEntry; - LONG ExHandle = HANDLE_TO_EX_HANDLE(Handle); + LONG ExHandle; PAGED_CODE(); DPRINT("ObpQueryHandleAttributes(Handle %x)\n", Handle); + + if(ObIsKernelHandle(Handle, ExGetPreviousMode())) + { + HandleTable = ObpKernelHandleTable; + ExHandle = HANDLE_TO_EX_HANDLE(ObKernelHandleToHandle(Handle)); + } + else + { + HandleTable = PsGetCurrentProcess()->ObjectTable; + ExHandle = HANDLE_TO_EX_HANDLE(Handle); + } KeEnterCriticalRegion(); - Process = PsGetCurrentProcess(); - - HandleTableEntry = ExMapHandleToPointer(Process->ObjectTable, + HandleTableEntry = ExMapHandleToPointer(HandleTable, ExHandle); if (HandleTableEntry == NULL) { @@ -99,7 +112,7 @@ HandleInfo->Inherit = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; HandleInfo->ProtectFromClose = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) != 0; - ExUnlockHandleTableEntry(Process->ObjectTable, + ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); KeLeaveCriticalRegion(); @@ -112,19 +125,28 @@ ObpSetHandleAttributes(HANDLE Handle, POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo) { - PEPROCESS Process; + PHANDLE_TABLE HandleTable; PHANDLE_TABLE_ENTRY HandleTableEntry; - LONG ExHandle = HANDLE_TO_EX_HANDLE(Handle); + LONG ExHandle; PAGED_CODE(); DPRINT("ObpSetHandleAttributes(Handle %x)\n", Handle); - Process = PsGetCurrentProcess(); + if(ObIsKernelHandle(Handle, ExGetPreviousMode())) + { + HandleTable = ObpKernelHandleTable; + ExHandle = HANDLE_TO_EX_HANDLE(ObKernelHandleToHandle(Handle)); + } + else + { + HandleTable = PsGetCurrentProcess()->ObjectTable; + ExHandle = HANDLE_TO_EX_HANDLE(Handle); + } KeEnterCriticalRegion(); - HandleTableEntry = ExMapHandleToPointer(Process->ObjectTable, + HandleTableEntry = ExMapHandleToPointer(HandleTable, ExHandle); if (HandleTableEntry == NULL) { @@ -144,7 +166,7 @@ /* FIXME: Do we need to set anything in the object header??? */ - ExUnlockHandleTableEntry(Process->ObjectTable, + ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); KeLeaveCriticalRegion(); @@ -153,6 +175,54 @@ } +static NTSTATUS +ObpDeleteHandle(PHANDLE_TABLE HandleTable, + HANDLE Handle) +{ + PHANDLE_TABLE_ENTRY HandleEntry; + PVOID Body; + POBJECT_HEADER ObjectHeader; + LONG ExHandle = HANDLE_TO_EX_HANDLE(Handle); + + PAGED_CODE(); + + DPRINT("ObpDeleteHandle(Handle %x)\n",Handle); + + KeEnterCriticalRegion(); + + HandleEntry = ExMapHandleToPointer(HandleTable, + ExHandle); + if(HandleEntry != NULL) + { + if(HandleEntry->u1.ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) + { + ExUnlockHandleTableEntry(HandleTable, + HandleEntry); + + KeLeaveCriticalRegion(); + + return STATUS_HANDLE_NOT_CLOSABLE; + } + + ObjectHeader = EX_HTE_TO_HDR(HandleEntry); + Body = HEADER_TO_BODY(ObjectHeader); + + ObpDecrementHandleCount(Body); + + /* destroy and unlock the handle entry */ + ExDestroyHandleByEntry(HandleTable, + HandleEntry, + ExHandle); + + KeLeaveCriticalRegion(); + + return STATUS_SUCCESS; + } + KeLeaveCriticalRegion(); + return STATUS_INVALID_HANDLE; +} + + NTSTATUS ObDuplicateObject(PEPROCESS SourceProcess, PEPROCESS TargetProcess, @@ -162,19 +232,32 @@ BOOLEAN InheritHandle, ULONG Options) { + PHANDLE_TABLE SourceHandleTable; PHANDLE_TABLE_ENTRY SourceHandleEntry; HANDLE_TABLE_ENTRY NewHandleEntry; PVOID ObjectBody; POBJECT_HEADER ObjectHeader; LONG ExTargetHandle; - LONG ExSourceHandle = HANDLE_TO_EX_HANDLE(SourceHandle); + LONG ExSourceHandle; ULONG NewHandleCount; PAGED_CODE(); + if(ObIsKernelHandle(SourceHandle, ExGetPreviousMode())) + { + SourceHandleTable = ObpKernelHandleTable; + SourceHandle = ObKernelHandleToHandle(SourceHandle); + } + else + { + SourceHandleTable = SourceProcess->ObjectTable; + } + + ExSourceHandle = HANDLE_TO_EX_HANDLE(SourceHandle); + KeEnterCriticalRegion(); - SourceHandleEntry = ExMapHandleToPointer(SourceProcess->ObjectTable, + SourceHandleEntry = ExMapHandleToPointer(SourceHandleTable, ExSourceHandle); if (SourceHandleEntry == NULL) { @@ -219,7 +302,7 @@ NewHandleCount = InterlockedIncrement(&ObjectHeader->HandleCount); ASSERT(NewHandleCount >= 2); - ExUnlockHandleTableEntry(SourceProcess->ObjectTable, + ExUnlockHandleTableEntry(SourceHandleTable, SourceHandleEntry); KeLeaveCriticalRegion(); @@ -231,8 +314,8 @@ { if (Options & DUPLICATE_CLOSE_SOURCE) { - ObDeleteHandle(SourceProcess, - SourceHandle); + ObpDeleteHandle(SourceHandleTable, + SourceHandle); } ObDereferenceObject(ObjectBody); @@ -384,8 +467,8 @@ if (Options & DUPLICATE_CLOSE_SOURCE) { - ObDeleteHandle(SourceProcess, - SourceHandle); + ObpDeleteHandle(SourceProcess->ObjectTable, + SourceHandle); } } } @@ -464,10 +547,7 @@ ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) { - ObReferenceObjectByPointer(HEADER_TO_BODY(ObjectHeader), - 0, - NULL, - UserMode); + ObReferenceObject(HEADER_TO_BODY(ObjectHeader)); } } @@ -504,54 +584,6 @@ NTSTATUS -ObDeleteHandle(PEPROCESS Process, - HANDLE Handle) -{ - PHANDLE_TABLE_ENTRY HandleEntry; - PVOID Body; - POBJECT_HEADER ObjectHeader; - LONG ExHandle = HANDLE_TO_EX_HANDLE(Handle); - - PAGED_CODE(); - - DPRINT("ObDeleteHandle(Handle %x)\n",Handle); - - KeEnterCriticalRegion(); - - HandleEntry = ExMapHandleToPointer(Process->ObjectTable, - ExHandle); - if(HandleEntry != NULL) - { - if(HandleEntry->u1.ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) - { - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleEntry); - - KeLeaveCriticalRegion(); - - return STATUS_HANDLE_NOT_CLOSABLE; - } - - ObjectHeader = EX_HTE_TO_HDR(HandleEntry); - Body = HEADER_TO_BODY(ObjectHeader); - - ObpDecrementHandleCount(Body); - - /* destroy and unlock the handle entry */ - ExDestroyHandleByEntry(Process->ObjectTable, - HandleEntry, - ExHandle); - - KeLeaveCriticalRegion(); - - return STATUS_SUCCESS; - } - KeLeaveCriticalRegion(); - return STATUS_INVALID_HANDLE; -} - - -NTSTATUS ObCreateHandle(PEPROCESS Process, PVOID ObjectBody, ACCESS_MASK GrantedAccess, @@ -685,11 +717,11 @@ { PHANDLE_TABLE_ENTRY HandleEntry; POBJECT_HEADER ObjectHeader; + PHANDLE_TABLE HandleTable; PVOID ObjectBody; ACCESS_MASK GrantedAccess; ULONG Attributes; - NTSTATUS Status; - LONG ExHandle = HANDLE_TO_EX_HANDLE(Handle); + LONG ExHandle; PAGED_CODE(); @@ -703,14 +735,9 @@ if (Handle == NtCurrentProcess() && (ObjectType == PsProcessType || ObjectType == NULL)) { - Status = ObReferenceObjectByPointer(PsGetCurrentProcess(), - PROCESS_ALL_ACCESS, - PsProcessType, - UserMode); - if (! NT_SUCCESS(Status)) - { - return Status; - } + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + + ObReferenceObject(CurrentProcess); if (HandleInformation != NULL) { @@ -718,8 +745,8 @@ HandleInformation->GrantedAccess = PROCESS_ALL_ACCESS; } - *Object = PsGetCurrentProcess(); - DPRINT("Referencing current process %x\n", PsGetCurrentProcess()); + *Object = CurrentProcess; + DPRINT("Referencing current process %x\n", CurrentProcess); return STATUS_SUCCESS; } else if (Handle == NtCurrentProcess()) @@ -731,14 +758,9 @@ if (Handle == NtCurrentThread() && (ObjectType == PsThreadType || ObjectType == NULL)) { - Status = ObReferenceObjectByPointer(PsGetCurrentThread(), - THREAD_ALL_ACCESS, - PsThreadType, - UserMode); - if (! NT_SUCCESS(Status)) - { - return Status; - } + PETHREAD CurrentThread = PsGetCurrentThread(); + + ObReferenceObject(CurrentThread); if (HandleInformation != NULL) { @@ -746,7 +768,7 @@ HandleInformation->GrantedAccess = THREAD_ALL_ACCESS; } - *Object = PsGetCurrentThread(); + *Object = CurrentThread; CHECKPOINT; return STATUS_SUCCESS; } @@ -763,9 +785,20 @@ DesiredAccess |= GENERIC_ALL; } + if(ObIsKernelHandle(Handle, AccessMode)) + { + HandleTable = ObpKernelHandleTable; + ExHandle = HANDLE_TO_EX_HANDLE(ObKernelHandleToHandle(Handle)); + } + else + { + HandleTable = PsGetCurrentProcess()->ObjectTable; + ExHandle = HANDLE_TO_EX_HANDLE(Handle); + } + KeEnterCriticalRegion(); - HandleEntry = ExMapHandleToPointer(PsGetCurrentProcess()->ObjectTable, + HandleEntry = ExMapHandleToPointer(HandleTable, ExHandle); if (HandleEntry == NULL) { @@ -777,13 +810,13 @@ ObjectHeader = EX_HTE_TO_HDR(HandleEntry); ObjectBody = HEADER_TO_BODY(ObjectHeader); - DPRINT("locked1: ObjectHeader: 0x%x [HT:0x%x]\n", ObjectHeader, PsGetCurrentProcess()->ObjectTable); + DPRINT("locked1: ObjectHeader: 0x%x [HT:0x%x]\n", ObjectHeader, HandleTable); if (ObjectType != NULL && ObjectType != ObjectHeader->ObjectType) { DPRINT("ObjectType mismatch: %wZ vs %wZ (handle 0x%x)\n", &ObjectType->TypeName, ObjectHeader->ObjectType ? &ObjectHeader->ObjectType->TypeName : NULL, Handle); - ExUnlockHandleTableEntry(PsGetCurrentProcess()->ObjectTable, + ExUnlockHandleTableEntry(HandleTable, HandleEntry); KeLeaveCriticalRegion(); @@ -804,7 +837,7 @@ rights than the handle can grant */ if(AccessMode != KernelMode && (~GrantedAccess & DesiredAccess)) { - ExUnlockHandleTableEntry(PsGetCurrentProcess()->ObjectTable, + ExUnlockHandleTableEntry(HandleTable, HandleEntry); KeLeaveCriticalRegion(); @@ -814,15 +847,13 @@ return(STATUS_ACCESS_DENIED); } - ObReferenceObjectByPointer(ObjectBody, - 0, - NULL, - UserMode); + ObReferenceObject(ObjectBody); + Attributes = HandleEntry->u1.ObAttributes & (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | EX_HANDLE_ENTRY_INHERITABLE | EX_HANDLE_ENTRY_AUDITONCLOSE); - ExUnlockHandleTableEntry(PsGetCurrentProcess()->ObjectTable, + ExUnlockHandleTableEntry(HandleTable, HandleEntry); KeLeaveCriticalRegion(); @@ -858,16 +889,30 @@ NTSTATUS STDCALL NtClose(IN HANDLE Handle) { + PHANDLE_TABLE HandleTable; NTSTATUS Status; PAGED_CODE(); - Status = ObDeleteHandle(PsGetCurrentProcess(), - Handle); + if(ObIsKernelHandle(Handle, ExGetPreviousMode())) + { + HandleTable = ObpKernelHandleTable; + Handle = ObKernelHandleToHandle(Handle); + } + else + { + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + Status = ObpDeleteHandle(HandleTable, + Handle); if (!NT_SUCCESS(Status)) { - if(((PEPROCESS)(KeGetCurrentThread()->ApcState.Process))->ExceptionPort) + if((ExGetPreviousMode() != KernelMode) && + (PsGetCurrentProcess()->ExceptionPort)) + { KeRaiseUserException(Status); + } return Status; } _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-04-11 20:27:20 UTC (rev 14592) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-04-11 21:50:15 UTC (rev 14593) @@ -286,6 +286,7 @@ PsInitClientIDManagment(); ObCreateHandleTable(NULL, FALSE, PsInitialSystemProcess); + ObpKernelHandleTable = PsInitialSystemProcess->ObjectTable; Status = PsCreateCidHandle(PsInitialSystemProcess, PsProcessType,

19 years, 5 months

← Newer
1
...
25
26
27
28
29
30
31
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005