Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[cgutman] 37011: - Merge aicom-network-fixes up to r37010 - Most of the port allocation problems are now fixed

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Oct 27 00:16:14 2008 New Revision: 37011 URL: http://svn.reactos.org/svn/reactos?rev=37011&view=rev Log: - Merge aicom-network-fixes up to r37010 - Most of the port allocation problems are now fixed Modified: trunk/reactos/drivers/network/tcpip/include/ports.h trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/network/ports.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/drivers/network/tcpip/include/ports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/ports.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/ports.h [iso-8859-1] Mon Oct 27 00:16:14 2008 @@ -16,7 +16,6 @@ PVOID ProtoBitBuffer; UINT StartingPort; UINT PortsToOversee; - UINT LastAllocatedPort; FAST_MUTEX Mutex; } PORT_SET, *PPORT_SET; Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Mon Oct 27 00:16:14 2008 @@ -285,6 +285,14 @@ case IPPROTO_TCP: AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); + + if (Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) + { + ExFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + AddrFile->Send = NULL; /* TCPSendData */ break; @@ -292,6 +300,14 @@ TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); AddrFile->Port = UDPAllocatePort(Address->Address[0].Address[0].sin_port); + + if (Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) + { + ExFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", AddrFile->Port, Address->Address[0].Address[0].sin_port)); Modified: trunk/reactos/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/por… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ports.c [iso-8859-1] Mon Oct 27 00:16:14 2008 @@ -15,8 +15,7 @@ UINT PortsToManage ) { PortSet->StartingPort = StartingPort; PortSet->PortsToOversee = PortsToManage; - PortSet->LastAllocatedPort = PortSet->StartingPort + - PortSet->PortsToOversee - 1; + PortSet->ProtoBitBuffer = PoolAllocateBuffer( (PortSet->PortsToOversee + 7) / 8 ); if(!PortSet->ProtoBitBuffer) return STATUS_INSUFFICIENT_RESOURCES; @@ -43,8 +42,13 @@ BOOLEAN Clear; Port = htons(Port); - ASSERT(Port >= PortSet->StartingPort); - ASSERT(Port < PortSet->StartingPort + PortSet->PortsToOversee); + + if ((Port < PortSet->StartingPort) || + (Port >= PortSet->StartingPort + PortSet->PortsToOversee)) + { + return FALSE; + } + Port -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); @@ -57,64 +61,41 @@ ULONG AllocateAnyPort( PPORT_SET PortSet ) { ULONG AllocatedPort; - ULONG Next; - - if (PortSet->StartingPort + PortSet->PortsToOversee <= - PortSet->LastAllocatedPort + 1) { - Next = PortSet->StartingPort; - } else { - Next = PortSet->LastAllocatedPort + 1; - } - Next -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); - AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Next ); + AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, 0 ); if( AllocatedPort != (ULONG)-1 ) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; - PortSet->LastAllocatedPort = AllocatedPort; + ExReleaseFastMutex( &PortSet->Mutex ); + return htons(AllocatedPort); } ExReleaseFastMutex( &PortSet->Mutex ); - AllocatedPort = htons(AllocatedPort); - - ASSERT(AllocatedPort >= PortSet->StartingPort); - ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); - - return AllocatedPort; + return -1; } ULONG AllocatePortFromRange( PPORT_SET PortSet, ULONG Lowest, ULONG Highest ) { ULONG AllocatedPort; - ULONG Next; - if (PortSet->StartingPort + PortSet->PortsToOversee <= - PortSet->LastAllocatedPort + 1) { - Next = PortSet->StartingPort; - } else { - Next = PortSet->LastAllocatedPort + 1; + if ((Lowest < PortSet->StartingPort) || + (Highest >= PortSet->StartingPort + PortSet->PortsToOversee)) + { + return -1; } - if (Next < Lowest || Highest <= Next) { - Next = Lowest; - } - Next -= PortSet->StartingPort; + Lowest -= PortSet->StartingPort; Highest -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); - AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Next ); - if( AllocatedPort != (ULONG)-1 && AllocatedPort >= Lowest && - AllocatedPort <= Highest) { + AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Lowest ); + if( AllocatedPort != (ULONG)-1 && AllocatedPort <= Highest) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; - PortSet->LastAllocatedPort = AllocatedPort; + ExReleaseFastMutex( &PortSet->Mutex ); + return htons(AllocatedPort); } ExReleaseFastMutex( &PortSet->Mutex ); - AllocatedPort = htons(AllocatedPort); - - ASSERT(AllocatedPort >= PortSet->StartingPort); - ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); - - return AllocatedPort; + return -1; } Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Mon Oct 27 00:16:14 2008 @@ -223,8 +223,10 @@ TI_DbgPrint(MID_TRACE,("About to get route to destination\n")); - if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) + if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { + FreeNdisPacket(Packet.NdisPacket); return STATUS_UNSUCCESSFUL; + } TI_DbgPrint(MID_TRACE,("About to send datagram\n")); Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Mon Oct 27 00:16:14 2008 @@ -33,15 +33,19 @@ */ { PUDP_HEADER UDPHeader; + NTSTATUS Status; TI_DbgPrint(MID_TRACE, ("Packet: %x NdisPacket %x\n", IPPacket, IPPacket->NdisPacket)); - AddGenericHeaderIPv4 + Status = AddGenericHeaderIPv4 ( RemoteAddress, RemotePort, LocalAddress, LocalPort, IPPacket, DataLength, IPPROTO_UDP, sizeof(UDP_HEADER), (PVOID *)&UDPHeader ); + + if (!NT_SUCCESS(Status)) + return Status; /* Build UDP header */ UDPHeader = (PUDP_HEADER)((ULONG_PTR)IPPacket->Data - sizeof(UDP_HEADER)); @@ -195,8 +199,10 @@ if( !NT_SUCCESS(Status) ) return Status; - if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) + if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { + FreeNdisPacket(Packet.NdisPacket); return STATUS_UNSUCCESSFUL; + } IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL ); @@ -305,7 +311,7 @@ NTSTATUS Status; - Status = PortsStartup( &UDPPorts, 1, 0xfffe ); + Status = PortsStartup( &UDPPorts, 1, UDP_STARTING_PORT + UDP_DYNAMIC_PORTS ); if( !NT_SUCCESS(Status) ) return Status;

16 years, 2 months

[cgutman] 37010: - Fix several port issues - We don't allocate ports out of range anymore - Dhcp doesn't crash when run from the command line anymore

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Oct 26 23:30:53 2008 New Revision: 37010 URL: http://svn.reactos.org/svn/reactos?rev=37010&view=rev Log: - Fix several port issues - We don't allocate ports out of range anymore - Dhcp doesn't crash when run from the command line anymore Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] Sun Oct 26 23:30:53 2008 @@ -44,7 +44,7 @@ Port = htons(Port); if ((Port < PortSet->StartingPort) || - (Port > PortSet->StartingPort + PortSet->PortsToOversee)) + (Port >= PortSet->StartingPort + PortSet->PortsToOversee)) { return FALSE; } @@ -67,19 +67,19 @@ if( AllocatedPort != (ULONG)-1 ) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; + ExReleaseFastMutex( &PortSet->Mutex ); + return htons(AllocatedPort); } ExReleaseFastMutex( &PortSet->Mutex ); - AllocatedPort = htons(AllocatedPort); - - return AllocatedPort; + return -1; } ULONG AllocatePortFromRange( PPORT_SET PortSet, ULONG Lowest, ULONG Highest ) { ULONG AllocatedPort; if ((Lowest < PortSet->StartingPort) || - (Highest > PortSet->StartingPort + PortSet->PortsToOversee)) + (Highest >= PortSet->StartingPort + PortSet->PortsToOversee)) { return -1; } @@ -92,10 +92,10 @@ if( AllocatedPort != (ULONG)-1 && AllocatedPort <= Highest) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; + ExReleaseFastMutex( &PortSet->Mutex ); + return htons(AllocatedPort); } ExReleaseFastMutex( &PortSet->Mutex ); - AllocatedPort = htons(AllocatedPort); - - return AllocatedPort; + return -1; } Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sun Oct 26 23:30:53 2008 @@ -311,7 +311,7 @@ NTSTATUS Status; - Status = PortsStartup( &UDPPorts, 1, 0xfffe ); + Status = PortsStartup( &UDPPorts, 1, UDP_STARTING_PORT + UDP_DYNAMIC_PORTS ); if( !NT_SUCCESS(Status) ) return Status;

16 years, 2 months

[cgutman] 37009: - Check that we got the port that we wanted if we specified one

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Oct 26 22:26:21 2008 New Revision: 37009 URL: http://svn.reactos.org/svn/reactos?rev=37009&view=rev Log: - Check that we got the port that we wanted if we specified one Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Oct 26 22:26:21 2008 @@ -285,6 +285,14 @@ case IPPROTO_TCP: AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); + + if (Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) + { + ExFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + AddrFile->Send = NULL; /* TCPSendData */ break; @@ -292,6 +300,14 @@ TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); AddrFile->Port = UDPAllocatePort(Address->Address[0].Address[0].sin_port); + + if (Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) + { + ExFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", AddrFile->Port, Address->Address[0].Address[0].sin_port));

16 years, 2 months

[tkreuzer] 37008: - Add TEB_SELF to asm.h - fix loading of TEB in fiber code This commit is dedicated to Alex

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 26 21:48:54 2008 New Revision: 37008 URL: http://svn.reactos.org/svn/reactos?rev=37008&view=rev Log: - Add TEB_SELF to asm.h - fix loading of TEB in fiber code This commit is dedicated to Alex Modified: trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] Sun Oct 26 21:48:54 2008 @@ -17,7 +17,7 @@ _SwitchToFiber@4: /* Get the TEB */ - mov edx, fs:[KGDT_R3_TEB] + mov edx, fs:[TEB_SELF] /* Get the Fiber */ mov eax, [edx+TEB_FIBER_DATA] Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=3700… ============================================================================== --- trunk/reactos/include/ndk/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/asm.h [iso-8859-1] Sun Oct 26 21:48:54 2008 @@ -412,6 +412,7 @@ #define TEB_STACK_BASE 0x4 #define TEB_STACK_LIMIT 0x8 #define TEB_FIBER_DATA 0x10 +#define TEB_SELF 0x18 #define TEB_PEB 0x30 #define TEB_EXCEPTION_CODE 0x1A4 #define TEB_ACTIVATION_CONTEXT_STACK_POINTER 0x1A8

16 years, 2 months

[ekohl] 37007: ERR -> TRACE

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 26 17:57:31 2008 New Revision: 37007 URL: http://svn.reactos.org/svn/reactos?rev=37007&view=rev Log: ERR -> TRACE Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Oct 26 17:57:31 2008 @@ -28,7 +28,7 @@ UCHAR *pszStringBinding; RPC_STATUS status; - ERR("SVCCTL_HANDLEA_bind() called\n"); + TRACE("SVCCTL_HANDLEA_bind() called\n"); status = RpcStringBindingComposeA((UCHAR *)szMachineName, (UCHAR *)"ncacn_np", @@ -66,7 +66,7 @@ { RPC_STATUS status; - ERR("SVCCTL_HANDLEA_unbind() called\n"); + TRACE("SVCCTL_HANDLEA_unbind() called\n"); status = RpcBindingFree(&hBinding); if (status) @@ -83,8 +83,7 @@ LPWSTR pszStringBinding; RPC_STATUS status; - ERR("SVCCTL_HANDLEW_bind() called\n"); - + TRACE("SVCCTL_HANDLEW_bind() called\n"); status = RpcStringBindingComposeW(szMachineName, L"ncacn_np", @@ -122,7 +121,7 @@ { RPC_STATUS status; - ERR("SVCCTL_HANDLEW_unbind() called\n"); + TRACE("SVCCTL_HANDLEW_unbind() called\n"); status = RpcBindingFree(&hBinding); if (status) @@ -139,8 +138,7 @@ LPWSTR pszStringBinding; RPC_STATUS status; - ERR("RPC_SERVICE_STATUS_HANDLE_bind() called\n"); - + TRACE("RPC_SERVICE_STATUS_HANDLE_bind() called\n"); status = RpcStringBindingComposeW(NULL, L"ncacn_np", @@ -178,7 +176,7 @@ { RPC_STATUS status; - ERR("RPC_SERVICE_STATUS_HANDLE_unbind() called\n"); + TRACE("RPC_SERVICE_STATUS_HANDLE_unbind() called\n"); status = RpcBindingFree(&hBinding); if (status)

16 years, 2 months

[ekohl] 37006: LSA: Get rid of the globally created binding handle and use the WIDL-generated custom binding handles and context handles instead.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 26 17:53:30 2008 New Revision: 37006 URL: http://svn.reactos.org/svn/reactos?rev=37006&view=rev Log: LSA: Get rid of the globally created binding handle and use the WIDL-generated custom binding handles and context handles instead. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/include/reactos/idl/lsa.idl Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Oct 26 17:53:30 2008 @@ -16,34 +16,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); -static handle_t LSABindingHandle = NULL; - -static VOID -LSAHandleUnbind(handle_t *Handle) -{ - RPC_STATUS status; - - if (*Handle == NULL) - return; - - status = RpcBindingFree(Handle); - if (status) - { - TRACE("RpcBindingFree returned 0x%x\n", status); - } -} - -static VOID -LSAHandleBind(VOID) -{ + +handle_t __RPC_USER +PLSAPR_SERVER_NAME_bind(PLSAPR_SERVER_NAME pszSystemName) +{ + handle_t hBinding = NULL; LPWSTR pszStringBinding; RPC_STATUS status; - handle_t Handle; - - if (LSABindingHandle != NULL) - return; - - status = RpcStringBindingComposeW(NULL, + + TRACE("PLSAPR_SERVER_NAME_bind() called\n"); + + status = RpcStringBindingComposeW(pszSystemName, L"ncacn_np", NULL, L"\\pipe\\lsarpc", @@ -52,12 +35,12 @@ if (status) { TRACE("RpcStringBindingCompose returned 0x%x\n", status); - return; + return NULL; } /* Set the binding handle that will be used to bind to the server. */ status = RpcBindingFromStringBindingW(pszStringBinding, - &Handle); + &hBinding); if (status) { TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); @@ -69,11 +52,22 @@ TRACE("RpcStringFree returned 0x%x\n", status); } - if (InterlockedCompareExchangePointer(&LSABindingHandle, - (PVOID)Handle, - NULL) != NULL) - { - LSAHandleUnbind(&Handle); + return hBinding; +} + + +void __RPC_USER +PLSAPR_SERVER_NAME_unbind(PLSAPR_SERVER_NAME pszSystemName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("PLSAPR_SERVER_NAME_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + TRACE("RpcBindingFree returned 0x%x\n", status); } } @@ -90,10 +84,7 @@ if (ObjectHandle == (LSA_HANDLE)0xcafe) return STATUS_SUCCESS; - LSAHandleBind(); - - return LsarClose(LSABindingHandle, - (unsigned long *)&ObjectHandle); + return LsarClose((PLSAPR_HANDLE)&ObjectHandle); } @@ -105,10 +96,7 @@ { TRACE("LsaDelete(0x%p) called\n", ObjectHandle); - LSAHandleBind(); - - return LsarDelete(LSABindingHandle, - (unsigned long)ObjectHandle); + return LsarDelete((LSAPR_HANDLE)ObjectHandle); } Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Oct 26 17:53:30 2008 @@ -123,9 +123,14 @@ } +void __RPC_USER LSAPR_HANDLE_rundown(LSAPR_HANDLE hHandle) +{ + +} + + /* Function 0 */ NTSTATUS LsarClose( - handle_t hBinding, LSAPR_HANDLE *ObjectHandle) { #if 0 @@ -153,7 +158,6 @@ /* Function 1 */ NTSTATUS LsarDelete( - handle_t hBinding, LSAPR_HANDLE ObjectHandle) { /* Deprecated */ @@ -163,7 +167,6 @@ /* Function 2 */ NTSTATUS LsarEnumeratePrivileges( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, @@ -176,7 +179,6 @@ /* Function 3 */ NTSTATUS LsarQuerySecurityObject( - handle_t hBinding, LSAPR_HANDLE ObjectHandle, SECURITY_INFORMATION SecurityInformation, PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor) @@ -188,7 +190,6 @@ /* Function 4 */ NTSTATUS LsarSetSecurityObject( - handle_t hBinding, LSAPR_HANDLE ObjectHandle, SECURITY_INFORMATION SecurityInformation, PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor) @@ -200,7 +201,7 @@ /* Function 5 */ NTSTATUS LsarChangePassword( - handle_t hBinding, + handle_t hBinding, /* FIXME */ PRPC_UNICODE_STRING String1, PRPC_UNICODE_STRING String2, PRPC_UNICODE_STRING String3, @@ -214,7 +215,6 @@ /* Function 6 */ NTSTATUS LsarOpenPolicy( - handle_t hBinding, LPWSTR SystemName, PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK DesiredAccess, @@ -227,7 +227,6 @@ /* Function 7 */ NTSTATUS LsarQueryInformationPolicy( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long PolicyInformation) @@ -239,7 +238,6 @@ /* Function 8 */ NTSTATUS LsarSetInformationPolicy( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long *PolicyInformation) @@ -251,7 +249,6 @@ /* Function 9 */ NTSTATUS LsarClearAuditLog( - handle_t hBinding, LSAPR_HANDLE ObjectHandle) { /* Deprecated */ @@ -261,7 +258,7 @@ /* Function 10 */ NTSTATUS LsarCreateAccount( - handle_t hBinding, + LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, ACCESS_MASK DesiredAccess, LSAPR_HANDLE *AccountHandle) @@ -273,7 +270,6 @@ /* Function 11 */ NTSTATUS LsarEnumerateAccounts( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer, @@ -286,7 +282,6 @@ /* Function 12 */ NTSTATUS LsarCreateTrustedDomain( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSAPR_TRUST_INFORMATION TrustedDomainInformation, ACCESS_MASK DesiredAccess, @@ -299,7 +294,6 @@ /* Function 13 */ NTSTATUS LsarEnumerateTrustedDomains( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer, @@ -312,7 +306,6 @@ /* Function 14 */ NTSTATUS LsarLookupNames( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -328,7 +321,6 @@ /* Function 15 */ NTSTATUS LsarLookupSids( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -343,7 +335,6 @@ /* Function 16 */ NTSTATUS LsarCreateSecret( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING SecretName, ACCESS_MASK DesiredAccess, @@ -356,7 +347,6 @@ /* Function 17 */ NTSTATUS LsarOpenAccount( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, ACCESS_MASK DesiredAccess, @@ -369,7 +359,6 @@ /* Function 18 */ NTSTATUS LsarEnumeratePrivilegesAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, PLSAPR_PRIVILEGE_SET *Privileges) { @@ -380,7 +369,6 @@ /* Function 19 */ NTSTATUS LsarAddPrivilegesToAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, PLSAPR_PRIVILEGE_SET Privileges) { @@ -391,7 +379,6 @@ /* Function 20 */ NTSTATUS LsarRemovePrivilegesFromAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, BOOL AllPrivileges, PLSAPR_PRIVILEGE_SET Privileges) @@ -403,7 +390,6 @@ /* Function 21 */ NTSTATUS LsarGetQuotasForAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, PQUOTA_LIMITS QuotaLimits) { @@ -414,7 +400,6 @@ /* Function 22 */ NTSTATUS LsarSetQuotasForAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, PQUOTA_LIMITS QuotaLimits) { @@ -425,7 +410,6 @@ /* Function 23 */ NTSTATUS LsarGetSystemAccessAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, ACCESS_MASK *SystemAccess) { @@ -436,7 +420,6 @@ /* Function 24 */ NTSTATUS LsarSetSystemAccessAccount( - handle_t hBinding, LSAPR_HANDLE AccountHandle, ACCESS_MASK SystemAccess) { @@ -447,7 +430,6 @@ /* Function 25 */ NTSTATUS LsarOpenTrustedDomain( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, ACCESS_MASK DesiredAccess, @@ -460,7 +442,6 @@ /* Function 26 */ NTSTATUS LsarQueryInfoTrustedDomain( - handle_t hBinding, LSAPR_HANDLE TrustedDomainHandle, TRUSTED_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation) @@ -472,7 +453,6 @@ /* Function 27 */ NTSTATUS LsarSetInformationTrustedDomain( - handle_t hBinding, LSAPR_HANDLE TrustedDomainHandle, TRUSTED_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation) @@ -484,7 +464,6 @@ /* Function 28 */ NTSTATUS LsarOpenSecret( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING SecretName, ACCESS_MASK DesiredAccess, @@ -497,7 +476,6 @@ /* Function 29 */ NTSTATUS LsarSetSecret( - handle_t hBinding, LSAPR_HANDLE *SecretHandle, PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, PLSAPR_CR_CIPHER_VALUE EncryptedOldValue) @@ -509,7 +487,6 @@ /* Function 30 */ NTSTATUS LsarQuerySecret( - handle_t hBinding, LSAPR_HANDLE SecretHandle, PLSAPR_CR_CIPHER_VALUE *EncryptedCurrentValue, PLARGE_INTEGER CurrentValueSetTime, @@ -523,7 +500,6 @@ /* Function 31 */ NTSTATUS LsarLookupPrivilegeValue( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING Name, PLUID Value) @@ -535,7 +511,6 @@ /* Function 32 */ NTSTATUS LsarLookupPrivilegeName( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLUID Value, PRPC_UNICODE_STRING *Name) @@ -547,7 +522,7 @@ /* Function 33 */ NTSTATUS LsarLookupPrivilegeDisplayName( - handle_t hBinding, + LSAPR_HANDLE PolicyHandle, /* FIXME */ USHORT *LanguageReturned) { UNIMPLEMENTED; @@ -557,7 +532,6 @@ /* Function 34 */ NTSTATUS LsarDeleteObject( - handle_t hBinding, LSAPR_HANDLE *ObjectHandle) { UNIMPLEMENTED; @@ -567,7 +541,6 @@ /* Function 35 */ NTSTATUS LsarEnumerateAccountsWithUserRight( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING UserRight, PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer) @@ -579,7 +552,6 @@ /* Function 36 */ NTSTATUS LsarEnmuerateAccountRights( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) @@ -591,7 +563,6 @@ /* Function 37 */ NTSTATUS LsarAddAccountRights( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) @@ -603,7 +574,6 @@ /* Function 38 */ NTSTATUS LsarRemoveAccountRights( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, BOOL AllRights, @@ -616,7 +586,6 @@ /* Function 39 */ NTSTATUS LsarQueryTrustedDomainInfo( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, TRUSTED_INFORMATION_CLASS InformationClass, @@ -629,7 +598,6 @@ /* Function 40 */ NTSTATUS LsarSetTrustedDomainInfo( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, TRUSTED_INFORMATION_CLASS InformationClass, @@ -642,7 +610,6 @@ /* Function 41 */ NTSTATUS LsarDeleteTrustedDomain( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid) { @@ -653,7 +620,6 @@ /* Function 42 */ NTSTATUS LsarStorePrivateData( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING KeyName, PLSAPR_CR_CIPHER_VALUE EncryptedData) @@ -665,7 +631,6 @@ /* Function 43 */ NTSTATUS LsarRetrievePrivateData( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING KeyName, PLSAPR_CR_CIPHER_VALUE *EncryptedData) @@ -677,7 +642,6 @@ /* Function 44 */ NTSTATUS LsarOpenPolicy2( - handle_t hBinding, LPWSTR SystemName, PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK DesiredAccess, @@ -690,7 +654,6 @@ /* Function 45 */ NTSTATUS LsarGetUserName( - handle_t hBinding, LPWSTR SystemName, PRPC_UNICODE_STRING *UserName, PRPC_UNICODE_STRING *DomainName) @@ -702,7 +665,6 @@ /* Function 46 */ NTSTATUS LsarQueryInformationPolicy2( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long *PolicyInformation) @@ -714,7 +676,6 @@ /* Function 47 */ NTSTATUS LsarSetInformationPolicy2( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long PolicyInformation) @@ -726,7 +687,6 @@ /* Function 48 */ NTSTATUS LsarQueryTrustedDomainInfoByName( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, POLICY_INFORMATION_CLASS InformationClass, @@ -739,7 +699,6 @@ /* Function 49 */ NTSTATUS LsarSetTrustedDomainInfoByName( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, POLICY_INFORMATION_CLASS InformationClass, @@ -752,7 +711,6 @@ /* Function 50 */ NTSTATUS LsarEnumerateTrustedDomainsEx( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer, @@ -765,7 +723,6 @@ /* Function 51 */ NTSTATUS LsarCreateTrustedDomainEx( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthentificationInformation, @@ -779,7 +736,6 @@ /* Function 52 */ NTSTATUS LsarSetPolicyReplicationHandle( - handle_t hBinding, PLSAPR_HANDLE PolicyHandle) { /* Deprecated */ @@ -789,7 +745,6 @@ /* Function 53 */ NTSTATUS LsarQueryDomainInformationPolicy( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long *PolicyInformation) @@ -801,7 +756,6 @@ /* Function 54 */ NTSTATUS LsarSetDomainInformationPolicy( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long PolicyInformation) @@ -813,7 +767,6 @@ /* Function 55 */ NTSTATUS LsarOpenTrustedDomainByName( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, ACCESS_MASK DesiredAccess, @@ -835,7 +788,6 @@ /* Function 57 */ NTSTATUS LsarLookupSids2( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -852,7 +804,6 @@ /* Function 58 */ NTSTATUS LsarLookupNames2( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -870,7 +821,6 @@ /* Function 59 */ NTSTATUS LsarCreateTrustedDomainEx2( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthentificationInformation, @@ -956,7 +906,6 @@ /* Function 68 */ NTSTATUS LsarLookupNames3( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -1010,7 +959,6 @@ /* Function 73 */ NTSTATUS LsarQueryForestTrustInformation( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1023,7 +971,6 @@ /* Function 74 */ NTSTATUS LsarSetForestTrustInformation( - handle_t hBinding, LSAPR_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1114,5 +1061,4 @@ return STATUS_NOT_IMPLEMENTED; } - /* EOF */ Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sun Oct 26 17:53:30 2008 @@ -4,7 +4,9 @@ #include <ms-dtyp.idl> -typedef /*[context_handle]*/ unsigned long LSAPR_HANDLE; +typedef [handle] LPWSTR PLSAPR_SERVER_NAME; + +typedef [context_handle] PVOID LSAPR_HANDLE; typedef LSAPR_HANDLE *PLSAPR_HANDLE; cpp_quote("#ifndef _WINNT_H") @@ -599,17 +601,14 @@ { /* Function 0 */ NTSTATUS LsarClose( - [in] handle_t hBinding, [in, out] LSAPR_HANDLE *ObjectHandle); /* Function 1 */ NTSTATUS LsarDelete( - [in] handle_t hBinding, [in] LSAPR_HANDLE ObjectHandle); /* Function 2 */ NTSTATUS LsarEnumeratePrivileges( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, @@ -617,21 +616,19 @@ /* Function 3 */ NTSTATUS LsarQuerySecurityObject( - [in] handle_t hBinding, [in] LSAPR_HANDLE ObjectHandle, [in] SECURITY_INFORMATION SecurityInformation, [out] PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor); /* Function 4 */ NTSTATUS LsarSetSecurityObject( - [in] handle_t hBinding, [in] LSAPR_HANDLE ObjectHandle, [in] SECURITY_INFORMATION SecurityInformation, [in] PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor); /* Function 5 */ NTSTATUS LsarChangePassword( - [in] handle_t hBinding, + [in] handle_t hBinding, /* FIXME */ [in] PRPC_UNICODE_STRING String1, [in] PRPC_UNICODE_STRING String2, [in] PRPC_UNICODE_STRING String3, @@ -640,15 +637,13 @@ /* Function 6 */ NTSTATUS LsarOpenPolicy( - [in] handle_t hBinding, - [in, unique] LPWSTR SystemName, + [in, unique] PLSAPR_SERVER_NAME SystemName, [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *PolicyHandle); /* Function 7 */ NTSTATUS LsarQueryInformationPolicy( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in] unsigned long PolicyInformation); @@ -656,7 +651,6 @@ /* Function 8 */ NTSTATUS LsarSetInformationPolicy( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out] unsigned long *PolicyInformation); @@ -664,19 +658,17 @@ /* Function 9 */ NTSTATUS LsarClearAuditLog( - [in] handle_t hBinding, [in] LSAPR_HANDLE ObjectHandle); /* Function 10 */ NTSTATUS LsarCreateAccount( - [in] handle_t hBinding, + [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *AccountHandle); /* Function 11 */ NTSTATUS LsarEnumerateAccounts( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer, @@ -684,7 +676,6 @@ /* Function 12 */ NTSTATUS LsarCreateTrustedDomain( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUST_INFORMATION TrustedDomainInformation, [in] ACCESS_MASK DesiredAccess, @@ -692,7 +683,6 @@ /* Function 13 */ NTSTATUS LsarEnumerateTrustedDomains( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer, @@ -700,7 +690,6 @@ /* Function 14 */ NTSTATUS LsarLookupNames( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -711,7 +700,6 @@ /* Function 15 */ NTSTATUS LsarLookupSids( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -721,7 +709,6 @@ /* Function 16 */ NTSTATUS LsarCreateSecret( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING SecretName, [in] ACCESS_MASK DesiredAccess, @@ -729,7 +716,6 @@ /* Function 17 */ NTSTATUS LsarOpenAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] ACCESS_MASK DesiredAccess, @@ -737,50 +723,42 @@ /* Function 18 */ NTSTATUS LsarEnumeratePrivilegesAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [out] PLSAPR_PRIVILEGE_SET *Privileges); /* Function 19 */ NTSTATUS LsarAddPrivilegesToAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [in] PLSAPR_PRIVILEGE_SET Privileges); /* Function 20 */ NTSTATUS LsarRemovePrivilegesFromAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [in] BOOL AllPrivileges, [in, unique] PLSAPR_PRIVILEGE_SET Privileges); /* Function 21 */ NTSTATUS LsarGetQuotasForAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [out] PQUOTA_LIMITS QuotaLimits); /* Function 22 */ NTSTATUS LsarSetQuotasForAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [in] PQUOTA_LIMITS QuotaLimits); /* Function 23 */ NTSTATUS LsarGetSystemAccessAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [out] ACCESS_MASK *SystemAccess); /* Function 24 */ NTSTATUS LsarSetSystemAccessAccount( - [in] handle_t hBinding, [in] LSAPR_HANDLE AccountHandle, [in] ACCESS_MASK SystemAccess); /* Function 25 */ NTSTATUS LsarOpenTrustedDomain( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] ACCESS_MASK DesiredAccess, @@ -788,21 +766,18 @@ /* Function 26 */ NTSTATUS LsarQueryInfoTrustedDomain( - [in] handle_t hBinding, [in] LSAPR_HANDLE TrustedDomainHandle, [in] TRUSTED_INFORMATION_CLASS InformationClass, [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation); /* Function 27 */ NTSTATUS LsarSetInformationTrustedDomain( - [in] handle_t hBinding, [in] LSAPR_HANDLE TrustedDomainHandle, [in] TRUSTED_INFORMATION_CLASS InformationClass, [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation); /* Function 28 */ NTSTATUS LsarOpenSecret( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING SecretName, [in] ACCESS_MASK DesiredAccess, @@ -810,14 +785,12 @@ /* Function 29 */ NTSTATUS LsarSetSecret( - [in] handle_t hBinding, [in] LSAPR_HANDLE *SecretHandle, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedOldValue); /* Function 30 */ NTSTATUS LsarQuerySecret( - [in] handle_t hBinding, [in] LSAPR_HANDLE SecretHandle, [in, out, unique] PLSAPR_CR_CIPHER_VALUE *EncryptedCurrentValue, [in, out, unique] PLARGE_INTEGER CurrentValueSetTime, @@ -826,23 +799,20 @@ /* Function 31 */ NTSTATUS LsarLookupPrivilegeValue( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING Name, [out] PLUID Value); /* Function 32 */ NTSTATUS LsarLookupPrivilegeName( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLUID Value, [out] PRPC_UNICODE_STRING *Name); /* Function 33 */ NTSTATUS LsarLookupPrivilegeDisplayName( - [in] handle_t hBinding, - /*[in] LSAPR_HANDLE PolicyHandle, - [in] PRPC_UNICODE_STRING Name, + [in] LSAPR_HANDLE PolicyHandle, /* FIXME */ + /*[in] PRPC_UNICODE_STRING Name, [in] USHORT ClientLanguage, [in] USHORT ClientSystemDefaultLanguage, [out] PRPC_UNICODE_STRING *DisplayName,*/ @@ -850,35 +820,30 @@ /* Function 34 */ NTSTATUS LsarDeleteObject( - [in] handle_t hBinding, [in, out] LSAPR_HANDLE *ObjectHandle); cpp_quote("#if _WIN32_WINNT >= 0x0351") /* Function 35 */ NTSTATUS LsarEnumerateAccountsWithUserRight( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in, unique] PRPC_UNICODE_STRING UserRight, [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer); /* Function 36 */ NTSTATUS LsarEnmuerateAccountRights( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [out] PLSAPR_USER_RIGHT_SET UserRights); /* Function 37 */ NTSTATUS LsarAddAccountRights( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] PLSAPR_USER_RIGHT_SET UserRights); /* Function 38 */ NTSTATUS LsarRemoveAccountRights( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] BOOL AllRights, @@ -886,7 +851,6 @@ /* Function 39 */ NTSTATUS LsarQueryTrustedDomainInfo( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] TRUSTED_INFORMATION_CLASS InformationClass, @@ -894,7 +858,6 @@ /* Function 40 */ NTSTATUS LsarSetTrustedDomainInfo( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] TRUSTED_INFORMATION_CLASS InformationClass, @@ -902,36 +865,31 @@ /* Function 41 */ NTSTATUS LsarDeleteTrustedDomain( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid); /* Function 42 */ NTSTATUS LsarStorePrivateData( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING KeyName, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedData); /* Function 43 */ NTSTATUS LsarRetrievePrivateData( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING KeyName, [in, out] PLSAPR_CR_CIPHER_VALUE *EncryptedData); /* Function 44 */ NTSTATUS LsarOpenPolicy2( - [in] handle_t hBinding, - [in, unique, string] LPWSTR SystemName, + [in, unique, string] PLSAPR_SERVER_NAME SystemName, [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *PolicyHandle); /* Function 45 */ NTSTATUS LsarGetUserName( - [in] handle_t hBinding, - [in, unique, string] LPWSTR SystemName, + [in, unique, string] PLSAPR_SERVER_NAME SystemName, [in, out] PRPC_UNICODE_STRING *UserName, [in, out, unique] PRPC_UNICODE_STRING *DomainName); @@ -939,7 +897,6 @@ /* Function 46 */ NTSTATUS LsarQueryInformationPolicy2( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out] unsigned long *PolicyInformation); @@ -947,7 +904,6 @@ /* Function 47 */ NTSTATUS LsarSetInformationPolicy2( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in] unsigned long PolicyInformation); @@ -955,7 +911,6 @@ /* Function 48 */ NTSTATUS LsarQueryTrustedDomainInfoByName( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] POLICY_INFORMATION_CLASS InformationClass, @@ -964,7 +919,6 @@ /* Function 49 */ NTSTATUS LsarSetTrustedDomainInfoByName( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] POLICY_INFORMATION_CLASS InformationClass, @@ -973,7 +927,6 @@ /* Function 50 */ NTSTATUS LsarEnumerateTrustedDomainsEx( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer, @@ -981,7 +934,6 @@ /* Function 51 */ NTSTATUS LsarCreateTrustedDomainEx( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthentificationInformation, @@ -990,12 +942,10 @@ /* Function 52 */ NTSTATUS LsarSetPolicyReplicationHandle( - [in] handle_t hBinding, [in, out] PLSAPR_HANDLE PolicyHandle); /* Function 53 */ NTSTATUS LsarQueryDomainInformationPolicy( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out] unsigned long *PolicyInformation); @@ -1003,7 +953,6 @@ /* Function 54 */ NTSTATUS LsarSetDomainInformationPolicy( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in] unsigned long PolicyInformation); @@ -1011,7 +960,6 @@ /* Function 55 */ NTSTATUS LsarOpenTrustedDomainByName( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] ACCESS_MASK DesiredAccess, @@ -1023,7 +971,6 @@ /* Function 57 */ NTSTATUS LsarLookupSids2( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -1035,7 +982,6 @@ /* Function 58 */ NTSTATUS LsarLookupNames2( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -1048,7 +994,6 @@ /* Function 59 */ NTSTATUS LsarCreateTrustedDomainEx2( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthentificationInformation, @@ -1091,7 +1036,6 @@ /* Function 68 */ NTSTATUS LsarLookupNames3( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -1120,7 +1064,6 @@ /* Function 73 */ NTSTATUS LsarQueryForestTrustInformation( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSA_UNICODE_STRING TrustedDomainName, [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1128,7 +1071,6 @@ /* Function 74 */ NTSTATUS LsarSetForestTrustInformation( - [in] handle_t hBinding, [in] LSAPR_HANDLE PolicyHandle, [in] PLSA_UNICODE_STRING TrustedDomainName, [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1142,7 +1084,7 @@ /* Function 76 */ NTSTATUS LsarLookupSids3( - [in] handle_t hBinding, + [in] handle_t hBinding, /* FIXME */ [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, [in, out] PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, @@ -1153,7 +1095,7 @@ /* Function 77 */ NTSTATUS LsarLookupNames4( - [in] handle_t hBinding, + [in] handle_t hBinding, /* FIXME */ [in] handle_t RpcHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names,

16 years, 2 months

[cgutman] 37005: - Fix a leak - Fail if the port is out of range

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Oct 26 16:44:18 2008 New Revision: 37005 URL: http://svn.reactos.org/svn/reactos?rev=37005&view=rev Log: - Fix a leak - Fail if the port is out of range Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] Sun Oct 26 16:44:18 2008 @@ -78,12 +78,11 @@ ULONG AllocatePortFromRange( PPORT_SET PortSet, ULONG Lowest, ULONG Highest ) { ULONG AllocatedPort; - - if (Lowest < PortSet->StartingPort) - Lowest = PortSet->StartingPort; - - if (Highest > PortSet->StartingPort + PortSet->PortsToOversee) - Highest = PortSet->StartingPort + PortSet->PortsToOversee; + if ((Lowest < PortSet->StartingPort) || + (Highest > PortSet->StartingPort + PortSet->PortsToOversee)) + { + return -1; + } Lowest -= PortSet->StartingPort; Highest -= PortSet->StartingPort; Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Sun Oct 26 16:44:18 2008 @@ -223,8 +223,10 @@ TI_DbgPrint(MID_TRACE,("About to get route to destination\n")); - if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) + if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { + FreeNdisPacket(Packet.NdisPacket); return STATUS_UNSUCCESSFUL; + } TI_DbgPrint(MID_TRACE,("About to send datagram\n"));

16 years, 2 months

[sginsberg] 37004: - Remove ntdll exports not applicable for amd64, fix a couple of broken export names and stub out RtlInitializeCriticalSectionEx until its parameters are determined - Add rtl and ntdll stubs for arch specific routines - Now ntdll almost links, but some missing crt support is left to do

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Oct 26 16:35:03 2008 New Revision: 37004 URL: http://svn.reactos.org/svn/reactos?rev=37004&view=rev Log: - Remove ntdll exports not applicable for amd64, fix a couple of broken export names and stub out RtlInitializeCriticalSectionEx until its parameters are determined - Add rtl and ntdll stubs for arch specific routines - Now ntdll almost links, but some missing crt support is left to do Added: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/ (with props) branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/stubs.c (with props) branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c (with props) Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] Sun Oct 26 16:35:03 2008 @@ -39,9 +39,6 @@ KiUserApcDispatcher KiUserCallbackDispatcher KiUserExceptionDispatcher -KiIntSystemCall -KiFastSystemCallRet -KiFastSystemCall LdrAccessResource LdrAddRefDll LdrDisableThreadCalloutsForDll @@ -475,7 +472,7 @@ RtlFreeUnicodeString RtlFreeUserThreadStack RtlGUIDFromString -RtlGeneratedotName +RtlGenerate8dot3Name RtlGetAce ;RtlGetCallersAddress RtlGetCompressionWorkSpaceSize @@ -488,7 +485,7 @@ RtlGetFullPathName_U RtlGetGroupSecurityDescriptor RtlGetLastNtStatus -RtlGetLastWinError +RtlGetLastWin32Error RtlGetLongestNtPathLength RtlGetNextRange RtlGetNtGlobalFlags @@ -519,7 +516,7 @@ RtlInitializeConditionVariable RtlInitializeContext RtlInitializeCriticalSection -RtlInitializeCriticalSectionEx +;RtlInitializeCriticalSectionEx RtlInitializeCriticalSectionAndSpinCount RtlInitializeGenericTable RtlInitializeGenericTableAvl @@ -533,26 +530,26 @@ RtlInsertElementGenericTableAvl RtlInsertElementGenericTableFull RtlInsertElementGenericTableFullAvl -RtlIntToUnicodeString +RtlInt64ToUnicodeString RtlIntegerToChar RtlIntegerToUnicodeString RtlInvertRangeList -RtlIpvAddressToStringA -RtlIpvAddressToStringExA -RtlIpvAddressToStringExW -RtlIpvAddressToStringW -RtlIpvStringToAddressA -RtlIpvStringToAddressExA -RtlIpvStringToAddressExW -RtlIpvStringToAddressW -RtlIpvAddressToStringA -RtlIpvAddressToStringExA -RtlIpvAddressToStringExW -RtlIpvAddressToStringW -RtlIpvStringToAddressA -RtlIpvStringToAddressExA -RtlIpvStringToAddressExW -RtlIpvStringToAddressW +RtlIpv4AddressToStringA +RtlIpv4AddressToStringExA +RtlIpv4AddressToStringExW +RtlIpv4AddressToStringW +RtlIpv4StringToAddressA +RtlIpv4StringToAddressExA +RtlIpv4StringToAddressExW +RtlIpv4StringToAddressW +RtlIpv6AddressToStringA +RtlIpv6AddressToStringExA +RtlIpv6AddressToStringExW +RtlIpv6AddressToStringW +RtlIpv6StringToAddressA +RtlIpv6StringToAddressExA +RtlIpv6StringToAddressExW +RtlIpv6StringToAddressW RtlIsDosDeviceName_U RtlIsGenericTableEmpty RtlIsGenericTableEmptyAvl @@ -635,11 +632,11 @@ ;RtlRemoteCall RtlRemoveVectoredExceptionHandler RtlResetRtlTranslations -RtlRestoreLastWinError=RtlSetLastWinError +RtlRestoreLastWin32Error=RtlSetLastWin32Error RtlRunDecodeUnicodeString RtlRunEncodeUnicodeString -RtlSecondsSinceToTime -RtlSecondsSinceToTime +RtlSecondsSince1970ToTime +RtlSecondsSince1980ToTime RtlSelfRelativeToAbsoluteSD RtlSelfRelativeToAbsoluteSD2 RtlSetAllBits @@ -653,8 +650,8 @@ RtlSetEnvironmentVariable RtlSetGroupSecurityDescriptor RtlSetInformationAcl -RtlSetLastWinError -RtlSetLastWinErrorAndNtStatusFromNtStatus +RtlSetLastWin32Error +RtlSetLastWin32ErrorAndNtStatusFromNtStatus RtlSetOwnerSecurityDescriptor RtlSetProcessIsCritical RtlSetSaclSecurityDescriptor @@ -970,19 +967,9 @@ __iscsym __iscsymf __toascii -_alldiv -_allmul -_alloca_probe -_allrem -_allshl -_allshr _atoi64 -_aulldiv -_aullrem -_aullshr _chkstk _fltused -_ftol _itoa _itow _i64toa Propchange: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Oct 26 16:35:03 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/stubs.c (added) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/stubs.c [iso-8859-1] Sun Oct 26 16:35:03 2008 @@ -1,0 +1,43 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NT Library + * FILE: dll/ntdll/dispatch/amd64/stubs.c + * PURPOSE: AMD64 stubs + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @unimplemented + */ +VOID +NTAPI +LdrInitializeThunk(ULONG Unknown1, // FIXME: Parameters! + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4) +{ + UNIMPLEMENTED; + return; +} + +/* + * @unimplemented + */ +VOID +NTAPI +KiUserApcDispatcher(IN PVOID NormalRoutine, + IN PVOID NormalContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + UNIMPLEMENTED; + return; +} Propchange: branches/ros-amd64-bringup/reactos/dll/ntdll/dispatch/amd64/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Sun Oct 26 16:35:03 2008 @@ -31,6 +31,11 @@ <file>dispatch.S</file> </directory> </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>stubs.c</file> + </directory> + </if> <if property="ARCH" value="arm"> <directory name="arm"> <file>stubs_asm.s</file> Added: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c (added) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] Sun Oct 26 16:35:03 2008 @@ -1,0 +1,77 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Run-Time Library + * PURPOSE: AMD64 stubs + * FILE: lib/rtl/amd64/stubs.c + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlLookupFunctionEntry(IN ULONGLONG ControlPC, + OUT PULONGLONG ImageBase, + OUT PULONGLONG TargetGp) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +VOID +NTAPI +RtlInitializeContext(IN HANDLE ProcessHandle, + OUT PCONTEXT ThreadContext, + IN PVOID ThreadStartParam OPTIONAL, + IN PTHREAD_START_ROUTINE ThreadStartAddress, + IN PINITIAL_TEB InitialTeb) +{ + UNIMPLEMENTED; + return; +} + +/* + * @unimplemented + */ +VOID +NTAPI +RtlCaptureContext(OUT PCONTEXT ContextRecord) +{ + UNIMPLEMENTED; + return; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +RtlpGetExceptionAddress(VOID) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +RtlDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Sun Oct 26 16:35:03 2008 @@ -39,7 +39,10 @@ <if property="ARCH" value="amd64"> <directory name="amd64"> <file>debug_asm.S</file> + <file>stubs.c</file> </directory> + <file>mem.c</file> + <file>memgen.c</file> </if> <directory name="austin"> <file>avl.c</file>

16 years, 2 months

[cgutman] 37003: - Simplify port allocation

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Oct 26 16:33:06 2008 New Revision: 37003 URL: http://svn.reactos.org/svn/reactos?rev=37003&view=rev Log: - Simplify port allocation Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h branches/aicom-network-fixes/lib/drivers/ip/network/ports.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h [iso-8859-1] Sun Oct 26 16:33:06 2008 @@ -16,7 +16,6 @@ PVOID ProtoBitBuffer; UINT StartingPort; UINT PortsToOversee; - UINT LastAllocatedPort; FAST_MUTEX Mutex; } PORT_SET, *PPORT_SET; Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] Sun Oct 26 16:33:06 2008 @@ -15,8 +15,7 @@ UINT PortsToManage ) { PortSet->StartingPort = StartingPort; PortSet->PortsToOversee = PortsToManage; - PortSet->LastAllocatedPort = PortSet->StartingPort + - PortSet->PortsToOversee - 1; + PortSet->ProtoBitBuffer = PoolAllocateBuffer( (PortSet->PortsToOversee + 7) / 8 ); if(!PortSet->ProtoBitBuffer) return STATUS_INSUFFICIENT_RESOURCES; @@ -43,8 +42,13 @@ BOOLEAN Clear; Port = htons(Port); - ASSERT(Port >= PortSet->StartingPort); - ASSERT(Port < PortSet->StartingPort + PortSet->PortsToOversee); + + if ((Port < PortSet->StartingPort) || + (Port > PortSet->StartingPort + PortSet->PortsToOversee)) + { + return FALSE; + } + Port -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); @@ -57,64 +61,42 @@ ULONG AllocateAnyPort( PPORT_SET PortSet ) { ULONG AllocatedPort; - ULONG Next; - - if (PortSet->StartingPort + PortSet->PortsToOversee <= - PortSet->LastAllocatedPort + 1) { - Next = PortSet->StartingPort; - } else { - Next = PortSet->LastAllocatedPort + 1; - } - Next -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); - AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Next ); + AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, 0 ); if( AllocatedPort != (ULONG)-1 ) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; - PortSet->LastAllocatedPort = AllocatedPort; } ExReleaseFastMutex( &PortSet->Mutex ); AllocatedPort = htons(AllocatedPort); - - ASSERT(AllocatedPort >= PortSet->StartingPort); - ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); return AllocatedPort; } ULONG AllocatePortFromRange( PPORT_SET PortSet, ULONG Lowest, ULONG Highest ) { ULONG AllocatedPort; - ULONG Next; - if (PortSet->StartingPort + PortSet->PortsToOversee <= - PortSet->LastAllocatedPort + 1) { - Next = PortSet->StartingPort; - } else { - Next = PortSet->LastAllocatedPort + 1; - } - if (Next < Lowest || Highest <= Next) { - Next = Lowest; - } - Next -= PortSet->StartingPort; + + if (Lowest < PortSet->StartingPort) + Lowest = PortSet->StartingPort; + + if (Highest > PortSet->StartingPort + PortSet->PortsToOversee) + Highest = PortSet->StartingPort + PortSet->PortsToOversee; + Lowest -= PortSet->StartingPort; Highest -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); - AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Next ); - if( AllocatedPort != (ULONG)-1 && AllocatedPort >= Lowest && - AllocatedPort <= Highest) { + AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Lowest ); + if( AllocatedPort != (ULONG)-1 && AllocatedPort <= Highest) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; - PortSet->LastAllocatedPort = AllocatedPort; } ExReleaseFastMutex( &PortSet->Mutex ); AllocatedPort = htons(AllocatedPort); - ASSERT(AllocatedPort >= PortSet->StartingPort); - ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); - return AllocatedPort; }

16 years, 2 months

[gschneider] 37002: DWORD is unsigned, so cast to signed type before checking for < 0. Fixes one gdi32 winetest.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Oct 26 16:06:11 2008 New Revision: 37002 URL: http://svn.reactos.org/svn/reactos?rev=37002&view=rev Log: DWORD is unsigned, so cast to signed type before checking for < 0. Fixes one gdi32 winetest. Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Sun Oct 26 16:06:11 2008 @@ -293,7 +293,7 @@ DWORD* pSafeStyle = NULL; HPEN hPen; - if (dwStyleCount < 0) return 0; + if ((int)dwStyleCount < 0) return 0; if (dwStyleCount > 16) { SetLastWin32Error(ERROR_INVALID_PARAMETER);

16 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
52
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 October 2008