Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 45093: [TDILIB, IPHLPAPI, WSHTCPIP] - Move the TDI stuff from iphlpapi to a shared library called tdilib [IP] - Implement tcpip side of IP_HDRINCL [PSDK, WSHTCPIP, WSHIRDA] - Fix definition of WSHGetSocketInformation [PSDK] - Add AO_OPTION_* defines [WSHTCPIP] - Request notifications for bind also - Implement WSHSetSocketInformation [MSAFD] - Implement event notifications (bonus: fixes a memory leak on socket closure due to unfreed helper context) - Store TdiConnectionHandle the same w
by cgutman＠svn.reactos.org 16 Jan '10

16 Jan '10

Author: cgutman Date: Sat Jan 16 01:05:15 2010 New Revision: 45093 URL: http://svn.reactos.org/svn/reactos?rev=45093&view=rev Log: [TDILIB, IPHLPAPI, WSHTCPIP] - Move the TDI stuff from iphlpapi to a shared library called tdilib [IP] - Implement tcpip side of IP_HDRINCL [PSDK, WSHTCPIP, WSHIRDA] - Fix definition of WSHGetSocketInformation [PSDK] - Add AO_OPTION_* defines [WSHTCPIP] - Request notifications for bind also - Implement WSHSetSocketInformation [MSAFD] - Implement event notifications (bonus: fixes a memory leak on socket closure due to unfreed helper context) - Store TdiConnectionHandle the same way we store TdiAddressHandle - Half-plement WSPSetSockOpt - Fix WSPGetSockOpt [TCPIP] - Handle AO_OPTION_TTL, AO_OPTION_IP_DONTFRAGMENT (not working yet), AO_OPTION_BROADCAST (not working yet), and AO_OPTION_IP_HDRINCL - Add new members of ADDRESS_FILE for the preceding AO options [AFD] - Return the connection handle in the Information of the IOSB (same as we do with the address file handle) [GENERAL] - Tracert works now Added: branches/aicom-network-branch/lib/tdilib/ branches/aicom-network-branch/lib/tdilib/enum.c (with props) branches/aicom-network-branch/lib/tdilib/handle.c (with props) branches/aicom-network-branch/lib/tdilib/tdilib.h (with props) branches/aicom-network-branch/lib/tdilib/tdilib.rbuild (with props) Modified: branches/aicom-network-branch/dll/win32/iphlpapi/ifenum_reactos.c branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi.rbuild branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi_private.h branches/aicom-network-branch/dll/win32/msafd/misc/dllmain.c branches/aicom-network-branch/dll/win32/msafd/misc/stubs.c branches/aicom-network-branch/dll/win32/wshirda/wshirda.c branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.c branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.h branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.rbuild branches/aicom-network-branch/drivers/network/afd/afd/connect.c branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h branches/aicom-network-branch/drivers/network/tcpip/tcpip/ainfo.c branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c branches/aicom-network-branch/include/psdk/tcpioctl.h branches/aicom-network-branch/include/psdk/wsahelp.h branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c branches/aicom-network-branch/lib/lib.rbuild Modified: branches/aicom-network-branch/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -45,9 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); -/* Globals */ -const PWCHAR TcpFileName = L"\\Device\\Tcp"; - /* Functions */ /* I'm a bit skittish about maintaining this info in memory, as I'd rather @@ -62,171 +59,6 @@ void interfaceMapFree(void) { /* Ditto. */ -} - -NTSTATUS openTcpFile(PHANDLE tcpFile) { - UNICODE_STRING fileName; - OBJECT_ATTRIBUTES objectAttributes; - IO_STATUS_BLOCK ioStatusBlock; - NTSTATUS status; - - TRACE("called.\n"); - - /* Shamelessly ripped from CreateFileW */ - RtlInitUnicodeString( &fileName, TcpFileName ); - - InitializeObjectAttributes( &objectAttributes, - &fileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL ); - - status = ZwCreateFile( tcpFile, - SYNCHRONIZE | GENERIC_EXECUTE | - GENERIC_READ | GENERIC_WRITE, - &objectAttributes, - &ioStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_OPEN_IF, - FILE_SYNCHRONOUS_IO_NONALERT, - 0, - 0 ); - - /* String does not need to be freed: it points to the constant - * string we provided */ - - if (!NT_SUCCESS(status)) { - ERR("openTcpFile for <%wZ> failed: 0x%lx\n", &fileName, status); - *tcpFile = INVALID_HANDLE_VALUE; - } - - return status; -} - -void closeTcpFile( HANDLE h ) { - TRACE("called.\n"); - ASSERT(h != INVALID_HANDLE_VALUE); - ZwClose( h ); -} - -/* A generic thing-getting function which interacts in the right way with - * TDI. This may seem oblique, but I'm using it to reduce code and hopefully - * make this thing easier to debug. - * - * The things returned can be any of: - * TDIEntityID - * TDIObjectID - * IFEntry - * IPSNMPInfo - * IPAddrEntry - * IPInterfaceInfo - */ -NTSTATUS tdiGetSetOfThings( HANDLE tcpFile, - DWORD toiClass, - DWORD toiType, - DWORD toiId, - DWORD teiEntity, - DWORD teiInstance, - DWORD fixedPart, - DWORD entrySize, - PVOID *tdiEntitySet, - PDWORD numEntries ) { - TCP_REQUEST_QUERY_INFORMATION_EX req = TCP_REQUEST_QUERY_INFORMATION_INIT; - PVOID entitySet = 0; - NTSTATUS status = STATUS_SUCCESS; - DWORD allocationSizeForEntityArray = entrySize * MAX_TDI_ENTITIES, - arraySize = entrySize * MAX_TDI_ENTITIES; - - TRACE("TdiGetSetOfThings(tcpFile %x,toiClass %x,toiType %x,toiId %x," - "teiEntity %x,fixedPart %d,entrySize %d)\n", - (int)tcpFile, - (int)toiClass, - (int)toiType, - (int)toiId, - (int)teiEntity, - (int)fixedPart, - (int)entrySize ); - - req.ID.toi_class = toiClass; - req.ID.toi_type = toiType; - req.ID.toi_id = toiId; - req.ID.toi_entity.tei_entity = teiEntity; - req.ID.toi_entity.tei_instance = teiInstance; - - /* There's a subtle problem here... - * If an interface is added at this exact instant, (as if by a PCMCIA - * card insertion), the array will still not have enough entries after - * have allocated it after the first DeviceIoControl call. - * - * We'll get around this by repeating until the number of interfaces - * stabilizes. - */ - do { - assert( !entitySet ); /* We must not have an entity set allocated */ - status = DeviceIoControl( tcpFile, - IOCTL_TCP_QUERY_INFORMATION_EX, - &req, - sizeof(req), - 0, - 0, - &allocationSizeForEntityArray, - NULL ); - - if(!NT_SUCCESS(status)) - { - ERR("IOCTL Failed\n"); - return STATUS_UNSUCCESSFUL; - } - - arraySize = allocationSizeForEntityArray; - entitySet = HeapAlloc( GetProcessHeap(), 0, arraySize ); - - if( !entitySet ) { - status = STATUS_INSUFFICIENT_RESOURCES; - WARN("TdiGetSetOfThings() => %08x\n", (int)status); - return status; - } - - status = DeviceIoControl( tcpFile, - IOCTL_TCP_QUERY_INFORMATION_EX, - &req, - sizeof(req), - entitySet, - arraySize, - &allocationSizeForEntityArray, - NULL ); - - /* This is why we have the loop -- we might have added an adapter */ - if( arraySize == allocationSizeForEntityArray ) - break; - - HeapFree( GetProcessHeap(), 0, entitySet ); - entitySet = 0; - - if(!status) - { - WARN("IOCTL Failed\n"); - return STATUS_UNSUCCESSFUL; - } - - WARN("TdiGetSetOfThings(): Array changed size: %d -> %d.\n", - arraySize, allocationSizeForEntityArray ); - } while( TRUE ); /* We break if the array we received was the size we - * expected. Therefore, we got here because it wasn't */ - - *numEntries = (arraySize - fixedPart) / entrySize; - *tdiEntitySet = entitySet; - - WARN("TdiGetSetOfThings() => Success: %d things @ %08x\n", - (int)*numEntries, (int)entitySet); - - return STATUS_SUCCESS; -} - -VOID tdiFreeThingSet( PVOID things ) { - HeapFree( GetProcessHeap(), 0, things ); } NTSTATUS tdiGetMibForIfEntity @@ -283,33 +115,6 @@ return STATUS_SUCCESS; } -NTSTATUS tdiGetEntityIDSet( HANDLE tcpFile, - TDIEntityID **entitySet, - PDWORD numEntities ) { - NTSTATUS status = tdiGetSetOfThings( tcpFile, - INFO_CLASS_GENERIC, - INFO_TYPE_PROVIDER, - ENTITY_LIST_ID, - GENERIC_ENTITY, - 0, - 0, - sizeof(TDIEntityID), - (PVOID *)entitySet, - numEntities ); - if( NT_SUCCESS(status) ) { - int i; - - for( i = 0; i < *numEntities; i++ ) { - TRACE("%-4d: %04x:%08x\n", - i, - (*entitySet)[i].tei_entity, - (*entitySet)[i].tei_instance ); - } - } - - return status; -} - BOOL isInterface( TDIEntityID *if_maybe ) { return if_maybe->tei_entity == IF_ENTITY; Modified: branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -3,12 +3,14 @@ <include base="iphlpapi">.</include> <include base="ReactOS">include/reactos/wine</include> <include base="dhcp">include</include> + <include base="tdilib">.</include> <library>wine</library> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> <library>ws2_32</library> <library>dhcpcsvc</library> + <library>tdilib</library> <file>dhcp_reactos.c</file> <file>ifenum_reactos.c</file> <file>ipstats_reactos.c</file> Modified: branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -36,6 +36,8 @@ //#include "ntddndis.h" #include "ddk/tdiinfo.h" #include "tcpioctl.h" + +#include "tdilib.h" #ifndef ETH_ALEN #define ETH_ALEN 6 @@ -120,20 +122,9 @@ } IPHLPAddrType; /** Prototypes **/ -NTSTATUS openTcpFile(PHANDLE tcpFile); -VOID closeTcpFile(HANDLE tcpFile); -NTSTATUS tdiGetEntityIDSet( HANDLE tcpFile, TDIEntityID **entitySet, - PDWORD numEntities ); -NTSTATUS tdiGetSetOfThings( HANDLE tcpFile, DWORD toiClass, DWORD toiType, - DWORD toiId, DWORD teiEntity, DWORD teiInstance, - DWORD fixedPart, - DWORD entrySize, PVOID *tdiEntitySet, - PDWORD numEntries ); -VOID tdiFreeThingSet( PVOID things ); NTSTATUS getNthIpEntity( HANDLE tcpFile, DWORD index, TDIEntityID *ent ); NTSTATUS tdiGetIpAddrsForIpEntity( HANDLE tcpFile, TDIEntityID *ent, IPAddrEntry **addrs, PDWORD numAddrs ); - int GetLongestChildKeyName( HANDLE RegHandle ); LONG OpenChildKeyRead( HANDLE RegHandle, PWCHAR ChildKeyName, Modified: branches/aicom-network-branch/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -426,6 +426,22 @@ /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); + if (Socket->HelperEvents & WSH_NOTIFY_CLOSE) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_CLOSE); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + NtClose(SockEvent); + return SOCKET_ERROR; + } + } + /* If a Close is already in Process, give up */ if (Socket->SharedData.State == SocketClosed) { @@ -517,11 +533,10 @@ if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); + Status = IoStatusBlock.Status; } } } - - /* FIXME: We should notify the Helper DLL of WSH_NOTIFY_CLOSE */ /* Cleanup Time! */ Socket->HelperContext = NULL; @@ -635,6 +650,21 @@ NtClose( SockEvent ); + if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_BIND)) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_BIND); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + return SOCKET_ERROR; + } + } + return MsafdReturnWithErrno ( Status, lpErrno, 0, NULL ); } @@ -693,6 +723,21 @@ Socket->SharedData.Listening = TRUE; NtClose( SockEvent ); + + if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_LISTEN)) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_LISTEN); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + return SOCKET_ERROR; + } + } return MsafdReturnWithErrno ( Status, lpErrno, 0, NULL ); } @@ -1277,6 +1322,21 @@ AFD_DbgPrint(MID_TRACE,("Socket %x\n", AcceptSocket)); + if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_ACCEPT)) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_ACCEPT); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + return INVALID_SOCKET; + } + } + *lpErrno = 0; /* Return Socket */ @@ -1433,6 +1493,8 @@ Status = IOSB.Status; } + Socket->TdiConnectionHandle = (HANDLE)IOSB.Information; + /* Get any pending connect data */ if (lpCalleeData != NULL) { @@ -1463,6 +1525,35 @@ AFD_DbgPrint(MID_TRACE,("Ending\n")); NtClose( SockEvent ); + + if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_CONNECT)) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_CONNECT); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + return SOCKET_ERROR; + } + } + else if (Status != STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_CONNECT_ERROR)) + { + Status = Socket->HelperData->WSHNotify(Socket->HelperContext, + Socket->Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + WSH_NOTIFY_CONNECT_ERROR); + + if (Status) + { + if (lpErrno) *lpErrno = Status; + return SOCKET_ERROR; + } + } return MsafdReturnWithErrno( Status, lpErrno, 0, NULL ); } @@ -1850,11 +1941,52 @@ case IPPROTO_TCP: /* FIXME */ default: - *lpErrno = WSAEINVAL; - return SOCKET_ERROR; + *lpErrno = Socket->HelperData->WSHGetSocketInformation(Socket->HelperContext, + Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + Level, + OptionName, + OptionValue, + (LPINT)OptionLength); + return (*lpErrno == 0) ? 0 : SOCKET_ERROR; } } +INT +WSPAPI +WSPSetSockOpt( + IN SOCKET s, + IN INT level, + IN INT optname, + IN CONST CHAR FAR* optval, + IN INT optlen, + OUT LPINT lpErrno) +{ + PSOCKET_INFORMATION Socket; + + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(s); + if (Socket == NULL) + { + *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + + + /* FIXME: We should handle some cases here */ + + + *lpErrno = Socket->HelperData->WSHSetSocketInformation(Socket->HelperContext, + s, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + level, + optname, + (PCHAR)optval, + optlen); + return (*lpErrno == 0) ? 0 : SOCKET_ERROR; +} /* * FUNCTION: Initialize service provider for a client Modified: branches/aicom-network-branch/dll/win32/msafd/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/msafd/misc/stubs.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/msafd/misc/stubs.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -100,22 +100,6 @@ return (SOCKET)0; } - -INT -WSPAPI -WSPSetSockOpt( - IN SOCKET s, - IN INT level, - IN INT optname, - IN CONST CHAR FAR* optval, - IN INT optlen, - OUT LPINT lpErrno) -{ - UNIMPLEMENTED - - return 0; -} - INT WSPAPI WSPStringToAddress( Modified: branches/aicom-network-branch/dll/win32/wshirda/wshirda.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/wshirda/wshirda.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/wshirda/wshirda.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -91,7 +91,7 @@ IN INT Level, IN INT OptionName, OUT PCHAR OptionValue, - OUT INT OptionLength) + OUT LPINT OptionLength) { UNIMPLEMENTED Modified: branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -156,9 +156,39 @@ return NO_ERROR; } - - - +UINT +GetAddressOption(INT Level, INT OptionName) +{ + switch (Level) + { + case IPPROTO_IP: + switch (OptionName) + { + case IP_TTL: + return AO_OPTION_TTL; + + case IP_DONTFRAGMENT: + return AO_OPTION_IP_DONTFRAGMENT; + +#if 0 + case IP_RECEIVE_BROADCAST: + return AO_OPTION_BROADCAST; +#endif + + case IP_HDRINCL: + return AO_OPTION_IP_HDRINCL; + + default: + DPRINT1("Unknown option name for IPPROTO_IP: %d\n", OptionName); + return 0; + } + break; + + default: + DPRINT1("Unknown level: %d\n", Level); + return 0; + } +} INT EXPORT @@ -170,7 +200,7 @@ IN INT Level, IN INT OptionName, OUT PCHAR OptionValue, - OUT INT OptionLength) + OUT LPINT OptionLength) { UNIMPLEMENTED @@ -309,6 +339,37 @@ return NO_ERROR; } +INT +SendRequest( + IN PVOID Request, + IN DWORD RequestSize, + IN DWORD IOCTL) +{ + BOOLEAN Status; + HANDLE TcpCC; + DWORD BytesReturned; + + if (openTcpFile(&TcpCC) != STATUS_SUCCESS) + return WSAEINVAL; + + Status = DeviceIoControl(TcpCC, + IOCTL, + Request, + RequestSize, + NULL, + 0, + &BytesReturned, + NULL); + + closeTcpFile(TcpCC); + + DPRINT("DeviceIoControl: %d\n", ((Status == TRUE) ? 0 : GetLastError())); + + if (!Status) + return WSAEINVAL; + + return NO_ERROR; +} INT EXPORT @@ -319,15 +380,86 @@ IN HANDLE TdiConnectionObjectHandle, IN DWORD NotifyEvent) { + PSOCKET_CONTEXT Context = HelperDllSocketContext; + NTSTATUS Status; + HANDLE TcpCC; + TDIEntityID *EntityIDs; + DWORD EntityCount, i; + PQUEUED_REQUEST QueuedRequest, NextQueuedRequest; + switch (NotifyEvent) { case WSH_NOTIFY_CLOSE: - HeapFree(GetProcessHeap(), 0, HelperDllSocketContext); - break; - + DPRINT("WSHNotify: WSH_NOTIFY_CLOSE\n"); + QueuedRequest = Context->RequestQueue; + while (QueuedRequest) + { + NextQueuedRequest = QueuedRequest->Next; + + HeapFree(GetProcessHeap(), 0, QueuedRequest->Info); + HeapFree(GetProcessHeap(), 0, QueuedRequest); + + QueuedRequest = NextQueuedRequest; + } + HeapFree(GetProcessHeap(), 0, HelperDllSocketContext); + break; + + + case WSH_NOTIFY_BIND: + DPRINT("WSHNotify: WSH_NOTIFY_BIND\n"); + Status = openTcpFile(&TcpCC); + if (Status != STATUS_SUCCESS) + return WSAEINVAL; + + Status = tdiGetEntityIDSet(TcpCC, + &EntityIDs, + &EntityCount); + + closeTcpFile(TcpCC); + + if (Status != STATUS_SUCCESS) + return WSAEINVAL; + + for (i = 0; i < EntityCount; i++) + { + if (EntityIDs[i].tei_entity == CO_TL_ENTITY || + EntityIDs[i].tei_entity == CL_TL_ENTITY || + EntityIDs[i].tei_entity == ER_ENTITY) + { + Context->AddrFileInstance = EntityIDs[i].tei_instance; + Context->AddrFileEntityType = EntityIDs[i].tei_entity; + } + } + + DPRINT("Instance: %x Type: %x\n", Context->AddrFileInstance, Context->AddrFileEntityType); + + tdiFreeThingSet(EntityIDs); + + Context->SocketState = SocketStateBound; + + QueuedRequest = Context->RequestQueue; + while (QueuedRequest) + { + QueuedRequest->Info->ID.toi_entity.tei_entity = Context->AddrFileEntityType; + QueuedRequest->Info->ID.toi_entity.tei_instance = Context->AddrFileInstance; + + SendRequest(QueuedRequest->Info, + sizeof(*QueuedRequest->Info) + QueuedRequest->Info->BufferSize, + IOCTL_TCP_SET_INFORMATION_EX); + + NextQueuedRequest = QueuedRequest->Next; + + HeapFree(GetProcessHeap(), 0, QueuedRequest->Info); + HeapFree(GetProcessHeap(), 0, QueuedRequest); + + QueuedRequest = NextQueuedRequest; + } + Context->RequestQueue = NULL; + break; + default: - DPRINT1("Unwanted notification received! (%d)\n", NotifyEvent); - break; + DPRINT1("Unwanted notification received! (%d)\n", NotifyEvent); + break; } return NO_ERROR; @@ -450,7 +582,7 @@ /* Setup a socket context area */ - Context = HeapAlloc(GetProcessHeap(), 0, sizeof(SOCKET_CONTEXT)); + Context = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SOCKET_CONTEXT)); if (!Context) { RtlFreeUnicodeString(TransportDeviceName); return WSAENOBUFS; @@ -460,13 +592,13 @@ Context->SocketType = *SocketType; Context->Protocol = *Protocol; Context->Flags = Flags; + Context->SocketState = SocketStateCreated; *HelperDllSocketContext = Context; - *NotificationEvents = WSH_NOTIFY_CLOSE; - - return NO_ERROR; -} - + *NotificationEvents = WSH_NOTIFY_CLOSE | WSH_NOTIFY_BIND; + + return NO_ERROR; +} INT EXPORT @@ -480,9 +612,74 @@ IN PCHAR OptionValue, IN INT OptionLength) { - UNIMPLEMENTED - - return NO_ERROR; + PSOCKET_CONTEXT Context = HelperDllSocketContext; + UINT RealOptionName; + INT Status; + PTCP_REQUEST_SET_INFORMATION_EX Info; + PQUEUED_REQUEST Queued, NextQueued; + + DPRINT("WSHSetSocketInformation\n"); + + /* FIXME: We only handle address file object here */ + + RealOptionName = GetAddressOption(Level, OptionName); + if (!RealOptionName) + return WSAEINVAL; + + Info = HeapAlloc(GetProcessHeap(), 0, sizeof(*Info) + OptionLength); + if (!Info) + return WSAENOBUFS; + + Info->ID.toi_entity.tei_entity = Context->AddrFileEntityType; + Info->ID.toi_entity.tei_instance = Context->AddrFileInstance; + Info->ID.toi_class = INFO_CLASS_PROTOCOL; + Info->ID.toi_type = INFO_TYPE_ADDRESS_OBJECT; + Info->ID.toi_id = RealOptionName; + Info->BufferSize = OptionLength; + memcpy(Info->Buffer, OptionValue, OptionLength); + + if (Context->SocketState == SocketStateCreated) + { + if (Context->RequestQueue) + { + Queued = Context->RequestQueue; + while ((NextQueued = Queued->Next)) + { + Queued = NextQueued; + } + + Queued->Next = HeapAlloc(GetProcessHeap(), 0, sizeof(QUEUED_REQUEST)); + if (!Queued->Next) + { + HeapFree(GetProcessHeap(), 0, Info); + return WSAENOBUFS; + } + + NextQueued = Queued->Next; + NextQueued->Next = NULL; + NextQueued->Info = Info; + } + else + { + Context->RequestQueue = HeapAlloc(GetProcessHeap(), 0, sizeof(QUEUED_REQUEST)); + if (!Context->RequestQueue) + { + HeapFree(GetProcessHeap(), 0, Info); + return WSAENOBUFS; + } + + Context->RequestQueue->Next = NULL; + Context->RequestQueue->Info = Info; + } + + return 0; + } + + Status = SendRequest(Info, sizeof(*Info) + Info->BufferSize, IOCTL_TCP_SET_INFORMATION_EX); + + HeapFree(GetProcessHeap(), 0, Info); + + return Status; } Modified: branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.h [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -9,6 +9,10 @@ #define WIN32_NO_STATUS #include <wsahelp.h> +#include <tdiinfo.h> +#include <tcpioctl.h> +#include <tdilib.h> +#include <ws2tcpip.h> #include <rtlfuncs.h> #define EXPORT WINAPI @@ -17,12 +21,27 @@ #define DD_UDP_DEVICE_NAME L"\\Device\\Udp" #define DD_RAW_IP_DEVICE_NAME L"\\Device\\RawIp" +typedef enum _SOCKET_STATE { + SocketStateCreated, + SocketStateBound, + SocketStateListening, + SocketStateConnected +} SOCKET_STATE, *PSOCKET_STATE; + +typedef struct _QUEUED_REQUEST { + PTCP_REQUEST_SET_INFORMATION_EX Info; + PVOID Next; +} QUEUED_REQUEST, *PQUEUED_REQUEST; typedef struct _SOCKET_CONTEXT { INT AddressFamily; INT SocketType; INT Protocol; DWORD Flags; + DWORD AddrFileEntityType; + DWORD AddrFileInstance; + SOCKET_STATE SocketState; + PQUEUED_REQUEST RequestQueue; } SOCKET_CONTEXT, *PSOCKET_CONTEXT; #endif /* __WSHTCPIP_H */ Modified: branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.rbuild [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/wshtcpip/wshtcpip.rbuild [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -3,9 +3,11 @@ <module name="wshtcpip" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_WSHTCPIP}" installbase="system32" installname="wshtcpip.dll" unicode="yes"> <importlibrary definition="wshtcpip.spec" /> <include base="wshtcpip">.</include> + <include base="tdilib">.</include> <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> + <library>tdilib</library> <file>wshtcpip.c</file> <file>wshtcpip.rc</file> </module> Modified: branches/aicom-network-branch/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -302,7 +302,7 @@ NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); AFD_DbgPrint(MID_TRACE,("Completing connect %x\n", NextIrp)); NextIrp->IoStatus.Status = Status; - NextIrp->IoStatus.Information = 0; + NextIrp->IoStatus.Information = NT_SUCCESS(Status) ? ((ULONG_PTR)FCB->Connection.Handle) : 0; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); Modified: branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -136,6 +136,9 @@ USHORT Protocol; /* Protocol number */ USHORT Port; /* Network port (network byte order) */ UCHAR TTL; /* Time to live stored in packets sent from this address file */ + UINT DF; /* Don't fragment */ + UINT BCast; /* Receive broadcast packets */ + UINT HeaderIncl; /* Include header in RawIP packets */ WORK_QUEUE_ITEM WorkItem; /* Work queue item handle */ DATAGRAM_COMPLETION_ROUTINE Complete; /* Completion routine for delete request */ PVOID Context; /* Delete request context */ Modified: branches/aicom-network-branch/drivers/network/tcpip/tcpip/ainfo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/tcpip/ainfo.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/tcpip/ainfo.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -13,21 +13,50 @@ PVOID Buffer, UINT BufferSize) { - //KIRQL OldIrql; + KIRQL OldIrql; switch (ID->toi_id) { -#if 0 case AO_OPTION_TTL: - if (BufferSize < sizeof(UCHAR)) + if (BufferSize < sizeof(UINT)) return TDI_INVALID_PARAMETER; - KeAcquireSpinLock(&AddrFile->Lock, &OldIrql); + LockObject(AddrFile, &OldIrql); AddrFile->TTL = *((PUCHAR)Buffer); - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return TDI_SUCCESS; -#endif + + case AO_OPTION_IP_DONTFRAGMENT: + if (BufferSize < sizeof(UINT)) + return TDI_INVALID_PARAMETER; + + LockObject(AddrFile, &OldIrql); + AddrFile->DF = *((PUINT)Buffer); + UnlockObject(AddrFile, OldIrql); + + return TDI_SUCCESS; + + case AO_OPTION_BROADCAST: + if (BufferSize < sizeof(UINT)) + return TDI_INVALID_PARAMETER; + + LockObject(AddrFile, &OldIrql); + AddrFile->BCast = *((PUINT)Buffer); + UnlockObject(AddrFile, OldIrql); + + return TDI_SUCCESS; + + case AO_OPTION_IP_HDRINCL: + if (BufferSize < sizeof(UINT)) + return TDI_INVALID_PARAMETER; + + LockObject(AddrFile, &OldIrql); + AddrFile->HeaderIncl = *((PUINT)Buffer); + UnlockObject(AddrFile, OldIrql); + + return TDI_SUCCESS; + default: DbgPrint("Unimplemented option %x\n", ID->toi_id); Modified: branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -244,15 +244,16 @@ return STATUS_INSUFFICIENT_RESOURCES; } - TI_DbgPrint(DEBUG_ADDRFILE, ("Address file object allocated at (0x%X).\n", AddrFile)); - RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); AddrFile->RefCount = 1; AddrFile->Free = AddrFileFree; - /* Set our default TTL */ + /* Set our default options */ AddrFile->TTL = 128; + AddrFile->DF = 0; + AddrFile->BCast = 1; + AddrFile->HeaderIncl = 1; /* Make sure address is a local unicast address or 0 */ /* FIXME: IPv4 only */ Modified: branches/aicom-network-branch/include/psdk/tcpioctl.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/ps… ============================================================================== --- branches/aicom-network-branch/include/psdk/tcpioctl.h [iso-8859-1] (original) +++ branches/aicom-network-branch/include/psdk/tcpioctl.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -49,6 +49,46 @@ #define IP_MIB_ADDRTABLE_ENTRY_ID 0x102 #define IP_INTFC_INFO_ID 0x103 #define MAX_PHYSADDR_SIZE 8 + +/* Address Object Options */ +#define AO_OPTION_TTL 1 +#define AO_OPTION_MCASTTTL 2 +#define AO_OPTION_MCASTIF 3 +#define AO_OPTION_XSUM 4 +#define AO_OPTION_IPOPTIONS 5 +#define AO_OPTION_ADD_MCAST 6 +#define AO_OPTION_DEL_MCAST 7 +#define AO_OPTION_TOS 8 +#define AO_OPTION_IP_DONTFRAGMENT 9 +#define AO_OPTION_MCASTLOOP 10 +#define AO_OPTION_BROADCAST 11 +#define AO_OPTION_IP_HDRINCL 12 +#define AO_OPTION_RCVALL 13 +#define AO_OPTION_RCVALL_MCAST 14 +#define AO_OPTION_RCVALL_IGMPMCAST 15 +#define AO_OPTION_UNNUMBEREDIF 16 +#define AO_OPTION_IP_UCASTIF 17 +#define AO_OPTION_ABSORB_RTRALERT 18 +#define AO_OPTION_LIMIT_BCASTS 19 +#define AO_OPTION_INDEX_BIND 20 +#define AO_OPTION_INDEX_MCASTIF 21 +#define AO_OPTION_INDEX_ADD_MCAST 22 +#define AO_OPTION_INDEX_DEL_MCAST 23 +#define AO_OPTION_IFLIST 24 +#define AO_OPTION_ADD_IFLIST 25 +#define AO_OPTION_DEL_IFLIST 26 +#define AO_OPTION_IP_PKTINFO 27 +#define AO_OPTION_ADD_MCAST_SRC 28 +#define AO_OPTION_DEL_MCAST_SRC 29 +#define AO_OPTION_MCAST_FILTER 30 +#define AO_OPTION_BLOCK_MCAST_SRC 31 +#define AO_OPTION_UNBLOCK_MCAST_SRC 32 +#define AO_OPTION_UDP_CKSUM_COVER 33 +#define AO_OPTION_WINDOW 34 +#define AO_OPTION_SCALE_CWIN 35 +#define AO_OPTION_RCV_HOPLIMIT 36 +#define AO_OPTION_UNBIND 37 +#define AO_OPTION_PROTECT 38 typedef struct IFEntry { Modified: branches/aicom-network-branch/include/psdk/wsahelp.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/ps… ============================================================================== --- branches/aicom-network-branch/include/psdk/wsahelp.h [iso-8859-1] (original) +++ branches/aicom-network-branch/include/psdk/wsahelp.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -50,7 +50,7 @@ INT WINAPI WSHGetBroadcastSockaddr(PVOID,PSOCKADDR,PINT); INT WINAPI WSHGetProviderGuid(LPWSTR,LPGUID); INT WINAPI WSHGetSockaddrType(PSOCKADDR,DWORD,PSOCKADDR_INFO); -INT WINAPI WSHGetSocketInformation(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT); +INT WINAPI WSHGetSocketInformation(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,LPINT); INT WINAPI WSHGetWildcardSockaddr(PVOID,PSOCKADDR,PINT); DWORD WINAPI WSHGetWinsockMapping(PWINSOCK_MAPPING,DWORD); INT WINAPI WSHGetWSAProtocolInfo(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD); @@ -69,7 +69,7 @@ typedef INT (WINAPI *PWSH_GET_BROADCAST_SOCKADDR)(PVOID,PSOCKADDR,PINT); typedef INT (WINAPI *PWSH_GET_PROVIDER_GUID)(LPWSTR,LPGUID); typedef INT (WINAPI *PWSH_GET_SOCKADDR_TYPE)(PSOCKADDR,DWORD,PSOCKADDR_INFO); -typedef INT (WINAPI *PWSH_GET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT); +typedef INT (WINAPI *PWSH_GET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,LPINT); typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKEADDR)(PVOID,PSOCKADDR,PINT); typedef DWORD (WINAPI *PWSH_GET_WINSOCK_MAPPING)(PWINSOCK_MAPPING,DWORD); typedef INT (WINAPI *PWSH_GET_WSAPROTOCOL_INFO)(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD); Modified: branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -91,8 +91,13 @@ } else { - /* Give client the IP header too if it is a raw IP file object */ - DataBuffer = IPPacket->Header; + if (AddrFile->HeaderIncl) + DataBuffer = IPPacket->Header; + else + { + DataBuffer = IPPacket->Data; + DataSize -= IPPacket->HeaderSize; + } } if (!IsListEmpty(&AddrFile->ReceiveQueue)) Modified: branches/aicom-network-branch/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/lib.rb… ============================================================================== --- branches/aicom-network-branch/lib/lib.rbuild [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/lib.rbuild [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -58,6 +58,9 @@ <directory name="smlib"> <xi:include href="smlib/smlib.rbuild" /> </directory> + <directory name="tdilib"> + <xi:include href="tdilib/tdilib.rbuild" /> + </directory> <directory name="win32ksys"> <xi:include href="win32ksys/win32ksys.rbuild" /> </directory> Added: branches/aicom-network-branch/lib/tdilib/enum.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/tdilib… ============================================================================== --- branches/aicom-network-branch/lib/tdilib/enum.c (added) +++ branches/aicom-network-branch/lib/tdilib/enum.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -1,0 +1,123 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS TDI interface + * FILE: enum.c + * PURPOSE: TDI entity enumeration + */ + +#include "iphlpapi_private.h" +#include "tdilib.h" + +/* A generic thing-getting function which interacts in the right way with + * TDI. This may seem oblique, but I'm using it to reduce code and hopefully + * make this thing easier to debug. + * + * The things returned can be any of: + * TDIEntityID + * TDIObjectID + * IFEntry + * IPSNMPInfo + * IPAddrEntry + * IPInterfaceInfo + */ +NTSTATUS tdiGetSetOfThings( HANDLE tcpFile, + DWORD toiClass, + DWORD toiType, + DWORD toiId, + DWORD teiEntity, + DWORD teiInstance, + DWORD fixedPart, + DWORD entrySize, + PVOID *tdiEntitySet, + PDWORD numEntries ) { + TCP_REQUEST_QUERY_INFORMATION_EX req = TCP_REQUEST_QUERY_INFORMATION_INIT; + PVOID entitySet = 0; + NTSTATUS status = STATUS_SUCCESS; + DWORD allocationSizeForEntityArray = entrySize * MAX_TDI_ENTITIES, + arraySize = entrySize * MAX_TDI_ENTITIES; + + req.ID.toi_class = toiClass; + req.ID.toi_type = toiType; + req.ID.toi_id = toiId; + req.ID.toi_entity.tei_entity = teiEntity; + req.ID.toi_entity.tei_instance = teiInstance; + + /* There's a subtle problem here... + * If an interface is added at this exact instant, (as if by a PCMCIA + * card insertion), the array will still not have enough entries after + * have allocated it after the first DeviceIoControl call. + * + * We'll get around this by repeating until the number of interfaces + * stabilizes. + */ + do { + status = DeviceIoControl( tcpFile, + IOCTL_TCP_QUERY_INFORMATION_EX, + &req, + sizeof(req), + 0, + 0, + &allocationSizeForEntityArray, + NULL ); + + if(!status) + { + return STATUS_UNSUCCESSFUL; + } + + arraySize = allocationSizeForEntityArray; + entitySet = HeapAlloc( GetProcessHeap(), 0, arraySize ); + + if( !entitySet ) { + status = STATUS_INSUFFICIENT_RESOURCES; + return status; + } + + status = DeviceIoControl( tcpFile, + IOCTL_TCP_QUERY_INFORMATION_EX, + &req, + sizeof(req), + entitySet, + arraySize, + &allocationSizeForEntityArray, + NULL ); + + /* This is why we have the loop -- we might have added an adapter */ + if( arraySize == allocationSizeForEntityArray ) + break; + + HeapFree( GetProcessHeap(), 0, entitySet ); + entitySet = 0; + + if(!status) + return STATUS_UNSUCCESSFUL; + } while( TRUE ); /* We break if the array we received was the size we + * expected. Therefore, we got here because it wasn't */ + + *numEntries = (arraySize - fixedPart) / entrySize; + *tdiEntitySet = entitySet; + + return STATUS_SUCCESS; +} + +VOID tdiFreeThingSet( PVOID things ) { + HeapFree( GetProcessHeap(), 0, things ); +} + +NTSTATUS tdiGetEntityIDSet( HANDLE tcpFile, + TDIEntityID **entitySet, + PDWORD numEntities ) { + NTSTATUS status = tdiGetSetOfThings( tcpFile, + INFO_CLASS_GENERIC, + INFO_TYPE_PROVIDER, + ENTITY_LIST_ID, + GENERIC_ENTITY, + 0, + 0, + sizeof(TDIEntityID), + (PVOID *)entitySet, + numEntities ); + + return status; +} + Propchange: branches/aicom-network-branch/lib/tdilib/enum.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/aicom-network-branch/lib/tdilib/handle.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/tdilib… ============================================================================== --- branches/aicom-network-branch/lib/tdilib/handle.c (added) +++ branches/aicom-network-branch/lib/tdilib/handle.c [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -1,0 +1,54 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS TDI interface + * FILE: handle.c + * PURPOSE: TDI transport handle management + */ + +#include "iphlpapi_private.h" + +const PWCHAR TcpFileName = L"\\Device\\Tcp"; + +NTSTATUS openTcpFile(PHANDLE tcpFile) +{ + UNICODE_STRING fileName; + OBJECT_ATTRIBUTES objectAttributes; + IO_STATUS_BLOCK ioStatusBlock; + NTSTATUS status; + + RtlInitUnicodeString( &fileName, TcpFileName ); + + InitializeObjectAttributes( &objectAttributes, + &fileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL ); + + status = ZwCreateFile( tcpFile, + SYNCHRONIZE | GENERIC_EXECUTE | + GENERIC_READ | GENERIC_WRITE, + &objectAttributes, + &ioStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN_IF, + FILE_SYNCHRONOUS_IO_NONALERT, + 0, + 0 ); + + /* String does not need to be freed: it points to the constant + * string we provided */ + + if (!NT_SUCCESS(status)) + *tcpFile = INVALID_HANDLE_VALUE; + + return status; +} + +VOID closeTcpFile( HANDLE h ) +{ + ASSERT(h != INVALID_HANDLE_VALUE); + + NtClose( h ); +} Propchange: branches/aicom-network-branch/lib/tdilib/handle.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/aicom-network-branch/lib/tdilib/tdilib.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/tdilib… ============================================================================== --- branches/aicom-network-branch/lib/tdilib/tdilib.h (added) +++ branches/aicom-network-branch/lib/tdilib/tdilib.h [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -1,0 +1,20 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS TDI interface + * FILE: tdilib.h + * PURPOSE: Shared TDI library header + */ + +#ifndef TDILIB_H +#define TDILIB_H +NTSTATUS openTcpFile(PHANDLE tcpFile); +VOID closeTcpFile(HANDLE tcpFile); +NTSTATUS tdiGetEntityIDSet( HANDLE tcpFile, TDIEntityID **entitySet, + PDWORD numEntities ); +NTSTATUS tdiGetSetOfThings( HANDLE tcpFile, DWORD toiClass, DWORD toiType, + DWORD toiId, DWORD teiEntity, DWORD teiInstance, + DWORD fixedPart, + DWORD entrySize, PVOID *tdiEntitySet, + PDWORD numEntries ); +VOID tdiFreeThingSet( PVOID things ); +#endif Propchange: branches/aicom-network-branch/lib/tdilib/tdilib.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/aicom-network-branch/lib/tdilib/tdilib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/tdilib… ============================================================================== --- branches/aicom-network-branch/lib/tdilib/tdilib.rbuild (added) +++ branches/aicom-network-branch/lib/tdilib/tdilib.rbuild [iso-8859-1] Sat Jan 16 01:05:15 2010 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="tdilib" type="staticlibrary"> + <include base="iphlpapi">.</include> + <include base="tdilib">.</include> + <library>ntdll</library> + <file>enum.c</file> + <file>handle.c</file> +</module> Propchange: branches/aicom-network-branch/lib/tdilib/tdilib.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jimtabor] 45092: [User32] - Patch by Kusanagi Kouichi : Make DefWindowProc handle Shift+F10. - Keyboard hotkey issues need looking after. See bug 642, 1009, 3560 and 4609. - Input.c header modified.
by jimtabor＠svn.reactos.org 15 Jan '10

15 Jan '10

Author: jimtabor Date: Sat Jan 16 00:51:41 2010 New Revision: 45092 URL: http://svn.reactos.org/svn/reactos?rev=45092&view=rev Log: [User32] - Patch by Kusanagi Kouichi : Make DefWindowProc handle Shift+F10. - Keyboard hotkey issues need looking after. See bug 642, 1009, 3560 and 4609. - Input.c header modified. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat Jan 16 00:51:41 2010 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/window.c + * FILE: dll/win32/user32/windows/defwnd.c * PURPOSE: Window management * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: @@ -1420,7 +1420,11 @@ } } else if( wParam == VK_F10 ) + { + if (GetKeyState(VK_SHIFT) & 0x8000) + SendMessageW( hWnd, WM_CONTEXTMENU, (WPARAM)hWnd, MAKELPARAM(-1, -1) ); iF10Key = 1; + } else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) SendMessageW( hWnd, WM_SYSCOMMAND, SC_KEYMENU, ' ' ); break; Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Sat Jan 16 00:51:41 2010 @@ -16,10 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/input.c + * FILE: dll/win32/user32/windows/input.c * PURPOSE: Input * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY:

1 0

[spetreolle] 45091: Disable spooler service. This allows bootcdregtest to start here under qemu-kvm.
by spetreolle＠svn.reactos.org 15 Jan '10

15 Jan '10

Author: spetreolle Date: Fri Jan 15 23:17:16 2010 New Revision: 45091 URL: http://svn.reactos.org/svn/reactos?rev=45091&view=rev Log: Disable spooler service. This allows bootcdregtest to start here under qemu-kvm. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Jan 15 23:17:16 2010 @@ -1198,7 +1198,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Group",0x00000000,"SpoolerGroup" HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","ImagePath",0x00020000,"%SystemRoot%\system32\spoolsv.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Type",0x00010001,0x00000110 ; WLAN service

1 0

[cgutman] 45090: - Fix a bug with our tei_instance selection (we could end up with the same tei_instance value on different entities of the same type if an entity of our type in the middle of the list was deleted previously)
by cgutman＠svn.reactos.org 15 Jan '10

15 Jan '10

Author: cgutman Date: Fri Jan 15 22:00:50 2010 New Revision: 45090 URL: http://svn.reactos.org/svn/reactos?rev=45090&view=rev Log: - Fix a bug with our tei_instance selection (we could end up with the same tei_instance value on different entities of the same type if an entity of our type in the middle of the list was deleted previously) Modified: branches/aicom-network-branch/drivers/network/tcpip/tcpip/info.c Modified: branches/aicom-network-branch/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/tcpip/info.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/tcpip/info.c [iso-8859-1] Fri Jan 15 22:00:50 2010 @@ -15,16 +15,27 @@ VOID AddEntity(ULONG EntityType, PVOID Context, ULONG Flags) { KIRQL OldIrql; - ULONG i, Count = 0; + ULONG i, Instance = 0; + BOOLEAN ChoseIndex = FALSE; TcpipAcquireSpinLock(&EntityListLock, &OldIrql); - for (i = 0; i < EntityCount; i++) - if (EntityList[i].tei_entity == EntityType) - Count++; + while (!ChoseIndex) + { + ChoseIndex = TRUE; + for (i = 0; i < EntityCount; i++) + { + if (EntityList[i].tei_entity == EntityType && + EntityList[i].tei_instance == Instance) + { + Instance++; + ChoseIndex = FALSE; + } + } + } EntityList[EntityCount].tei_entity = EntityType; - EntityList[EntityCount].tei_instance = Count; + EntityList[EntityCount].tei_instance = Instance; EntityList[EntityCount].context = Context; EntityList[EntityCount].flags = Flags; EntityCount++;

1 0

[tkreuzer] 45089: [CRT] Patch by Jose Catena: vsnprintf: added support for ll size specifier See issue #5122 for more details.
by tkreuzer＠svn.reactos.org 15 Jan '10

15 Jan '10

Author: tkreuzer Date: Fri Jan 15 22:00:20 2010 New Revision: 45089 URL: http://svn.reactos.org/svn/reactos?rev=45089&view=rev Log: [CRT] Patch by Jose Catena: vsnprintf: added support for ll size specifier See issue #5122 for more details. Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=4508… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] Fri Jan 15 22:00:20 2010 @@ -451,7 +451,10 @@ /* get the conversion qualifier */ qualifier = -1; - if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { + if (*fmt == 'l' && *(fmt+1) == 'l') { + qualifier = 'I'; + fmt += 2; + } else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { qualifier = *fmt; ++fmt; } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=450… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/swprintf.c [iso-8859-1] Fri Jan 15 22:00:20 2010 @@ -449,7 +449,10 @@ /* get the conversion qualifier */ qualifier = -1; - if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt == L'w') { + if (*fmt == L'l' && *(fmt+1) == L'l') { + qualifier = L'I'; + fmt += 2; + } else if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt == L'w') { qualifier = *fmt; ++fmt; } else if (*fmt == L'I' && *(fmt+1) == L'6' && *(fmt+2) == L'4') {

1 0

[tkreuzer] 45088: [CRT] Patch by Jose Catena: allmul produced wrong results when the higher 32 bits of any of the 64 bit operands are not zero. As the comment correctly said the definition of param locations must change since esp was altered, but the definitions were not actually changed See issue #5121 for more details.
by tkreuzer＠svn.reactos.org 15 Jan '10

15 Jan '10

Author: tkreuzer Date: Fri Jan 15 21:45:36 2010 New Revision: 45088 URL: http://svn.reactos.org/svn/reactos?rev=45088&view=rev Log: [CRT] Patch by Jose Catena: allmul produced wrong results when the higher 32 bits of any of the 64 bit operands are not zero. As the comment correctly said the definition of param locations must change since esp was altered, but the definitions were not actually changed See issue #5121 for more details. Modified: trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/allm… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s [iso-8859-1] Fri Jan 15 21:45:36 2010 @@ -93,10 +93,10 @@ // must redefine A and B since esp has been altered -#define A2LO [esp + 4] // stack address of a -#define A2HI [esp + 8] // stack address of a -#define B2LO [esp + 12] // stack address of b -#define B2HI [esp + 16] // stack address of b +#define A2LO [esp + 8] // stack address of a +#define A2HI [esp + 12] // stack address of a +#define B2LO [esp + 16] // stack address of b +#define B2HI [esp + 20] // stack address of b mul ecx //eax has AHI, ecx has BLO, so AHI * BLO mov ebx,eax //save result

1 0

[cgutman] 45087: - Restore the worker in the loopback code because we can enter the loopback code from TCPPacketSend at a raised IRQL - Fixes a crash with TCP over loopback
by cgutman＠svn.reactos.org 15 Jan '10

15 Jan '10

Author: cgutman Date: Fri Jan 15 19:01:52 2010 New Revision: 45087 URL: http://svn.reactos.org/svn/reactos?rev=45087&view=rev Log: - Restore the worker in the loopback code because we can enter the loopback code from TCPPacketSend at a raised IRQL - Fixes a crash with TCP over loopback Modified: branches/aicom-network-branch/lib/drivers/ip/network/loopback.c Modified: branches/aicom-network-branch/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/network/loopback.c [iso-8859-1] Fri Jan 15 19:01:52 2010 @@ -11,6 +11,17 @@ #include "precomp.h" PIP_INTERFACE Loopback = NULL; + +VOID LoopPassiveWorker( + PVOID Context) +{ + PIP_PACKET IPPacket = Context; + + IPReceive(Loopback, IPPacket); + FreeNdisPacket(IPPacket->NdisPacket); + + ExFreePool(Context); +} VOID LoopTransmit( PVOID Context, @@ -34,6 +45,7 @@ NDIS_STATUS NdisStatus; IP_PACKET IPPacket; PNDIS_BUFFER NdisBuffer; + PVOID WorkerBuffer; ASSERT_KM_POINTER(NdisPacket); ASSERT_KM_POINTER(PC(NdisPacket)); @@ -46,9 +58,6 @@ NdisStatus = AllocatePacketWithBuffer ( &XmitPacket, PacketBuffer, PacketLength ); - (PC(NdisPacket)->DLComplete) - ( PC(NdisPacket)->Context, NdisPacket, NdisStatus ); - if( NT_SUCCESS(NdisStatus) ) { IPInitializePacket(&IPPacket, 0); @@ -60,12 +69,23 @@ &IPPacket.ContigSize, &IPPacket.TotalSize); - IPReceive(Loopback, &IPPacket); - - FreeNdisPacket(XmitPacket); + + WorkerBuffer = ExAllocatePool(NonPagedPool, sizeof(IPPacket)); + if (WorkerBuffer) + { + RtlCopyMemory(WorkerBuffer, &IPPacket, sizeof(IPPacket)); + if (!ChewCreate(LoopPassiveWorker, WorkerBuffer)) + { + ExFreePool(WorkerBuffer); + NdisStatus = NDIS_STATUS_RESOURCES; + } + } + else + NdisStatus = NDIS_STATUS_RESOURCES; } - TI_DbgPrint(MAX_TRACE, ("Done\n")); + (PC(NdisPacket)->DLComplete) + ( PC(NdisPacket)->Context, NdisPacket, NdisStatus ); } NDIS_STATUS LoopRegisterAdapter(

1 0

[dreimer] 45086: Update Script: - Removed the 7z command line tool loading routine. It's included in RosBE now. - Added some status messages to see the update command finished its job or not. Credits for this go to gabriel_it.
by dreimer＠svn.reactos.org 15 Jan '10

15 Jan '10

Author: dreimer Date: Fri Jan 15 16:15:26 2010 New Revision: 45086 URL: http://svn.reactos.org/svn/reactos?rev=45086&view=rev Log: Update Script: - Removed the 7z command line tool loading routine. It's included in RosBE now. - Added some status messages to see the update command finished its job or not. Credits for this go to gabriel_it. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Fri Jan 15 16:15:26 2010 @@ -80,12 +80,6 @@ # Save the recent dir to cd back there at the end. $_ROSBE_OPATH = "$pwd" -if (!(Test-Path "$_ROSBE_BASEDIR\Tools\7z.exe")) { - set-location "$_ROSBE_BASEDIR\Tools" - get-webfile $_ROSBE_URL/7z.exe $PWD\7z.exe - set-location $_ROSBE_OPATH -} - set-location $_ROSBE_BASEDIR # First check for a new Updater. @@ -111,16 +105,20 @@ UPDCHECK $_ROSBE_STATCOUNT += 1 } + "Update finished..." } elseif ("$($args[2])" -eq "reset") { remove-item "$ENV:APPDATA\RosBE\Updates\*.*" -force -recurse -EA SilentlyContinue remove-item "$ENV:APPDATA\RosBE\Updates\tmp\*.*" -force -recurse -EA SilentlyContinue + "Update Statistics resetted..." } elseif ("$($args[2])" -eq "nr") { $_ROSBE_STATCOUNT = $($args[3]) UPDCHECK + echo Update Nr:$($args[3]) installed... } elseif ("$($args[2])" -eq "delete") { $_ROSBE_STATCOUNT = $($args[3]) remove-item "$ENV:APPDATA\RosBE\Updates\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.*" -force -recurse -EA SilentlyContinue remove-item "$ENV:APPDATA\RosBE\Updates\tmp\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.*" -force -recurse -EA SilentlyContinue + "Update-$($args[3]) Statistics resetted..." } elseif ("$($args[2])" -eq "info") { $_ROSBE_STATCOUNT = $($args[3]) set-location tmp Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Fri Jan 15 16:15:26 2010 @@ -22,12 +22,6 @@ :: Save the recent dir to cd back there at the end. set _ROSBE_OPATH=%CD% -if not exist "%_ROSBE_BASEDIR%\Tools\7z.exe" ( - cd /d "%_ROSBE_BASEDIR%\Tools" - wget.exe -N --ignore-length --no-verbose %_ROSBE_URL%/7z.exe 1> NUL 2> NUL - cd /d %_ROSBE_OPATH% -) - cd /d %_ROSBE_BASEDIR% :: First check for a new Updater @@ -49,16 +43,20 @@ set _ROSBE_MULTIUPD=1 set _ROSBE_STATCOUNT=1 call :WHILE + echo Update finished... ) else if /i "%1" == "reset" ( del /F /Q "%APPDATA%\RosBE\Updates\*.*" 1> NUL 2> NUL del /F /Q "%APPDATA%\RosBE\Updates\tmp\*.*" 1> NUL 2> NUL + echo Update Statistics resetted... ) else if /i "%1" == "nr" ( set _ROSBE_STATCOUNT=%2 call :UPDCHECK + echo Update Nr:%2 installed... ) else if /i "%1" == "delete" ( set _ROSBE_STATCOUNT=%2 del /F /Q "%APPDATA%\RosBE\Updates\%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.*" 1> NUL 2> NUL del /F /Q "%APPDATA%\RosBE\Updates\tmp\%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.*" 1> NUL 2> NUL + echo Update-%2 Statistics resetted... ) else if /i "%1" == "info" ( set _ROSBE_STATCOUNT=%2 cd tmp @@ -72,7 +70,7 @@ ) ) cd.. -del /F /Q tmp\*.* 1> NUL 2> NUL + del /F /Q tmp\*.* 1> NUL 2> NUL ) else if /i "%1" == "status" ( set _ROSBE_STATCOUNT=1 if not exist "tmp" mkdir tmp 1> NUL 2> NUL

1 0

[jimtabor] 45085: [Win32k|User32] - Switch to the new user handle manager. Added more handle types to win32k. One or two step to WND, desktop heap supported. - Test with every application in my test suite. Needs more testing and clean up. Bleeding edge!
by jimtabor＠svn.reactos.org 15 Jan '10

15 Jan '10

Author: jimtabor Date: Fri Jan 15 14:47:25 2010 New Revision: 45085 URL: http://svn.reactos.org/svn/reactos?rev=45085&view=rev Log: [Win32k|User32] - Switch to the new user handle manager. Added more handle types to win32k. One or two step to WND, desktop heap supported. - Test with every application in my test suite. Needs more testing and clean up. Bleeding edge! Modified: trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/include/object.h trunk/reactos/subsystems/win32/win32k/include/userfuncs.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -322,13 +322,13 @@ static const BOOL g_ObjectHeapTypeShared[VALIDATE_TYPE_EVENT + 1] = { FALSE, /* VALIDATE_TYPE_FREE (not used) */ - TRUE, /* VALIDATE_TYPE_WIN */ /* FIXME: FALSE once WINDOW_OBJECT is deleted! */ - TRUE, /* VALIDATE_TYPE_MENU */ + TRUE, /* VALIDATE_TYPE_WIN FALSE */ + TRUE, /* VALIDATE_TYPE_MENU FALSE */ TRUE, /* VALIDATE_TYPE_CURSOR */ TRUE, /* VALIDATE_TYPE_MWPOS */ - TRUE, /* VALIDATE_TYPE_HOOK */ + TRUE, /* VALIDATE_TYPE_HOOK FALSE */ FALSE, /* (not used) */ - TRUE, /* VALIDATE_TYPE_CALLPROC */ + TRUE, /* VALIDATE_TYPE_CALLPROC FALSE */ TRUE, /* VALIDATE_TYPE_ACCEL */ FALSE, /* (not used) */ FALSE, /* (not used) */ @@ -357,7 +357,10 @@ uType = pEntry->type; // Must have an entry and must be the same type! - if ( (!pEntry) || (pEntry->type != uType) || !pEntry->ptr ) + if ( (!pEntry) || + (pEntry->type != uType) || + !pEntry->ptr || + (pEntry->flags & HANDLEENTRY_INDESTROY) ) { switch ( uType ) { // Test (with wine too) confirms these results! @@ -442,6 +445,13 @@ return NULL; } +// HACK HACK HACK! +typedef struct _WNDX +{ + THRDESKHEAD head; + PWND pWnd; +} WNDX, *PWNDX; + // // Validate a window handle and return the pointer to the object. // @@ -460,9 +470,6 @@ Wnd = ValidateHandle((HANDLE)hwnd, VALIDATE_TYPE_WIN); if (Wnd != NULL) { - /* FIXME: Check if handle table entry is marked as deleting and - return NULL in this case! */ - #if 0 return Wnd; #else @@ -473,8 +480,8 @@ !!! REMOVE AS SOON AS WINDOW_OBJECT NO LONGER EXISTS !!! */ - if (*((PVOID*)Wnd) != NULL) - return DesktopPtrToUser(*((PVOID*)Wnd)); + if ( ((PWNDX)Wnd)->pWnd != NULL) + return DesktopPtrToUser( ((PWNDX)Wnd)->pWnd ); #endif } @@ -499,9 +506,6 @@ Wnd = ValidateHandleNoErr((HANDLE)hwnd, VALIDATE_TYPE_WIN); if (Wnd != NULL) { - /* FIXME: Check if handle table entry is marked as deleting and - return NULL in this case! */ - #if 0 return Wnd; #else @@ -512,8 +516,8 @@ !!! REMOVE AS SOON AS WINDOW_OBJECT NO LONGER EXISTS !!! */ - if (*((PVOID*)Wnd) != NULL) - return DesktopPtrToUser(*((PVOID*)Wnd)); + if ( ((PWNDX)Wnd)->pWnd != NULL) + return DesktopPtrToUser( ((PWNDX)Wnd)->pWnd ); #endif } Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -28,11 +28,11 @@ IN OUT PCALLPROCDATA CallProc); PCALLPROCDATA -CloneCallProc(IN PDESKTOPINFO Desktop, +CloneCallProc(IN PDESKTOP Desktop, IN PCALLPROCDATA CallProc); PCALLPROCDATA -CreateCallProc(IN PDESKTOPINFO Desktop, +CreateCallProc(IN PDESKTOP Desktop, IN WNDPROC WndProc, IN BOOL Unicode, IN PPROCESSINFO pi); Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -7,12 +7,6 @@ #define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ #define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ - -#define USER_HEADER_TO_BODY(ObjectHeader) \ - ((PVOID)(((PUSER_OBJECT_HEADER)ObjectHeader) + 1)) - -#define USER_BODY_TO_HEADER(ObjectBody) \ - ((PUSER_OBJECT_HEADER)(((PUSER_OBJECT_HEADER)ObjectBody) - 1)) #define HANDLEENTRY_INDESTROY 1 @@ -48,37 +42,31 @@ otWindow, otMenu, otCursorIcon, - otDWP, + otSMWP, otHook, - otCallProc = 7, + otClipBoardData, + otCallProc, otAccel, - otMonitor = 12, - otEvent = 15, - otTimer - + otDDEaccess, + otDDEconv, + otDDExact, + otMonitor, + otKBDlayout, + otKBDfile, + otEvent, + otTimer, + otInputContext, + otHidData, + otDeviceInfo, + otTouchInput, + otGestureInfo } USER_OBJECT_TYPE; - - -typedef struct _USER_OBJECT_HEADER -/* - * Header for user object - */ -{ -// USER_OBJECT_TYPE Type; - LONG RefCount; - BOOL destroyed; - HANDLE hSelf; -// CSHORT Size; -} USER_OBJECT_HEADER, *PUSER_OBJECT_HEADER; - typedef struct _USER_REFERENCE_ENTRY { SINGLE_LIST_ENTRY Entry; PVOID obj; } USER_REFERENCE_ENTRY, *PUSER_REFERENCE_ENTRY; - - #include <malloc.h> @@ -109,11 +97,11 @@ VOID FASTCALL UserReferenceObject(PVOID obj); PVOID FASTCALL UserReferenceObjectByHandle(HANDLE handle, USER_OBJECT_TYPE type); BOOL FASTCALL UserDereferenceObject(PVOID obj); -PVOID FASTCALL UserCreateObject(PUSER_HANDLE_TABLE ht, HANDLE* h,USER_OBJECT_TYPE type , ULONG size); +PVOID FASTCALL UserCreateObject(PUSER_HANDLE_TABLE ht, struct _DESKTOP* pDesktop, HANDLE* h,USER_OBJECT_TYPE type , ULONG size); BOOL FASTCALL UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ); PVOID UserGetObject(PUSER_HANDLE_TABLE ht, HANDLE handle, USER_OBJECT_TYPE type ); HANDLE UserAllocHandle(PUSER_HANDLE_TABLE ht, PVOID object, USER_OBJECT_TYPE type ); -BOOL UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ); +BOOL FASTCALL UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ); PVOID UserGetNextHandle(PUSER_HANDLE_TABLE ht, HANDLE* handle, USER_OBJECT_TYPE type ); PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ); BOOL FASTCALL UserCreateHandleTable(VOID); @@ -152,8 +140,6 @@ UserDereferenceObject(obj); } -HANDLE FASTCALL UserObjectToHandle(PVOID obj); - VOID FASTCALL CreateStockObjects (VOID); VOID FASTCALL CreateSysColorObjects (VOID); Modified: trunk/reactos/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -9,7 +9,7 @@ #define ASSERT_REFS_CO(_obj_) \ { \ - LONG ref = USER_BODY_TO_HEADER(_obj_)->RefCount;\ + LONG ref = ((PHEAD)_obj_)->cLockObj;\ if (!(ref >= 1)){ \ DPRINT1("ASSERT: obj 0x%x, refs %i\n", _obj_, ref); \ ASSERT(FALSE); \ @@ -21,7 +21,7 @@ { \ PSINGLE_LIST_ENTRY e; \ BOOL gotit=FALSE; \ - LONG ref = USER_BODY_TO_HEADER(_obj_)->RefCount;\ + LONG ref = ((PHEAD)_obj_)->cLockObj;\ if (!(ref >= 1)){ \ DPRINT1("obj 0x%x, refs %i\n", _obj_, ref); \ ASSERT(FALSE); \ @@ -38,7 +38,7 @@ } #endif -#define DUMP_REFS(obj) DPRINT1("obj 0x%x, refs %i\n",obj, USER_BODY_TO_HEADER(obj)->RefCount) +#define DUMP_REFS(obj) DPRINT1("obj 0x%x, refs %i\n",obj, ((PHEAD)obj)->cLockObj) PWINDOW_OBJECT FASTCALL IntGetWindowObject(HWND hWnd); Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -20,10 +20,7 @@ typedef struct _WINDOW_OBJECT { - /* NOTE: Do *NOT* Move this pointer anywhere in this structure! This - is a pointer to the WINDOW structure that eventually replaces - the WINDOW_OBJECT structure! USER32 expects this pointer to - be here until WINDOW_OBJECT has completely been superseded! */ + THRDESKHEAD head; PWND Wnd; /* Pointer to the thread information */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -86,7 +86,7 @@ return NULL; } - ASSERT(USER_BODY_TO_HEADER(Accel)->RefCount >= 0); + ASSERT(Accel->head.cLockObj >= 0); return Accel; } @@ -357,7 +357,7 @@ RETURN( (HACCEL) NULL ); } - Accel = UserCreateObject(gHandleTable, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); + Accel = UserCreateObject(gHandleTable, NULL, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); if (Accel == NULL) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -20,35 +20,30 @@ GetCallProcHandle(IN PCALLPROCDATA CallProc) { /* FIXME - check for 64 bit architectures... */ - return (WNDPROC)((ULONG_PTR)UserObjectToHandle(CallProc) | 0xFFFF0000); + return (WNDPROC)((ULONG_PTR)UserHMGetHandle(CallProc) | 0xFFFF0000); } VOID DestroyCallProc(IN PDESKTOPINFO Desktop, IN OUT PCALLPROCDATA CallProc) { - /* FIXME - use new object manager! */ - HANDLE Handle = UserObjectToHandle(CallProc); - - UserDeleteObject(Handle, - otCallProc); + UserDeleteObject(UserHMGetHandle(CallProc), otCallProc); } PCALLPROCDATA -CloneCallProc(IN PDESKTOPINFO Desktop, +CloneCallProc(IN PDESKTOP Desktop, IN PCALLPROCDATA CallProc) { PCALLPROCDATA NewCallProc; HANDLE Handle; - /* FIXME - use new object manager! */ NewCallProc = (PCALLPROCDATA)UserCreateObject(gHandleTable, + Desktop, &Handle, otCallProc, sizeof(CALLPROCDATA)); if (NewCallProc != NULL) { - NewCallProc->head.h = Handle; NewCallProc->pfnClientPrevious = CallProc->pfnClientPrevious; NewCallProc->wType = CallProc->wType; NewCallProc->spcpdNext = NULL; @@ -58,7 +53,7 @@ } PCALLPROCDATA -CreateCallProc(IN PDESKTOPINFO Desktop, +CreateCallProc(IN PDESKTOP Desktop, IN WNDPROC WndProc, IN BOOL Unicode, IN PPROCESSINFO pi) @@ -66,14 +61,13 @@ PCALLPROCDATA NewCallProc; HANDLE Handle; - /* FIXME - use new object manager! */ NewCallProc = (PCALLPROCDATA)UserCreateObject(gHandleTable, + Desktop, &Handle, otCallProc, sizeof(CALLPROCDATA)); if (NewCallProc != NULL) { - NewCallProc->head.h = Handle; NewCallProc->pfnClientPrevious = WndProc; NewCallProc->wType |= Unicode ? UserGetCPDA2U : UserGetCPDU2A ; NewCallProc->spcpdNext = NULL; @@ -90,7 +84,6 @@ /* NOTE: Accessing the WNDPROC_INFO structure may raise an exception! */ - /* FIXME - use new object manager! */ CallProc = UserGetObject(gHandleTable, hCallProc, otCallProc); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -95,7 +95,7 @@ return NULL; } - ASSERT(USER_BODY_TO_HEADER(CurIcon)->RefCount >= 1); + ASSERT(CurIcon->head.cLockObj >= 1); return CurIcon; } @@ -348,7 +348,7 @@ PCURICON_OBJECT CurIcon; HANDLE hCurIcon; - CurIcon = UserCreateObject(gHandleTable, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); + CurIcon = UserCreateObject(gHandleTable, NULL, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); if (!CurIcon) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -138,7 +138,7 @@ RemoveEntryList(&pEH->Chain); GlobalEvents->Counts--; if (!GlobalEvents->Counts) gpsi->dwInstalledEventHooks = 0; - UserDeleteObject(pEH->head.h, otEvent); + UserDeleteObject(UserHMGetHandle(pEH), otEvent); KeLeaveCriticalRegion(); return TRUE; } @@ -160,14 +160,14 @@ pEH = pEP->pEH; - Result = co_IntCallEventProc( pEH->head.h, - event, - hwnd, - pEP->idObject, - pEP->idChild, - (DWORD_PTR)(NtCurrentTeb()->ClientId).UniqueThread, - (DWORD)EngGetTickCount(), - pEH->Proc); + Result = co_IntCallEventProc( UserHMGetHandle(pEH), + event, + hwnd, + pEP->idObject, + pEP->idChild, + (DWORD_PTR)(NtCurrentTeb()->ClientId).UniqueThread, + (DWORD)EngGetTickCount(), + pEH->Proc); return Result; } @@ -323,7 +323,7 @@ } } - pEH = UserCreateObject(gHandleTable, &Handle, otEvent, sizeof(EVENTHOOK)); + pEH = UserCreateObject(gHandleTable, NULL, &Handle, otEvent, sizeof(EVENTHOOK)); if (pEH) { InsertTailList(&GlobalEvents->Events, &pEH->Chain); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -62,9 +62,9 @@ return NULL; } - ASSERT(USER_BODY_TO_HEADER(Hook)->RefCount >= 0); - - USER_BODY_TO_HEADER(Hook)->RefCount++; + ASSERT(Hook->head.cLockObj >= 0); + + Hook->head.cLockObj++; return Hook; } @@ -98,13 +98,12 @@ } } - Hook = UserCreateObject(gHandleTable, &Handle, otHook, sizeof(HOOK)); + Hook = UserCreateObject(gHandleTable, NULL, &Handle, otHook, sizeof(HOOK)); if (NULL == Hook) { return NULL; } - Hook->head.h = Handle; Hook->Thread = Thread; Hook->HookId = HookId; @@ -222,7 +221,7 @@ } /* Close handle */ - UserDeleteObject(Hook->head.h, otHook); + UserDeleteObject(UserHMGetHandle(Hook), otHook); } /* remove a hook, freeing it if the chain is not in use */ @@ -1283,7 +1282,7 @@ Hook->Proc = HookProc; Hook->Ansi = Ansi; - Handle = Hook->head.h; + Handle = UserHMGetHandle(Hook); /* Clear the client threads next hook. */ ClientInfo->phkCurrent = 0; @@ -1334,7 +1333,7 @@ RETURN( FALSE); } - ASSERT(Hook == HookObj->head.h); + ASSERT(Hook == UserHMGetHandle(HookObj)); IntRemoveHook(HookObj, WinStaObj, FALSE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -115,7 +115,7 @@ return NULL; } - ASSERT(USER_BODY_TO_HEADER(Menu)->RefCount >= 0); + ASSERT(Menu->head.cLockObj >= 0); return Menu; } @@ -179,9 +179,9 @@ PMENU_OBJECT Menu = UserGetMenuObject(hMenu); if (Menu) { - ASSERT(USER_BODY_TO_HEADER(Menu)->RefCount >= 0); - - USER_BODY_TO_HEADER(Menu)->RefCount++; + ASSERT(Menu->head.cLockObj >= 0); + + Menu->head.cLockObj++; } return Menu; } @@ -297,10 +297,11 @@ PMENU_OBJECT Menu; PPROCESSINFO CurrentWin32Process; - Menu = (PMENU_OBJECT)UserCreateObject( - gHandleTable, Handle, - otMenu, sizeof(MENU_OBJECT)); - + Menu = (PMENU_OBJECT)UserCreateObject( gHandleTable, + NULL, + Handle, + otMenu, + sizeof(MENU_OBJECT)); if(!Menu) { *Handle = 0; @@ -407,10 +408,11 @@ if(!Source) return NULL; - Menu = (PMENU_OBJECT)UserCreateObject( - gHandleTable, &hMenu, - otMenu, sizeof(MENU_OBJECT)); - + Menu = (PMENU_OBJECT)UserCreateObject( gHandleTable, + NULL, + &hMenu, + otMenu, + sizeof(MENU_OBJECT)); if(!Menu) return NULL; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -89,13 +89,12 @@ HANDLE Handle; PMONITOR Monitor; - Monitor = UserCreateObject(gHandleTable, &Handle, otMonitor, sizeof (MONITOR)); + Monitor = UserCreateObject(gHandleTable, NULL, &Handle, otMonitor, sizeof (MONITOR)); if (Monitor == NULL) { return NULL; } - Monitor->head.h = Handle; ExInitializeFastMutex(&Monitor->Lock); return Monitor; @@ -139,7 +138,7 @@ return NULL; } - ASSERT(USER_BODY_TO_HEADER(Monitor)->RefCount >= 0); + ASSERT(Monitor->head.cLockObj >= 0); return Monitor; } @@ -179,7 +178,7 @@ { DPRINT("Couldn't duplicate monitor name!\n"); UserDereferenceObject(Monitor); - UserDeleteObject(Monitor->head.h, otMonitor); + UserDeleteObject(UserHMGetHandle(Monitor), otMonitor); return STATUS_INSUFFICIENT_RESOURCES; } @@ -406,7 +405,7 @@ if (iCount < listSize) { if (hMonitorList != NULL) - hMonitorList[iCount] = Monitor->head.h; + hMonitorList[iCount] = UserHMGetHandle(Monitor); if (monitorRectList != NULL) monitorRectList[iCount] = IntersectionRect; } @@ -418,7 +417,7 @@ if (iCount < listSize) { if (hMonitorList != NULL) - hMonitorList[iCount] = NearestMonitor->head.h; + hMonitorList[iCount] = UserHMGetHandle(NearestMonitor); } iCount++; } @@ -427,7 +426,7 @@ if (iCount < listSize) { if (hMonitorList != NULL) - hMonitorList[iCount] = PrimaryMonitor->head.h; + hMonitorList[iCount] = UserHMGetHandle(PrimaryMonitor); } iCount++; } @@ -763,7 +762,7 @@ { PMONITOR MonitorObj = IntGetPrimaryMonitor(); if (MonitorObj) - hMonitor = MonitorObj->head.h; + hMonitor = UserHMGetHandle(MonitorObj); } else if (dwFlags == MONITOR_DEFAULTTONEAREST) { @@ -828,7 +827,7 @@ { PMONITOR monitorObj = IntGetPrimaryMonitor(); if (monitorObj) - return monitorObj->head.h; + return UserHMGetHandle(monitorObj); } else if (dwFlags == MONITOR_DEFAULTTONEAREST) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -168,6 +168,7 @@ switch (type) { case otWindow: + case otInputContext: pi = GetW32ThreadInfo(); break; @@ -250,26 +251,6 @@ return entry->ptr; } -/* free a user handle */ -BOOL UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ) -{ - PUSER_HANDLE_ENTRY entry; - PVOID object; - - if (!(entry = handle_to_entry( ht, handle ))) - { - SetLastNtError( STATUS_INVALID_HANDLE ); - return FALSE; - } - - object = free_user_entry(ht, entry ); - - /* We removed the handle, which was a reference! */ - return UserDereferenceObject(object); - - return TRUE; -} - /* return the next user handle after 'handle' that is of a given type */ PVOID UserGetNextHandle(PUSER_HANDLE_TABLE ht, HANDLE* handle, USER_OBJECT_TYPE type ) { @@ -296,111 +277,6 @@ return NULL; } -PVOID FASTCALL -UserCreateObject(PUSER_HANDLE_TABLE ht, HANDLE* h,USER_OBJECT_TYPE type , ULONG size) -{ - - HANDLE hi; - PUSER_OBJECT_HEADER hdr = UserHeapAlloc(size + sizeof(USER_OBJECT_HEADER));//ExAllocatePool(PagedPool, size + sizeof(USER_OBJECT_HEADER)); - if (!hdr) - return NULL; - - - hi = UserAllocHandle(ht, USER_HEADER_TO_BODY(hdr), type ); - if (!hi) - { - //ExFreePool(hdr); - UserHeapFree(hdr); - return NULL; - } - - RtlZeroMemory(hdr, size + sizeof(USER_OBJECT_HEADER)); - hdr->hSelf = hi; - hdr->RefCount = 2; // we need this, because we create 2 refs: handle and pointer! - - if (h) - *h = hi; - return USER_HEADER_TO_BODY(hdr); -} - -BOOL FASTCALL -UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ) -{ - PUSER_OBJECT_HEADER hdr; - PVOID body = UserGetObject(gHandleTable, h, type); - if (!body) - return FALSE; - - hdr = USER_BODY_TO_HEADER(body); - ASSERT(hdr->RefCount >= 1); - - hdr->destroyed = TRUE; - return UserFreeHandle(gHandleTable, h); -} - - -VOID FASTCALL UserReferenceObject(PVOID obj) -{ - PUSER_OBJECT_HEADER hdr = USER_BODY_TO_HEADER(obj); - - ASSERT(hdr->RefCount >= 0); - - hdr->RefCount++; -} - - -PVOID FASTCALL UserReferenceObjectByHandle(HANDLE handle, USER_OBJECT_TYPE type) -{ - PVOID object; - - object = UserGetObject(gHandleTable, handle, type); - if(object) - { - UserReferenceObject(object); - } - - return object; -} - - -HANDLE FASTCALL UserObjectToHandle(PVOID obj) -{ - PUSER_OBJECT_HEADER hdr = USER_BODY_TO_HEADER(obj); - return hdr->hSelf; -} - - -BOOL FASTCALL UserDereferenceObject(PVOID obj) -{ - PUSER_OBJECT_HEADER hdr = USER_BODY_TO_HEADER(obj); - - ASSERT(hdr->RefCount >= 1); - - hdr->RefCount--; - - // You can not have a zero here! - if (!hdr->destroyed && hdr->RefCount == 0) - { - hdr->RefCount++; // BOUNCE!!!!! - DPRINT1("warning! Dereference to zero without deleting! Obj -> 0x%x\n", obj); - } - - if (hdr->RefCount == 0 && hdr->destroyed) - { -// DPRINT1("info: something destroyed bcaise of deref, in use=%i\n",gpsi->cHandleEntries); - - memset(hdr, 0x55, sizeof(USER_OBJECT_HEADER)); - - return UserHeapFree(hdr); - //ExFreePool(hdr); - - return TRUE; - } - - return FALSE; -} - - BOOL FASTCALL UserCreateHandleTable(VOID) { @@ -434,24 +310,31 @@ // PVOID FASTCALL -NewUserCreateObject( PUSER_HANDLE_TABLE ht, - HANDLE* h, - USER_OBJECT_TYPE type, - ULONG size) +UserCreateObject( PUSER_HANDLE_TABLE ht, + PDESKTOP pDesktop, + HANDLE* h, + USER_OBJECT_TYPE type, + ULONG size) { HANDLE hi; PVOID Object; PTHREADINFO pti; PPROCESSINFO ppi; BOOL dt; + PDESKTOP rpdesk = pDesktop; pti = GetW32ThreadInfo(); ppi = pti->ppi; + if (!pDesktop) rpdesk = pti->rpdesk; switch (type) { - case otWindow: - Object = DesktopHeapAlloc(pti->rpdesk, size); +// case otWindow: +// case otMenu: +// case otHook: +// case otCallProc: + case otInputContext: + Object = DesktopHeapAlloc(rpdesk, size); dt = TRUE; break; @@ -469,7 +352,7 @@ if (!hi) { if (dt) - DesktopHeapFree(pti->rpdesk, Object); + DesktopHeapFree(rpdesk, Object); else UserHeapFree(Object); return NULL; @@ -481,7 +364,8 @@ { case otWindow: case otHook: - ((PTHRDESKHEAD)Object)->rpdesk = pti->rpdesk; + case otInputContext: + ((PTHRDESKHEAD)Object)->rpdesk = rpdesk; ((PTHRDESKHEAD)Object)->pSelf = Object; case otEvent: ((PTHROBJHEAD)Object)->pti = pti; @@ -489,7 +373,7 @@ case otMenu: case otCallProc: - ((PPROCDESKHEAD)Object)->rpdesk = pti->rpdesk; + ((PPROCDESKHEAD)Object)->rpdesk = rpdesk; ((PPROCDESKHEAD)Object)->pSelf = Object; break; @@ -509,9 +393,10 @@ return Object; } + BOOL FASTCALL -NewUserDereferenceObject(PVOID obj) +UserDereferenceObject(PVOID obj) { ASSERT(((PHEAD)obj)->cLockObj >= 1); @@ -524,7 +409,7 @@ BOOL FASTCALL -NewUserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ) +UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ) { PUSER_HANDLE_ENTRY entry; PVOID object; @@ -538,23 +423,30 @@ entry->flags = HANDLEENTRY_INDESTROY; - if (NewUserDereferenceObject(entry->ptr)) + if (UserDereferenceObject(entry->ptr)) { type = entry->type; object = free_user_entry(ht, entry ); - if (type == otWindow) // If more, go switch. + switch (type) { - return DesktopHeapFree(GetW32ThreadInfo()->rpdesk, object); +// case otWindow: +// case otMenu: +// case otHook: +// case otCallProc: + case otInputContext: + return DesktopHeapFree(((PTHRDESKHEAD)object)->rpdesk, object); + + default: + return UserHeapFree(object); } - return UserHeapFree(object); } return FALSE; } BOOL FASTCALL -NewUserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ) +UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ) { PVOID body = UserGetObject(gHandleTable, h, type); @@ -562,12 +454,12 @@ ASSERT( ((PHEAD)body)->cLockObj >= 1); - return NewUserFreeHandle(gHandleTable, h); + return UserFreeHandle(gHandleTable, h); } VOID FASTCALL -NewUserReferenceObject(PVOID obj) +UserReferenceObject(PVOID obj) { ASSERT(((PHEAD)obj)->cLockObj >= 0); @@ -576,14 +468,14 @@ PVOID FASTCALL -NewUserReferenceObjectByHandle(HANDLE handle, USER_OBJECT_TYPE type) +UserReferenceObjectByHandle(HANDLE handle, USER_OBJECT_TYPE type) { PVOID object; object = UserGetObject(gHandleTable, handle, type); if (object) { - NewUserReferenceObject(object); + UserReferenceObject(object); } return object; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -49,13 +49,13 @@ if (!FirstpTmr) { - FirstpTmr = UserCreateObject(gHandleTable, &Handle, otTimer, sizeof(TIMER)); + FirstpTmr = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER)); if (FirstpTmr) InitializeListHead(&FirstpTmr->ptmrList); Ret = FirstpTmr; } else { - Ret = UserCreateObject(gHandleTable, &Handle, otTimer, sizeof(TIMER)); + Ret = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER)); if (Ret) InsertTailList(&FirstpTmr->ptmrList, &Ret->ptmrList); } return Ret; @@ -69,7 +69,7 @@ if (pTmr) { RemoveEntryList(&pTmr->ptmrList); - UserDeleteObject( USER_BODY_TO_HEADER(pTmr)->hSelf, otTimer); + UserDeleteObject( UserHMGetHandle(pTmr), otTimer); return TRUE; } return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri Jan 15 14:47:25 2010 @@ -93,9 +93,9 @@ Window = UserGetWindowObject(hWnd); if (Window) { - ASSERT(USER_BODY_TO_HEADER(Window)->RefCount >= 0); - - USER_BODY_TO_HEADER(Window)->RefCount++; + ASSERT(Window->head.cLockObj >= 0); + + Window->head.cLockObj++; } return Window; } @@ -129,7 +129,7 @@ return NULL; } - ASSERT(USER_BODY_TO_HEADER(Window)->RefCount >= 0); + ASSERT(Window->head.cLockObj >= 0); return Window; } @@ -1806,6 +1806,7 @@ /* Create the window object. */ Window = (PWINDOW_OBJECT) UserCreateObject( gHandleTable, + pti->rpdesk, (PHANDLE)&hWnd, otWindow, sizeof(WINDOW_OBJECT));

1 0

[tkreuzer] 45084: Reduce difference to trunk
by tkreuzer＠svn.reactos.org 15 Jan '10

15 Jan '10

Author: tkreuzer Date: Fri Jan 15 14:09:00 2010 New Revision: 45084 URL: http://svn.reactos.org/svn/reactos?rev=45084&view=rev Log: Reduce difference to trunk Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Fri Jan 15 14:09:00 2010 @@ -1004,9 +1004,9 @@ /* Call the generic handler with the system module list */ Status = ExpQueryModuleInformation(&PsLoadedModuleList, &MmLoadedUserImageList, - (PRTL_PROCESS_MODULES)Buffer, - Size, - ReqSize); + (PRTL_PROCESS_MODULES)Buffer, + Size, + ReqSize); /* Release list lock and return status */ ExReleaseResourceLite(&PsLoadedModuleResource); @@ -1238,7 +1238,6 @@ QSI_DEF(SystemInterruptInformation) { PKPRCB Prcb; - PKPCR Pcr; LONG i; ULONG ti; PSYSTEM_INTERRUPT_INFORMATION sii = (PSYSTEM_INTERRUPT_INFORMATION)Buffer; @@ -1253,16 +1252,7 @@ for (i = 0; i < KeNumberProcessors; i++) { Prcb = KiProcessorBlock[i]; -#ifdef _M_AMD64 - Pcr = CONTAINING_RECORD(Prcb, KPCR, CurrentPrcb); -#else - Pcr = CONTAINING_RECORD(Prcb, KPCR, Prcb); -#endif -#ifdef _M_ARM // This code should probably be done differently - sii->ContextSwitches = Pcr->ContextSwitches; -#else - sii->ContextSwitches = ((PKIPCR)Pcr)->ContextSwitches; -#endif + sii->ContextSwitches = KeGetContextSwitches(Prcb); sii->DpcCount = Prcb->DpcData[0].DpcCount; sii->DpcRate = Prcb->DpcRequestRate; sii->TimeIncrement = ti; @@ -1382,11 +1372,11 @@ PVOID SectionPointer = Buffer; /* Validate size */ - if(Size != sizeof(PVOID)) + if (Size != sizeof(PVOID)) { /* Incorrect length, fail */ return STATUS_INFO_LENGTH_MISMATCH; - } + } /* Only kernel mode can call this function */ if (ExGetPreviousMode() != KernelMode) return STATUS_PRIVILEGE_NOT_HELD; @@ -1394,7 +1384,7 @@ /* Unload the image */ MmUnloadSystemImage(SectionPointer); return STATUS_SUCCESS; - } +} /* Class 28 - Time Adjustment Information */ QSI_DEF(SystemTimeAdjustmentInformation)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs