Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[fireball] 43357: Alexander Yastrebov <menone7@gmail.com> - SetDllDirectory should add a directory to the search path used to locate DLLs for the application. See issue #4820 for more details.
by fireball＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: fireball Date: Sat Oct 10 11:16:34 2009 New Revision: 43357 URL: http://svn.reactos.org/svn/reactos?rev=43357&view=rev Log: Alexander Yastrebov <menone7(a)gmail.com> - SetDllDirectory should add a directory to the search path used to locate DLLs for the application. See issue #4820 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Sat Oct 10 11:16:34 2009 @@ -63,6 +63,7 @@ } Length += GetCurrentDirectoryW(0, NULL); + Length += GetDllDirectoryW(0, NULL); Length += GetSystemDirectoryW(NULL, 0); Length += GetWindowsDirectoryW(NULL, 0); Length += GetEnvironmentVariableW(L"PATH", NULL, 0); @@ -83,6 +84,8 @@ } Pos += GetCurrentDirectoryW(Length, EnvironmentBufferW + Pos); + EnvironmentBufferW[Pos++] = L';'; + Pos += GetDllDirectoryW(Length - Pos, EnvironmentBufferW + Pos); EnvironmentBufferW[Pos++] = L';'; Pos += GetSystemDirectoryW(EnvironmentBufferW + Pos, Length - Pos); EnvironmentBufferW[Pos++] = L';';

1 0

[fireball] 43356: [fastfat_new] - Manually fetch a short name entry in FatSetFcbNames and process it. - Get a long name and process it too (though right now there is problem, FullFAT returns a short name instead of a true long name). - Silence debug prints in FatiRead.
by fireball＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: fireball Date: Sat Oct 10 11:13:39 2009 New Revision: 43356 URL: http://svn.reactos.org/svn/reactos?rev=43356&view=rev Log: [fastfat_new] - Manually fetch a short name entry in FatSetFcbNames and process it. - Get a long name and process it too (though right now there is problem, FullFAT returns a short name instead of a true long name). - Silence debug prints in FatiRead. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Sat Oct 10 11:13:39 2009 @@ -306,7 +306,6 @@ VOID NTAPI FatSetFcbNames(IN PFAT_IRP_CONTEXT IrpContext, - IN PUNICODE_STRING Lfn, IN PFCB Fcb); VOID NTAPI Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Sat Oct 10 11:13:39 2009 @@ -150,7 +150,7 @@ Fcb->FatHandle = FileHandle; /* Set names */ - FatSetFcbNames(IrpContext, NULL, Fcb); + FatSetFcbNames(IrpContext, Fcb); return Fcb; } @@ -247,12 +247,17 @@ VOID NTAPI FatSetFcbNames(IN PFAT_IRP_CONTEXT IrpContext, - IN PUNICODE_STRING Lfn, IN PFCB Fcb) { FF_DIRENT DirEnt; FF_ERROR Err; POEM_STRING ShortName; + CHAR ShortNameRaw[13]; + UCHAR EntryBuffer[32]; + UCHAR NumLFNs; + PUNICODE_STRING UnicodeName; + OEM_STRING LongNameOem; + NTSTATUS Status; /* Get the dir entry */ Err = FF_GetEntry(Fcb->Vcb->Ioman, @@ -266,18 +271,51 @@ return; } + /* Read the dirent to fetch the raw short name */ + FF_FetchEntry(Fcb->Vcb->Ioman, + Fcb->FatHandle->DirCluster, + Fcb->FatHandle->DirEntry, + EntryBuffer); + NumLFNs = (UCHAR)(EntryBuffer[0] & ~0x40); + RtlCopyMemory(ShortNameRaw, EntryBuffer, 11); + /* Initialize short name string */ ShortName = &Fcb->ShortName.Name.Ansi; ShortName->Buffer = Fcb->ShortNameBuffer; ShortName->Length = 0; ShortName->MaximumLength = sizeof(Fcb->ShortNameBuffer); - /* Convert dirent to the proper string */ - Fati8dot3ToString(DirEnt.FileName, FALSE, ShortName); - - // Unicode name - - // Add names to the splay tree + /* Convert raw short name to a proper string */ + Fati8dot3ToString(ShortNameRaw, FALSE, ShortName); + + /* Get the long file name (if any) */ + if (NumLFNs > 0) + { + /* Prepare the oem string */ + LongNameOem.Buffer = DirEnt.FileName; + LongNameOem.MaximumLength = FF_MAX_FILENAME; + LongNameOem.Length = strlen(DirEnt.FileName); + + /* Prepare the unicode string */ + UnicodeName = &Fcb->LongName.Name.String; + UnicodeName->Length = (LongNameOem.Length + 1) * sizeof(WCHAR); + UnicodeName->MaximumLength = UnicodeName->Length; + UnicodeName->Buffer = FsRtlAllocatePool(PagedPool, UnicodeName->Length); + + /* Convert it to unicode */ + Status = RtlOemStringToUnicodeString(UnicodeName, &LongNameOem, FALSE); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + } + + RtlDowncaseUnicodeString(UnicodeName, UnicodeName, FALSE); + RtlUpcaseUnicodeString(UnicodeName, UnicodeName, FALSE); + + DPRINT1("Converted long name: %wZ\n", UnicodeName); + } + + // TODO: Add names to the splay tree } VOID @@ -286,7 +324,7 @@ IN BOOLEAN DownCase, OUT POEM_STRING OutString) { -#if 0 +#if 1 ULONG BaseLen, ExtLen; CHAR *cString = OutString->Buffer; ULONG i; Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Sat Oct 10 11:13:39 2009 @@ -40,7 +40,7 @@ OpenType = FatDecodeFileObject(FileObject, &Vcb, &Fcb, &Ccb); - DPRINT1("FatiRead() Fcb %p, Name %wZ, Offset %d, Length %d, Handle %p\n", + DPRINT("FatiRead() Fcb %p, Name %wZ, Offset %d, Length %d, Handle %p\n", Fcb, &FileObject->FileName, ByteOffset.LowPart, NumberOfBytes, Fcb->FatHandle); /* Perform actual read */ @@ -52,14 +52,14 @@ else { Buffer = FatMapUserBuffer(IrpContext->Irp); - DPRINT1("Normal cached read, buffer %p\n"); + DPRINT("Normal cached read, buffer %p\n"); /* Set offset */ FF_Seek(Fcb->FatHandle, ByteOffset.LowPart, FF_SEEK_SET); /* Read */ BytesRead = FF_Read(Fcb->FatHandle, NumberOfBytes, 1, Buffer); - DPRINT1("Read %d bytes\n", BytesRead); + DPRINT("Read %d bytes\n", BytesRead); /* Indicate we read requested amount of bytes */ IrpContext->Irp->IoStatus.Information = BytesRead;

1 0

[cgutman] 43355: - Small fix for 43354 - Only pass the physical address if we have it
by cgutman＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: cgutman Date: Sat Oct 10 10:26:20 2009 New Revision: 43355 URL: http://svn.reactos.org/svn/reactos?rev=43355&view=rev Log: - Small fix for 43354 - Only pass the physical address if we have it Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sat Oct 10 10:26:20 2009 @@ -203,7 +203,8 @@ { TI_DbgPrint(DEBUG_NCACHE, ("Called. NCE (0x%X).\n", NCE)); - ARPTransmit(&NCE->Address, NCE->LinkAddress, + ARPTransmit(&NCE->Address, + (NCE->State & NUD_INCOMPLETE) ? NULL : NCE->LinkAddress, NCE->Interface); }

1 0

[cgutman] 43354: - Fix timeout values - Don't reply to ARP requests unless they are address to us - We now reset the NCE timeout if we receive a packet from the neighbor - Fixes ARP flooding (bug 4879)
by cgutman＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: cgutman Date: Sat Oct 10 09:43:39 2009 New Revision: 43354 URL: http://svn.reactos.org/svn/reactos?rev=43354&view=rev Log: - Fix timeout values - Don't reply to ARP requests unless they are address to us - We now reset the NCE timeout if we receive a packet from the neighbor - Fixes ARP flooding (bug 4879) Modified: trunk/reactos/drivers/network/tcpip/include/arp.h trunk/reactos/drivers/network/tcpip/include/neighbor.h trunk/reactos/lib/drivers/ip/network/arp.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/neighbor.c Modified: trunk/reactos/drivers/network/tcpip/include/arp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/arp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/arp.h [iso-8859-1] Sat Oct 10 09:43:39 2009 @@ -24,7 +24,7 @@ #define ARP_OPCODE_REPLY WH2N(0x0002) /* ARP reply */ -BOOLEAN ARPTransmit(PIP_ADDRESS Address, PIP_INTERFACE Interface); +BOOLEAN ARPTransmit(PIP_ADDRESS Address, PVOID LinkAddress, PIP_INTERFACE Interface); VOID ARPReceive( PVOID Context, Modified: trunk/reactos/drivers/network/tcpip/include/neighbor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] Sat Oct 10 09:43:39 2009 @@ -44,11 +44,14 @@ #define NUD_PERMANENT 0x02 #define NUD_STALE 0x04 +/* Number of seconds between ARP transmissions */ +#define ARP_RATE 900 + /* Number of seconds before the NCE times out */ -#define ARP_TIMEOUT 30 +#define ARP_TIMEOUT ARP_RATE + 15 -/* Number of seconds between ARP transmissions */ -#define ARP_RATE 10 +/* Number of seconds before retransmission */ +#define ARP_TIMEOUT_RETRANSMISSION 5 extern NEIGHBOR_CACHE_TABLE NeighborCache[NB_HASHMASK + 1]; @@ -98,6 +101,9 @@ PIP_INTERFACE Interface, PIPARP_ENTRY ArpTable); +VOID NBResetNeighborTimeout( + PIP_ADDRESS Address); + #endif /* __NEIGHBOR_H */ /* EOF */ Modified: trunk/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/arp… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Sat Oct 10 09:43:39 2009 @@ -108,7 +108,8 @@ } -BOOLEAN ARPTransmit(PIP_ADDRESS Address, PIP_INTERFACE Interface) +BOOLEAN ARPTransmit(PIP_ADDRESS Address, PVOID LinkAddress, + PIP_INTERFACE Interface) /* * FUNCTION: Creates an ARP request and transmits it on a network * ARGUMENTS: @@ -152,7 +153,7 @@ (UCHAR)ProtoAddrLen, /* Protocol address length */ Interface->Address, /* Sender's (local) hardware address */ &Interface->Unicast.Address.IPv4Address,/* Sender's (local) protocol address */ - NULL, /* Don't care */ + LinkAddress, /* Target's (remote) hardware address */ &Address->Address.IPv4Address, /* Target's (remote) protocol address */ ARP_OPCODE_REQUEST); /* ARP request */ @@ -225,7 +226,8 @@ Header->HWAddrLen, 0, ARP_TIMEOUT); } - if (Header->Opcode != ARP_OPCODE_REQUEST) + if (Header->Opcode != ARP_OPCODE_REQUEST || + !AddrIsEqual(&Address, &Interface->Unicast)) return; /* This is a request for our address. Swap the addresses and Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Sat Oct 10 09:43:39 2009 @@ -93,10 +93,12 @@ */ { UINT Protocol; + IP_ADDRESS SrcAddress; switch (IPPacket->Type) { case IP_ADDRESS_V4: Protocol = ((PIPv4_HEADER)(IPPacket->Header))->Protocol; + AddrInitIPv4(&SrcAddress, ((PIPv4_HEADER)(IPPacket->Header))->SrcAddr); break; case IP_ADDRESS_V6: /* FIXME: IPv6 adresses not supported */ @@ -107,6 +109,8 @@ return; } + NBResetNeighborTimeout(&SrcAddress); + if (Protocol < IP_PROTOCOL_TABLE_SIZE) { /* Call the appropriate protocol handler */ @@ -219,7 +223,7 @@ /* Send a gratuitous ARP packet to update the route caches of * other computers */ if (IF != Loopback) - ARPTransmit(NULL, IF); + ARPTransmit(NULL, NULL, IF); } BOOLEAN IPRegisterInterface( Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sat Oct 10 09:43:39 2009 @@ -105,20 +105,35 @@ TcpipAcquireSpinLock(&NeighborCache[i].Lock, &OldIrql); for (PrevNCE = &NeighborCache[i].Cache; - (NCE = *PrevNCE) != NULL; - PrevNCE = &NCE->Next) { + (NCE = *PrevNCE) != NULL;) { /* Check if event timer is running */ if (NCE->EventTimer > 0) { ASSERT(!(NCE->State & NUD_PERMANENT)); NCE->EventCount++; - if (NCE->EventCount % ARP_RATE == 0) + if ((NCE->EventCount > ARP_RATE && + NCE->EventCount % ARP_TIMEOUT_RETRANSMISSION == 0) || + (NCE->EventCount == ARP_RATE)) + { + /* We haven't gotten a packet from them in + * EventCount seconds so we mark them as stale + * and solicit now */ + NCE->State |= NUD_STALE; NBSendSolicit(NCE); + } if (NCE->EventTimer - NCE->EventCount == 0) { - NCE->State |= NUD_STALE; - - NCE->EventCount = 0; + /* Solicit one last time */ + NBSendSolicit(NCE); + + /* Unlink and destroy the NCE */ + *PrevNCE = NCE->Next; + + NBFlushPacketQueue(NCE, NDIS_STATUS_REQUEST_ABORTED); + exFreePool(NCE); + + continue; } } + PrevNCE = &NCE->Next; } TcpipReleaseSpinLock(&NeighborCache[i].Lock, OldIrql); @@ -188,7 +203,8 @@ { TI_DbgPrint(DEBUG_NCACHE, ("Called. NCE (0x%X).\n", NCE)); - ARPTransmit(&NCE->Address, NCE->Interface); + ARPTransmit(&NCE->Address, NCE->LinkAddress, + NCE->Interface); } PNEIGHBOR_CACHE_ENTRY NBAddNeighbor( @@ -300,6 +316,37 @@ if( !(NCE->State & NUD_INCOMPLETE) ) NBSendPackets( NCE ); +} + +VOID +NBResetNeighborTimeout(PIP_ADDRESS Address) +{ + KIRQL OldIrql; + UINT HashValue; + PNEIGHBOR_CACHE_ENTRY NCE; + + TI_DbgPrint(DEBUG_NCACHE, ("Resetting NCE timout for 0x%s\n", A2S(Address))); + + HashValue = *(PULONG)(&Address->Address); + HashValue ^= HashValue >> 16; + HashValue ^= HashValue >> 8; + HashValue ^= HashValue >> 4; + HashValue &= NB_HASHMASK; + + TcpipAcquireSpinLock(&NeighborCache[HashValue].Lock, &OldIrql); + + for (NCE = NeighborCache[HashValue].Cache; + NCE != NULL; + NCE = NCE->Next) + { + if (AddrIsEqual(Address, &NCE->Address)) + { + NCE->EventCount = 0; + break; + } + } + + TcpipReleaseSpinLock(&NeighborCache[HashValue].Lock, OldIrql); } PNEIGHBOR_CACHE_ENTRY NBLocateNeighbor(

1 0

[jimtabor] 43353: - Do not test for IMM start up from client info, instead do not attach to system threads. Thanks Tommy Ward.
by jimtabor＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: jimtabor Date: Sat Oct 10 07:15:43 2009 New Revision: 43353 URL: http://svn.reactos.org/svn/reactos?rev=43353&view=rev Log: - Do not test for IMM start up from client info, instead do not attach to system threads. Thanks Tommy Ward. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat Oct 10 07:15:43 2009 @@ -1314,9 +1314,9 @@ /* Can not be the same thread.*/ if (pti == ptiTo) return FALSE; - /* Do not attach if IMM is in activate mode or between different desktops. */ - if ( pti->pClientInfo->CI_flags & CI_IMMACTIVATE || - ptiTo->pClientInfo->CI_flags & CI_IMMACTIVATE || + /* Do not attach to system threads or between different desktops. */ + if ( pti->TIF_flags & TIF_DONTATTACHQUEUE || + ptiTo->TIF_flags & TIF_DONTATTACHQUEUE || pti->Desktop != ptiTo->Desktop ) return FALSE;

1 0

[jimtabor] 43352: - [Win32k] Implement AttachThreadInput, not yet connected to the thread message queue, update related. - See http://www.codeproject.com/KB/cpp/onscreenkeyboard.aspx for test program.
by jimtabor＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: jimtabor Date: Sat Oct 10 06:40:36 2009 New Revision: 43352 URL: http://svn.reactos.org/svn/reactos?rev=43352&view=rev Log: - [Win32k] Implement AttachThreadInput, not yet connected to the thread message queue, update related. - See http://www.codeproject.com/KB/cpp/onscreenkeyboard.aspx for test program. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Oct 10 06:40:36 2009 @@ -124,7 +124,13 @@ PVOID pvWnd; } CALLBACKWND, *PCALLBACKWND; -#define CI_CURTHPRHOOK 0x00000010 +#define CI_TRANSACTION 0x00000001 +#define CI_QUEUEMSG 0x00000002 +#define CI_WOW 0x00000004 +#define CI_INITTHREAD 0x00000008 +#define CI_CURTHPRHOOK 0x00000010 +#define CI_CLASSESREGISTERED 0x00000020 +#define CI_IMMACTIVATE 0x00000040 typedef struct _CLIENTINFO { Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Sat Oct 10 06:40:36 2009 @@ -14,6 +14,15 @@ HKL hkl; DWORD klid; // Low word - language id. High word - device id. } KBL, *PKBL; + +typedef struct _ATTACHINFO +{ + struct _ATTACHINFO* paiNext; + PTHREADINFO pti1; + PTHREADINFO pti2; +} ATTACHINFO, *PATTACHINFO; + +extern PATTACHINFO gpai; #define KBL_UNLOAD 1 #define KBL_PRELOAD 2 @@ -33,6 +42,7 @@ BOOL UserInitDefaultKeyboardLayout(); PKBL UserHklToKbl(HKL hKl); +BOOL FASTCALL UserAttachThreadInput(PTHREADINFO,PTHREADINFO,BOOL); #define ThreadHasInputAccess(W32Thread) \ (TRUE) Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Sat Oct 10 06:40:36 2009 @@ -26,6 +26,7 @@ #define TAG_CALLBACK 'KCBC' /* callback memory */ #define TAG_WINSTA 'ATSW' /* window station */ #define TAG_PDCE 'cdsU' /* dce */ +#define TAG_ATTACHINFO 'iasU' /* Attach Info Input */ #define TAG_INPUT 'yssU' /* Input */ /* gdi objects from the handle table */ Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat Oct 10 06:40:36 2009 @@ -105,10 +105,18 @@ PDESKTOPINFO pDeskInfo; PCLIENTINFO pClientInfo; FLONG TIF_flags; + PUNICODE_STRING pstrAppName; LONG timeLast; + ULONG_PTR idLast; + INT exitCode; HANDLE hDesktop; UINT cPaintsReady; /* Count of paints pending. */ UINT cTimersReady; /* Count of timers pending. */ + DWORD dwExpWinVer; + DWORD dwCompatFlags; + DWORD dwCompatFlags2; + struct _USER_MESSAGE_QUEUE* pqAttach; + PTHREADINFO ptiSibling; ULONG fsHooks; PHOOK sphkCurrent; LIST_ENTRY PtiLink; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat Oct 10 06:40:36 2009 @@ -1,23 +1,4 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window classes @@ -42,6 +23,7 @@ PTHREADINFO ptiRawInput; PKTIMER MasterTimer; +PATTACHINFO gpai = NULL; static HANDLE MouseDeviceHandle; static HANDLE MouseThreadHandle; @@ -1324,6 +1306,57 @@ return FALSE; } +BOOL FASTCALL +UserAttachThreadInput( PTHREADINFO pti, PTHREADINFO ptiTo, BOOL fAttach) +{ + PATTACHINFO pai; + + /* Can not be the same thread.*/ + if (pti == ptiTo) return FALSE; + + /* Do not attach if IMM is in activate mode or between different desktops. */ + if ( pti->pClientInfo->CI_flags & CI_IMMACTIVATE || + ptiTo->pClientInfo->CI_flags & CI_IMMACTIVATE || + pti->Desktop != ptiTo->Desktop ) + return FALSE; + + /* If Attach set, allocate and link. */ + if ( fAttach ) + { + pai = ExAllocatePoolWithTag(PagedPool, sizeof(ATTACHINFO), TAG_ATTACHINFO); + if ( !pai ) return FALSE; + + pai->paiNext = gpai; + pai->pti1 = pti; + pai->pti2 = ptiTo; + gpai = pai; + } + else /* If clear, unlink and free it. */ + { + PATTACHINFO paiprev = NULL; + + if ( !gpai ) return FALSE; + + pai = gpai; + + /* Search list and free if found or return false. */ + do + { + if ( pai->pti2 == ptiTo && pai->pti1 == pti ) break; + paiprev = pai; + pai = pai->paiNext; + } while (pai); + + if ( !pai ) return FALSE; + + if (paiprev) paiprev->paiNext = pai->paiNext; + + ExFreePoolWithTag(pai, TAG_ATTACHINFO); + } + + return TRUE; +} + UINT APIENTRY NtUserSendInput( Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sat Oct 10 06:40:36 2009 @@ -31,9 +31,36 @@ IN DWORD idAttachTo, IN BOOL fAttach) { - UNIMPLEMENTED - - return 0; + NTSTATUS Status; + PETHREAD Thread, ThreadTo; + PTHREADINFO pti, ptiTo; + BOOL Ret = FALSE; + + UserEnterExclusive(); + Status = PsLookupThreadByThreadId((HANDLE)idAttach, &Thread); + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + goto Exit; + } + Status = PsLookupThreadByThreadId((HANDLE)idAttachTo, &ThreadTo); + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + ObDereferenceObject(Thread); + goto Exit; + } + + pti = PsGetThreadWin32Thread(Thread); + ptiTo = PsGetThreadWin32Thread(ThreadTo); + ObDereferenceObject(Thread); + ObDereferenceObject(ThreadTo); + + Ret = UserAttachThreadInput( pti, ptiTo, fAttach); + +Exit: + UserLeave(); + return Ret; } //

1 0

[janderwald] 43351: - Map STATUS_NOT_FOUND to ERROR_NOT_FOUND
by janderwald＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: janderwald Date: Sat Oct 10 05:45:57 2009 New Revision: 43351 URL: http://svn.reactos.org/svn/reactos?rev=43351&view=rev Log: - Map STATUS_NOT_FOUND to ERROR_NOT_FOUND Modified: trunk/reactos/lib/rtl/error.c Modified: trunk/reactos/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/error.c?rev=43351&… ============================================================================== --- trunk/reactos/lib/rtl/error.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/error.c [iso-8859-1] Sat Oct 10 05:45:57 2009 @@ -594,7 +594,7 @@ ERROR_MR_MID_NOT_FOUND, /* c0000222 */ ERROR_MR_MID_NOT_FOUND, /* c0000223 */ ERROR_PASSWORD_MUST_CHANGE, /* c0000224 (STATUS_PASSWORD_MUST_CHANGE) */ - ERROR_MR_MID_NOT_FOUND, /* c0000225 */ + ERROR_NOT_FOUND, /* c0000225 (STATUS_NOT_FOUND)*/ ERROR_MR_MID_NOT_FOUND, /* c0000226 */ ERROR_MR_MID_NOT_FOUND, /* c0000227 */ ERROR_MR_MID_NOT_FOUND, /* c0000228 */

1 0

[cgutman] 43350: - Specify the interface index so the route won't get added to interface 0 (loopback) - Warn if something tries to add a route to the loopback adapter - Fixes routing issues some people were having
by cgutman＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: cgutman Date: Sat Oct 10 04:04:13 2009 New Revision: 43350 URL: http://svn.reactos.org/svn/reactos?rev=43350&view=rev Log: - Specify the interface index so the route won't get added to interface 0 (loopback) - Warn if something tries to add a route to the loopback adapter - Fixes routing issues some people were having Modified: trunk/reactos/base/services/dhcp/adapter.c trunk/reactos/base/services/dhcp/dhclient.c trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Sat Oct 10 04:04:13 2009 @@ -182,6 +182,7 @@ Adapter->RouterMib.dwForwardDest = 0; Adapter->RouterMib.dwForwardMask = 0; Adapter->RouterMib.dwForwardMetric1 = 1; + Adapter->RouterMib.dwForwardIfIndex = Adapter->IfMib.dwIndex; Adapter->RouterMib.dwForwardNextHop = inet_addr(DefaultGateway); Error = CreateIpForwardEntry( &Adapter->RouterMib ); if( Error ) Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Sat Oct 10 04:04:13 2009 @@ -519,6 +519,7 @@ Adapter->RouterMib.dwForwardDest = 0; /* Default route */ Adapter->RouterMib.dwForwardMask = 0; Adapter->RouterMib.dwForwardMetric1 = 1; + Adapter->RouterMib.dwForwardIfIndex = Adapter->IfMib.dwIndex; if( Adapter->RouterMib.dwForwardNextHop ) { /* If we set a default route before, delete it before continuing */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] Sat Oct 10 04:04:13 2009 @@ -181,6 +181,12 @@ AddrInitIPv4( &Netmask, Route->Mask ); AddrInitIPv4( &Router, Route->Gw ); + if (IF == Loopback) + { + DbgPrint("Failing attempt to add route to loopback adapter\n"); + return TDI_INVALID_PARAMETER; + } + if( Route->Type == IP_ROUTE_TYPE_ADD ) { /* Add the route */ TI_DbgPrint(DEBUG_INFO,("Adding route (%s)\n", A2S(&Address))); if (!RouterCreateRoute( &Address, &Netmask, &Router,

1 0

[mjmartin] 43349: - KeyboardThreadMain: Set RepeatRate to 1 vice 0. Fixes text input in OpenOffice Writer.
by mjmartin＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: mjmartin Date: Sat Oct 10 03:13:17 2009 New Revision: 43349 URL: http://svn.reactos.org/svn/reactos?rev=43349&view=rev Log: - KeyboardThreadMain: Set RepeatRate to 1 vice 0. Fixes text input in OpenOffice Writer. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat Oct 10 03:13:17 2009 @@ -764,7 +764,7 @@ } else { - RepeatCount = 0; + RepeatCount = 1; LastFlags = KeyInput.Flags & (KEY_E0 | KEY_E1); LastMakeCode = KeyInput.MakeCode; }

1 0

[tkreuzer] 43348: Fix SECURITY_DESCRIPTOR_RELATIVE that I broke, spotted by Stefan
by tkreuzer＠svn.reactos.org 09 Oct '09

09 Oct '09

Author: tkreuzer Date: Sat Oct 10 00:52:39 2009 New Revision: 43348 URL: http://svn.reactos.org/svn/reactos?rev=43348&view=rev Log: Fix SECURITY_DESCRIPTOR_RELATIVE that I broke, spotted by Stefan Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=43… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sat Oct 10 00:52:39 2009 @@ -945,10 +945,10 @@ UCHAR Revision; UCHAR Sbz1; SECURITY_DESCRIPTOR_CONTROL Control; - DWORD_PTR Owner; - DWORD_PTR Group; - DWORD_PTR Sacl; - DWORD_PTR Dacl; + ULONG Owner; + ULONG Group; + ULONG Sacl; + ULONG Dacl; } SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; typedef enum _TOKEN_INFORMATION_CLASS { TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner,

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009