Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 43361: - Mark wtsapi32 as forked.
by fireball＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: fireball Date: Sat Oct 10 14:56:02 2009 New Revision: 43361 URL: http://svn.reactos.org/svn/reactos?rev=43361&view=rev Log: - Mark wtsapi32 as forked. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Oct 10 14:56:02 2009 @@ -174,7 +174,7 @@ reactos/dll/win32/wintrust # Out of sync reactos/dll/win32/wldap32 # Autosync reactos/dll/win32/wmi # Autosync -reactos/dll/win32/wtsapi32 # Autosync +reactos/dll/win32/wtsapi32 # Forked reactos/dll/win32/wuapi # Autosync reactos/dll/win32/xinput1_1 # Autosync reactos/dll/win32/xinput1_2 # Autosync

1 0

[fireball] 43360: [wtsapi32] Andrey Ivanov <andrey.v.ivanov@gmail.com> - Implement WTSEnumerateProcessesA and WTSEnumerateProcessesW. See issue #4658 for more details.
by fireball＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: fireball Date: Sat Oct 10 14:55:34 2009 New Revision: 43360 URL: http://svn.reactos.org/svn/reactos?rev=43360&view=rev Log: [wtsapi32] Andrey Ivanov <andrey.v.ivanov(a)gmail.com> - Implement WTSEnumerateProcessesA and WTSEnumerateProcessesW. See issue #4658 for more details. Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild trunk/reactos/include/psdk/wtsapi32.h Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] Sat Oct 10 14:55:34 2009 @@ -15,13 +15,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS #include "config.h" #include <stdarg.h> -#include <stdlib.h> #include "windef.h" + #include "winbase.h" #include "wtsapi32.h" -#include "wine/debug.h" +#include "winnls.h" +#include "aclapi.h" +#include "debug.h" + +#if defined(_MSC_VER) + #include "ntstatus.h" +#endif + +#include "ketypes.h" +#include "extypes.h" +#include "exfuncs.h" +#include "rtlfuncs.h" WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); @@ -47,6 +59,8 @@ return TRUE; } +static PVOID WTSMallocMemory(SIZE_T nSize); + /************************************************************ * WTSCloseServer (WTSAPI32.@) */ @@ -65,18 +79,204 @@ } /************************************************************ +* QueryProcesses +* Helper function for getting processes list from NtQuerySystemInformation +*/ +static PSYSTEM_PROCESS_INFORMATION QueryProcesses() +{ + PSYSTEM_PROCESS_INFORMATION SysProcessesInfo = NULL; + NTSTATUS Status; + ULONG BufferSize = 0x8000; + ULONG ReturnedBufferSize = 0; + do + { + /* free the buffer, and reallocate it to the new size. RATIONALE: since we + ignore the buffer's contents at this point, there's no point in a realloc() + that could end up copying a large chunk of data we'd discard anyway */ + WTSFreeMemory(SysProcessesInfo); + SysProcessesInfo = (PSYSTEM_PROCESS_INFORMATION)WTSMallocMemory(BufferSize); + + if (SysProcessesInfo == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* query the information */ + Status = NtQuerySystemInformation(SystemProcessInformation, + SysProcessesInfo, + BufferSize, + &ReturnedBufferSize); + + /* adjust necessary buffer size with returned value or double its size */ + BufferSize = ReturnedBufferSize; + } + while (Status == STATUS_INFO_LENGTH_MISMATCH); + return SysProcessesInfo; +} + +/************************************************************ +* GetNextProcess +* Helper function for iterating NtQuerySystemInformation response +*/ +static PSYSTEM_PROCESS_INFORMATION GetNextProcess(PSYSTEM_PROCESS_INFORMATION Process) +{ + if (Process->NextEntryOffset == 0) + { + return NULL; + } + return (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)Process + Process->NextEntryOffset); +} + +/************************************************************ +* CountProcesses +* Helper function for calculating process count +* Also calculates necessary space for ImageName unicode strings +*/ +static DWORD CountProcesses(IN PSYSTEM_PROCESS_INFORMATION Process, OUT PDWORD pImageNameLength) +{ + DWORD ProcessCount = 0; + DWORD Length = 0; + *pImageNameLength = 0; + while (Process != NULL) + { + ++ProcessCount; + Length = Process->ImageName.Length + sizeof(WCHAR); + *pImageNameLength += ALIGN_UP(Length, 8); + Process = GetNextProcess(Process); + } + return ProcessCount; +} +/************************************************************ +* GetProcessOwner +* Helper function for getting owner SID for process +*/ +static BOOL GetProcessOwner(DWORD ProcessId, PSID pSid, DWORD BufferSize) +{ + BOOL Success = FALSE; + HANDLE hProcess = NULL; + PSID ProcessUser = NULL; + PSECURITY_DESCRIPTOR ProcessSD = NULL; + DWORD Error; + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | READ_CONTROL, FALSE, ProcessId); + if (hProcess != NULL) + { + ProcessUser = NULL; + ProcessSD = NULL; + Error = GetSecurityInfo(hProcess, + SE_KERNEL_OBJECT, + OWNER_SECURITY_INFORMATION, + &ProcessUser, + NULL, + NULL, + NULL, + &ProcessSD); + if (!Error) + { + if (ProcessUser != NULL) + { + Success = !RtlCopySid(BufferSize, pSid, ProcessUser); + } + LocalFree(ProcessSD); + } + CloseHandle(hProcess); + } + return Success; +} + +/************************************************************ * WTSEnumerateProcessesA (WTSAPI32.@) */ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version, - PWTS_PROCESS_INFOA* ppProcessInfo, DWORD* pCount) -{ - FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, - ppProcessInfo, pCount); + PWTS_PROCESS_INFOA* ppProcessInfo, DWORD* pCount) +{ + PSYSTEM_PROCESS_INFORMATION SysProcessInfo = NULL; + PSYSTEM_PROCESS_INFORMATION SysProcess; + PBYTE Data; + PWTS_PROCESS_INFOA Process; + ULONG BufferSize = 0; + DWORD ProcessCount = 0; + DWORD Offset; + DWORD Length; + DWORD ProcessId; if (!ppProcessInfo || !pCount) return FALSE; *pCount = 0; - *ppProcessInfo = NULL; + + if (Version != 1) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (hServer != WTS_CURRENT_SERVER_HANDLE) + { + FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, + ppProcessInfo, pCount); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + SysProcessInfo = QueryProcesses(); + if (SysProcessInfo == NULL) + { + return FALSE; + } + // Calculates buffer size for processes information + ProcessCount = CountProcesses(SysProcessInfo, &BufferSize); + // Doubles space for strings (in case of UTF-8 or UTF-7 is used as default code page) + BufferSize *= 2; + // And count space for records and SIDs + BufferSize += ProcessCount * (sizeof(WTS_PROCESS_INFOA) + SECURITY_MAX_SID_SIZE); + + Data = (PBYTE)WTSMallocMemory(BufferSize); + if (Data == NULL) + { + WTSFreeMemory(SysProcessInfo); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + // WTS_PROCESS_INFOW structures are put in beginning of the buffer + // FileName paths and SIDs should be located later after this part + // That way user will be able to free buffer memory + // with single WTSFreeMemory call + for (SysProcess = SysProcessInfo, Process = (PWTS_PROCESS_INFOA)Data, + Offset = ProcessCount * sizeof(WTS_PROCESS_INFOA); + SysProcess != NULL; + SysProcess = GetNextProcess(SysProcess), ++Process) + { + ProcessId = PtrToUint(SysProcess->UniqueProcessId); + Process->SessionId = SysProcess->SessionId; + // Get unique process id + Process->ProcessId = ProcessId; + Process->pProcessName = (LPSTR)(Data + Offset); + RtlUnicodeToMultiByteN(Process->pProcessName, BufferSize - Offset, &Length, + SysProcess->ImageName.Buffer, SysProcess->ImageName.Length); + Process->pProcessName[Length++] = 0; + Offset += ALIGN_UP(Length, 8); + Process->pUserSid = NULL; + if (ProcessId > 0) + { + Process->pUserSid = (PSID)(Data + Offset); + if (GetProcessOwner(ProcessId, Process->pUserSid, BufferSize - Offset)) + { + Length = RtlLengthSid(Process->pUserSid); + Offset += ALIGN_UP(Length, 8); + } + else + { + Process->pUserSid = NULL; + } + } + } + + WTSFreeMemory(SysProcessInfo); + + // Now we may assign output values + *pCount = ProcessCount; + *ppProcessInfo = (PWTS_PROCESS_INFOA)Data; return TRUE; } @@ -85,15 +285,99 @@ * WTSEnumerateProcessesW (WTSAPI32.@) */ BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version, - PWTS_PROCESS_INFOW* ppProcessInfo, DWORD* pCount) -{ - FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, - ppProcessInfo, pCount); + PWTS_PROCESS_INFOW* ppProcessInfo, DWORD* pCount) +{ + PSYSTEM_PROCESS_INFORMATION SysProcessInfo = NULL; + PSYSTEM_PROCESS_INFORMATION SysProcess; + PBYTE Data; + PWTS_PROCESS_INFOW Process; + ULONG BufferSize; + DWORD ProcessCount = 0; + DWORD Offset; + DWORD Length; + DWORD ProcessId; if (!ppProcessInfo || !pCount) return FALSE; *pCount = 0; - *ppProcessInfo = NULL; + + if (Version != 1) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (hServer != WTS_CURRENT_SERVER_HANDLE) + { + FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, + ppProcessInfo, pCount); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + SysProcessInfo = QueryProcesses(); + if (SysProcessInfo == NULL) + { + return FALSE; + } + /* Calculating necessary buffer length */ + ProcessCount = CountProcesses(SysProcessInfo, &BufferSize); + BufferSize += ProcessCount * (sizeof(WTS_PROCESS_INFOW) + SECURITY_MAX_SID_SIZE); + + Data = (PBYTE)WTSMallocMemory(BufferSize); + if (Data == NULL) + { + WTSFreeMemory(SysProcessInfo); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + // WTS_PROCESS_INFOW structures are put in beginning of the buffer + // FileName paths and SIDs should be located later after this part + // That way user will be able to free buffer memory + // with single WTSFreeMemory call + for (SysProcess = SysProcessInfo, Process = (PWTS_PROCESS_INFOW)Data, + Offset = ProcessCount * sizeof(WTS_PROCESS_INFOW); + SysProcess != NULL; + SysProcess = GetNextProcess(SysProcess), ++Process) + { + ProcessId = PtrToUint(SysProcess->UniqueProcessId); + Process->SessionId = SysProcess->SessionId; + // Get unique process id + Process->ProcessId = ProcessId; + Process->pProcessName = (LPWSTR)(Data + Offset); + if (SysProcess->ImageName.Buffer != NULL) + { + Length = SysProcess->ImageName.Length + sizeof(WCHAR); + RtlCopyMemory(Process->pProcessName, SysProcess->ImageName.Buffer, Length); + } + else + { + *Process->pProcessName = L'\0'; + Length = sizeof(*Process->pProcessName); + } + Offset += ALIGN_UP(Length, 8); + Process->pUserSid = NULL; + if (ProcessId > 0) + { + Process->pUserSid = (PSID)(Data + Offset); + if (GetProcessOwner(ProcessId, Process->pUserSid, BufferSize - Offset)) + { + Length = RtlLengthSid(Process->pUserSid); + Offset += ALIGN_UP(Length, 8); + } + else + { + Process->pUserSid = NULL; + } + } + } + + WTSFreeMemory(SysProcessInfo); + + // Now we may assign output values + *pCount = ProcessCount; + *ppProcessInfo = (PWTS_PROCESS_INFOW)Data; return TRUE; } @@ -133,12 +417,20 @@ } /************************************************************ +* WTSMallocMemory +* Complimentary function to WTSFreeMemory from API +*/ +static PVOID WTSMallocMemory(SIZE_T nSize) +{ + return HeapAlloc(GetProcessHeap(), 0, nSize); +} + +/************************************************************ * WTSFreeMemory (WTSAPI32.@) */ void WINAPI WTSFreeMemory(PVOID pMemory) { - FIXME("Stub %p\n", pMemory); - return; + HeapFree(GetProcessHeap(), 0, pMemory); } /************************************************************ Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.rbuild [iso-8859-1] Sat Oct 10 14:55:34 2009 @@ -8,6 +8,7 @@ <define name="__WINESRC__" /> <file>wtsapi32.c</file> <library>wine</library> + <library>advapi32</library> <library>kernel32</library> <library>ntdll</library> </module> Modified: trunk/reactos/include/psdk/wtsapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wtsapi32.h?re… ============================================================================== --- trunk/reactos/include/psdk/wtsapi32.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wtsapi32.h [iso-8859-1] Sat Oct 10 14:55:34 2009 @@ -23,6 +23,12 @@ extern "C" { #endif +/* +* Current server information +*/ +#define WTS_CURRENT_SERVER ((HANDLE)NULL) +#define WTS_CURRENT_SERVER_HANDLE ((HANDLE)NULL) +#define WTS_CURRENT_SERVER_NAME (NULL) typedef enum tagWTS_INFO_CLASS {

1 0

[fireball] 43359: [fastfat_new] - Actually add short and long names to splay tree when setting up FCB's names.
by fireball＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: fireball Date: Sat Oct 10 14:40:20 2009 New Revision: 43359 URL: http://svn.reactos.org/svn/reactos?rev=43359&view=rev Log: [fastfat_new] - Actually add short and long names to splay tree when setting up FCB's names. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c 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 14:40:20 2009 @@ -288,6 +288,10 @@ /* Convert raw short name to a proper string */ Fati8dot3ToString(ShortNameRaw, FALSE, ShortName); + /* Add the short name link */ + FatInsertName(IrpContext, &Fcb->ParentFcb->Dcb.SplayLinksAnsi, &Fcb->ShortName); + Fcb->ShortName.Fcb = Fcb; + /* Get the long file name (if any) */ if (NumLFNs > 0) { @@ -314,12 +318,13 @@ DPRINT1("Converted long name: %wZ\n", UnicodeName); + /* Add the long unicode name link */ + FatInsertName(IrpContext, &Fcb->ParentFcb->Dcb.SplayLinksUnicode, &Fcb->LongName); + Fcb->LongName.Fcb = Fcb; + /* Indicate that this FCB has a unicode long name */ SetFlag(Fcb->State, FCB_STATE_HAS_UNICODE_NAME); } - - // TODO: Add both names to the splay tree */ - //FatInsertName( /* Mark the fact that names were added to splay trees*/ SetFlag(Fcb->State, FCB_STATE_HAS_NAMES);

1 0

[fireball] 43358: [fastfat_new] - Add two functions for adding/removing name links from splay trees. - Cleanup Fati8dot3ToString function from testing code. - Add FCB states, so far just two: has names, and has unicode name.
by fireball＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: fireball Date: Sat Oct 10 14:34:02 2009 New Revision: 43358 URL: http://svn.reactos.org/svn/reactos?rev=43358&view=rev Log: [fastfat_new] - Add two functions for adding/removing name links from splay trees. - Cleanup Fati8dot3ToString function from testing code. - Add FCB states, so far just two: has names, and has unicode name. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.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 14:34:02 2009 @@ -284,19 +284,21 @@ IN PFCB ParentDcb, IN FF_FILE *FileHandle); -NTSTATUS -FatOpenFcb( - OUT PFCB* Fcb, - IN PFAT_IRP_CONTEXT IrpContext, - IN PFCB ParentFcb, - IN PUNICODE_STRING FileName); - PFCB NTAPI FatFindFcb(PFAT_IRP_CONTEXT IrpContext, PRTL_SPLAY_LINKS *RootNode, PSTRING AnsiName, PBOOLEAN IsDosName); +VOID NTAPI +FatInsertName(IN PFAT_IRP_CONTEXT IrpContext, + IN PRTL_SPLAY_LINKS *RootNode, + IN PFCB_NAME_LINK Name); + +VOID NTAPI +FatRemoveNames(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb); + PCCB NTAPI FatCreateCcb(); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Sat Oct 10 14:34:02 2009 @@ -238,6 +238,9 @@ FcbBad, FcbNeedsToBeVerified } FCB_CONDITION; + +#define FCB_STATE_HAS_NAMES 0x01 +#define FCB_STATE_HAS_UNICODE_NAME 0x02 typedef struct _FCB { 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 14:34:02 2009 @@ -313,9 +313,16 @@ RtlUpcaseUnicodeString(UnicodeName, UnicodeName, FALSE); DPRINT1("Converted long name: %wZ\n", UnicodeName); - } - - // TODO: Add names to the splay tree + + /* Indicate that this FCB has a unicode long name */ + SetFlag(Fcb->State, FCB_STATE_HAS_UNICODE_NAME); + } + + // TODO: Add both names to the splay tree */ + //FatInsertName( + + /* Mark the fact that names were added to splay trees*/ + SetFlag(Fcb->State, FCB_STATE_HAS_NAMES); } VOID @@ -324,7 +331,6 @@ IN BOOLEAN DownCase, OUT POEM_STRING OutString) { -#if 1 ULONG BaseLen, ExtLen; CHAR *cString = OutString->Buffer; ULONG i; @@ -396,14 +402,122 @@ /* Set the length */ OutString->Length = BaseLen + ExtLen; -#else - RtlCopyMemory(OutString->Buffer, FileName, 11); - OutString->Length = strlen(FileName); - ASSERT(OutString->Length <= 12); -#endif DPRINT1("'%s', len %d\n", OutString->Buffer, OutString->Length); } +VOID +NTAPI +FatInsertName(IN PFAT_IRP_CONTEXT IrpContext, + IN PRTL_SPLAY_LINKS *RootNode, + IN PFCB_NAME_LINK Name) +{ + PFCB_NAME_LINK NameLink; + FSRTL_COMPARISON_RESULT Comparison; + + /* Initialize the splay links */ + RtlInitializeSplayLinks(&Name->Links); + + /* Is this the first entry? */ + if (*RootNode == NULL) + { + /* Yes, become root and return */ + *RootNode = &Name->Links; + return; + } + + /* Get the name link */ + NameLink = CONTAINING_RECORD(*RootNode, FCB_NAME_LINK, Links); + while (TRUE) + { + /* Compare prefixes */ + Comparison = FatiCompareNames(&NameLink->Name.Ansi, &Name->Name.Ansi); + + /* Check the bad case first */ + if (Comparison == EqualTo) + { + /* Must not happen */ + ASSERT(FALSE); + } + + /* Check comparison result */ + if (Comparison == GreaterThan) + { + /* Go to the left child */ + if (!RtlLeftChild(&NameLink->Links)) + { + /* It's absent, insert here and break */ + RtlInsertAsLeftChild(&NameLink->Links, &NameLink->Links); + break; + } + else + { + /* It's present, go inside it */ + NameLink = CONTAINING_RECORD(RtlLeftChild(&NameLink->Links), + FCB_NAME_LINK, + Links); + } + } + else + { + /* Go to the right child */ + if (!RtlRightChild(&NameLink->Links)) + { + /* It's absent, insert here and break */ + RtlInsertAsRightChild(&NameLink->Links, &Name->Links); + break; + } + else + { + /* It's present, go inside it */ + NameLink = CONTAINING_RECORD(RtlRightChild(&NameLink->Links), + FCB_NAME_LINK, + Links); + } + } + } +} + +VOID +NTAPI +FatRemoveNames(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb) +{ + PRTL_SPLAY_LINKS RootNew; + PFCB Parent; + + /* Reference the parent for simplicity */ + Parent = Fcb->ParentFcb; + + /* If this FCB hasn't been added to splay trees - just return */ + if (!FlagOn( Fcb->State, FCB_STATE_HAS_NAMES )) + return; + + /* Delete the short name link */ + RootNew = RtlDelete(&Fcb->ShortName.Links); + + /* Set the new root */ + Parent->Dcb.SplayLinksAnsi = RootNew; + + /* Deal with a unicode name if it exists */ + if (FlagOn( Fcb->State, FCB_STATE_HAS_UNICODE_NAME )) + { + /* Delete the long unicode name link */ + RootNew = RtlDelete(&Fcb->LongName.Links); + + /* Set the new root */ + Parent->Dcb.SplayLinksUnicode = RootNew; + + /* Free the long name string's buffer*/ + RtlFreeUnicodeString(&Fcb->LongName.Name.String); + + /* Clear the "has unicode name" flag */ + ClearFlag(Fcb->State, FCB_STATE_HAS_UNICODE_NAME); + } + + /* This FCB has no names added to splay trees now */ + ClearFlag(Fcb->State, FCB_STATE_HAS_NAMES); +} + /* EOF */

1 0

[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

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