Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[ion] 17731: - Part one of major RTL cleanup. Merge duplicated code and stick everything in lib\rtl that used to be in ntdll. Also cleanup the file headers, copyright information and includes.

by ion＠svn.reactos.com

- Part one of major RTL cleanup. Merge duplicated code and stick everything in lib\rtl that used to be in ntdll. Also cleanup the file headers, copyright information and includes. Modified: trunk/reactos/lib/ntdll/ntdll.xml Deleted: trunk/reactos/lib/ntdll/rtl/apc.c Deleted: trunk/reactos/lib/ntdll/rtl/callback.c Deleted: trunk/reactos/lib/ntdll/rtl/crc32.c Deleted: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c Deleted: trunk/reactos/lib/ntdll/rtl/handle.c Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Deleted: trunk/reactos/lib/ntdll/rtl/math.c Deleted: trunk/reactos/lib/ntdll/rtl/message.c Deleted: trunk/reactos/lib/ntdll/rtl/misc.c Deleted: trunk/reactos/lib/ntdll/rtl/process.c Deleted: trunk/reactos/lib/ntdll/rtl/propvar.c Deleted: trunk/reactos/lib/ntdll/rtl/rangelist.c Deleted: trunk/reactos/lib/ntdll/rtl/resource.c Deleted: trunk/reactos/lib/ntdll/rtl/secobj.c Deleted: trunk/reactos/lib/ntdll/rtl/teb.c Deleted: trunk/reactos/lib/ntdll/rtl/timerqueue.c Deleted: trunk/reactos/lib/ntdll/rtl/trace.c Added: trunk/reactos/lib/ntdll/rtl/version.c Modified: trunk/reactos/lib/rtl/access.c Modified: trunk/reactos/lib/rtl/acl.c Added: trunk/reactos/lib/rtl/apc.c Modified: trunk/reactos/lib/rtl/atom.c Modified: trunk/reactos/lib/rtl/bit.c Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bootdata.c Added: trunk/reactos/lib/rtl/callback.c Modified: trunk/reactos/lib/rtl/compress.c Added: trunk/reactos/lib/rtl/crc32.c Added: trunk/reactos/lib/rtl/dbgbuffer.c Modified: trunk/reactos/lib/rtl/dos8dot3.c Modified: trunk/reactos/lib/rtl/encode.c Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/error.c Modified: trunk/reactos/lib/rtl/exception.c Modified: trunk/reactos/lib/rtl/generictable.c Added: trunk/reactos/lib/rtl/handle.c Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/largeint.c Modified: trunk/reactos/lib/rtl/luid.c Added: trunk/reactos/lib/rtl/math.c Modified: trunk/reactos/lib/rtl/mem.c Added: trunk/reactos/lib/rtl/message.c Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/nls.c Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/process.c Added: trunk/reactos/lib/rtl/propvar.c Modified: trunk/reactos/lib/rtl/qsort.c Modified: trunk/reactos/lib/rtl/random.c Added: trunk/reactos/lib/rtl/rangelist.c Modified: trunk/reactos/lib/rtl/registry.c Added: trunk/reactos/lib/rtl/resource.c Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/rtl.xml Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/security.c Modified: trunk/reactos/lib/rtl/sid.c Modified: trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/rtl/time.c Added: trunk/reactos/lib/rtl/timerqueue.c Modified: trunk/reactos/lib/rtl/timezone.c Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicodeprefix.c Modified: trunk/reactos/lib/rtl/version.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c Deleted: trunk/reactos/ntoskrnl/rtl/message.c Deleted: trunk/reactos/ntoskrnl/rtl/rangelist.c _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 00:09:32 UTC (rev 17731) @@ -32,25 +32,11 @@ <file>dllmain.c</file> </directory> <directory name="rtl"> - <file>apc.c</file> - <file>callback.c</file> - <file>crc32.c</file> <file>critical.c</file> - <file>dbgbuffer.c</file> <file>exception.c</file> - <file>handle.c</file> <file>libsupp.c</file> - <file>math.c</file> - <file>message.c</file> - <file>misc.c</file> <file>path.c</file> - <file>process.c</file> - <file>propvar.c</file> - <file>rangelist.c</file> - <file>resource.c</file> - <file>secobj.c</file> - <file>teb.c</file> - <file>timerqueue.c</file> + <file>version.c</file> </directory> <directory name="stdio"> <file>sprintf.c</file> _____ Deleted: trunk/reactos/lib/ntdll/rtl/apc.c --- trunk/reactos/lib/ntdll/rtl/apc.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/apc.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,55 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2000 David Welch <welch(a)cwcom.net> - * - * 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$ - * - * PROJECT: ReactOS kernel - * PURPOSE: User-mode APC support - * FILE: lib/ntdll/rtl/apc.c - * PROGRAMER: David Welch <welch(a)cwcom.net> - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ***************************************************************/ - -VOID STDCALL -KiUserApcDispatcher(PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - PIO_STATUS_BLOCK Iosb, - ULONG Reserved, - PCONTEXT Context) -{ - /* - * Call the APC - */ - //DPRINT1("ITS ME\n"); - ApcRoutine(ApcContext, - Iosb, - Reserved); - /* - * Switch back to the interrupted context - */ - //DPRINT1("switch back\n"); - NtContinue(Context, 1); -} - _____ Deleted: trunk/reactos/lib/ntdll/rtl/callback.c --- trunk/reactos/lib/ntdll/rtl/callback.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/callback.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,35 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: User-mode callback support - * FILE: lib/ntdll/rtl/callback.c - * PROGRAMER: David Welch <welch(a)cwcom.net> - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> -/* TYPES *********************************************************************/ - -typedef NTSTATUS (STDCALL *KERNEL_CALLBACK_FUNCTION)(PVOID Argument, - ULONG ArgumentLength); - -/* FUNCTIONS *****************************************************************/ - -VOID STDCALL -KiUserCallbackDispatcher(ULONG RoutineIndex, - PVOID Argument, - ULONG ArgumentLength) -{ - PPEB Peb; - NTSTATUS Status; - KERNEL_CALLBACK_FUNCTION Callback; - - Peb = NtCurrentPeb(); - Callback = (KERNEL_CALLBACK_FUNCTION)Peb->KernelCallbackTable[RoutineIndex]; - Status = Callback(Argument, ArgumentLength); - ZwCallbackReturn(NULL, 0, Status); -} _____ Deleted: trunk/reactos/lib/ntdll/rtl/crc32.c --- trunk/reactos/lib/ntdll/rtl/crc32.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/crc32.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,109 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: crc32 functions - * FILE: lib/ntdll/rtl/crc32.c - * PROGRAMER: Steven Edwards - * REVISION HISTORY: - * 11/15/2000: Created - */ - -/* This work is based off of rtl.c in Wine. - * Please give credit where credit is due: - * - * Copyright 2003 Thomas Mertes - * Crc32 code Copyright 1986 Gary S. Brown (Public domain) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> -/* FUNCTIONS ****************************************************************/ - -/* CRC polynomial 0xedb88320 */ -static const ULONG CrcTable[256] = -{ - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - -/********************************************************************* - * RtlComputeCrc32 [NTDLL.@] - * - * Calculate the CRC32 checksum of a block of bytes - * - * PARAMS - * Initial [I] Initial CRC value - * Data [I] Data block - * Length [I] Length of the byte block - * - * RETURNS - * The cumulative CRC32 of Initial and Length bytes of the Data block. - * - * @implemented - */ -ULONG STDCALL -RtlComputeCrc32 (IN ULONG Initial, - IN PUCHAR Data, - IN ULONG Length) -{ - ULONG CrcValue; - -#ifdef DBG - DbgPrint("(%lu,%p,%lu)\n", Initial, Data, Length); -#endif - - CrcValue = ~Initial; - while (Length > 0) - { - CrcValue = CrcTable[(CrcValue ^ *Data) & 0xff] ^ (CrcValue >> 8); - Data++; - Length--; - } - return ~CrcValue; -} - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/dbgbuffer.c --- trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/dbgbuffer.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,424 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2004 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. - */ -/* - * - * PROJECT: ReactOS kernel - * PURPOSE: User-mode Debug Buffer support - * FILE: lib/ntdll/rtl/dbgbuffer.c - * PROGRAMER: James Tabor - * Fixme: Add Process and Thread event pair support. - * Start Locks and Heap support. - * Test: Create remote thread to help query remote - * processes and use view mapping to read them. - * - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ***************************************************************/ - -/* - * @unimplemented - */ -PDEBUG_BUFFER STDCALL -RtlCreateQueryDebugBuffer(IN ULONG Size, - IN BOOLEAN EventPair) -{ - NTSTATUS Status; - PDEBUG_BUFFER Buf = NULL; - ULONG SectionSize = 100 * PAGE_SIZE; - - Status = NtAllocateVirtualMemory( NtCurrentProcess(), - (PVOID)&Buf, - 0, - &SectionSize, - MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - Buf->SectionBase = Buf; - Buf->SectionSize = SectionSize; - - DPRINT("RtlCQDB: BA: %x BS: %d\n", Buf->SectionBase, Buf->SectionSize); - - return Buf; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -RtlDestroyQueryDebugBuffer(IN PDEBUG_BUFFER Buf) -{ - NTSTATUS Status = STATUS_SUCCESS; - - if (NULL != Buf) - { - Status = NtFreeVirtualMemory( NtCurrentProcess(), - (PVOID)&Buf, - &Buf->SectionSize, - MEM_RELEASE); - } - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlDQDB: Failed to free VM!\n"); - } - return Status; -} - -/* - * Based on lib/epsapi/enum/modules.c by KJK::Hyperion. - * - */ -NTSTATUS STDCALL -RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, - IN PMODULE_INFORMATION ModuleInformation OPTIONAL, - IN ULONG Size OPTIONAL, - OUT PULONG ReturnedSize) -{ - PROCESS_BASIC_INFORMATION pbiInfo; - PPEB_LDR_DATA ppldLdrData; - LDR_DATA_TABLE_ENTRY lmModule; - PLIST_ENTRY pleListHead; - PLIST_ENTRY pleCurEntry; - - PDEBUG_MODULE_INFORMATION ModulePtr = NULL; - NTSTATUS Status = STATUS_SUCCESS; - ULONG UsedSize = sizeof(ULONG); - ANSI_STRING AnsiString; - PCHAR p; - - DPRINT("RtlpQueryRemoteProcessModules Start\n"); - - /* query the process basic information (includes the PEB address) */ - Status = NtQueryInformationProcess ( ProcessHandle, - ProcessBasicInformation, - &pbiInfo, - sizeof(PROCESS_BASIC_INFORMATION), - NULL); - - if (!NT_SUCCESS(Status)) - { - /* failure */ - DPRINT("NtQueryInformationProcess 1 &x \n", Status); - return Status; - } - - if (ModuleInformation == NULL || Size == 0) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - ModuleInformation->ModuleCount = 0; - ModulePtr = &ModuleInformation->ModuleEntry[0]; - Status = STATUS_SUCCESS; - } - - /* get the address of the PE Loader data */ - Status = NtReadVirtualMemory ( ProcessHandle, - &(pbiInfo.PebBaseAddress->Ldr), - &ppldLdrData, - sizeof(ppldLdrData), - NULL ); - - if (!NT_SUCCESS(Status)) - { - /* failure */ - DPRINT("NtReadVirtualMemory 1 %x \n", Status); - return Status; - } - - - /* head of the module list: the last element in the list will point to this */ - pleListHead = &ppldLdrData->InLoadOrderModuleList; - - /* get the address of the first element in the list */ - Status = NtReadVirtualMemory ( ProcessHandle, - &(ppldLdrData->InLoadOrderModuleList.Flink), - &pleCurEntry, - sizeof(pleCurEntry), - NULL ); - - if (!NT_SUCCESS(Status)) - { - /* failure */ - DPRINT("NtReadVirtualMemory 2 %x \n", Status); - return Status; - } - - while(pleCurEntry != pleListHead) - { - - UNICODE_STRING Unicode; - WCHAR Buffer[256 * sizeof(WCHAR)]; - - /* read the current module */ - Status = NtReadVirtualMemory ( ProcessHandle, - CONTAINING_RECORD(pleCurEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList), - &lmModule, - sizeof(LDR_DATA_TABLE_ENTRY), - NULL ); - - /* Import module name from remote Process user space. */ - Unicode.Length = lmModule.FullDllName.Length; - Unicode.MaximumLength = lmModule.FullDllName.MaximumLength; - Unicode.Buffer = Buffer; - - Status = NtReadVirtualMemory ( ProcessHandle, - lmModule.FullDllName.Buffer, - Unicode.Buffer, - Unicode.Length, - NULL ); - - if (!NT_SUCCESS(Status)) - { - /* failure */ - DPRINT( "NtReadVirtualMemory 3 %x \n", Status); - return Status; - } - - DPRINT(" Module %wZ\n", &Unicode); - - if (UsedSize > Size) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else if (ModuleInformation != NULL) - { - ModulePtr->Reserved[0] = ModulePtr->Reserved[1] = 0; // FIXME: ?? - ModulePtr->Base = lmModule.DllBase; - ModulePtr->Size = lmModule.SizeOfImage; - ModulePtr->Flags = lmModule.Flags; - ModulePtr->Index = 0; // FIXME: ?? - ModulePtr->Unknown = 0; // FIXME: ?? - ModulePtr->LoadCount = lmModule.LoadCount; - - AnsiString.Length = 0; - AnsiString.MaximumLength = 256; - AnsiString.Buffer = ModulePtr->ImageName; - RtlUnicodeStringToAnsiString(&AnsiString, - &Unicode, - FALSE); - - p = strrchr(ModulePtr->ImageName, '\\'); - if (p != NULL) - ModulePtr->ModuleNameOffset = p - ModulePtr->ImageName + 1; - else - ModulePtr->ModuleNameOffset = 0; - - ModulePtr++; - ModuleInformation->ModuleCount++; - } - UsedSize += sizeof(DEBUG_MODULE_INFORMATION); - - /* address of the next module in the list */ - pleCurEntry = lmModule.InLoadOrderModuleList.Flink; - } - - if (ReturnedSize != 0) - *ReturnedSize = UsedSize; - - DPRINT("RtlpQueryRemoteProcessModules End\n"); - - /* success */ - return (STATUS_SUCCESS); -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -RtlQueryProcessDebugInformation(IN ULONG ProcessId, - IN ULONG DebugInfoMask, - IN OUT PDEBUG_BUFFER Buf) -{ - NTSTATUS Status = STATUS_SUCCESS; - ULONG Pid = (ULONG) NtCurrentTeb()->Cid.UniqueProcess; - - Buf->InfoClassMask = DebugInfoMask; - Buf->SizeOfInfo = sizeof(DEBUG_BUFFER); - - DPRINT("QueryProcessDebugInformation Start\n"); - -/* - Currently ROS can not read-only from kenrel space, and doesn't - check for boundaries inside kernel space that are page protected - from every one but the kernel. aka page 0 - 2 - */ -if (ProcessId <= 1) - { - Status = STATUS_ACCESS_VIOLATION; - } -else -if (Pid == ProcessId) - { - if (DebugInfoMask & PDI_MODULES) - { - PMODULE_INFORMATION Mp; - ULONG ReturnSize = 0; - ULONG MSize; - - Mp = (PMODULE_INFORMATION)(Buf + Buf->SizeOfInfo); - - /* I like this better than the do & while loop. */ - Status = LdrQueryProcessModuleInformation( NULL, - 0 , - &ReturnSize); - Status = LdrQueryProcessModuleInformation( Mp, - ReturnSize , - &ReturnSize); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - MSize = Mp->ModuleCount * (sizeof(MODULE_INFORMATION) + 8); - Buf->ModuleInformation = Mp; - Buf->SizeOfInfo = Buf->SizeOfInfo + MSize; - } - - if (DebugInfoMask & PDI_HEAPS) - { - PHEAP_INFORMATION Hp; - ULONG HSize; - - Hp = (PHEAP_INFORMATION)(Buf + Buf->SizeOfInfo); - HSize = sizeof(HEAP_INFORMATION); - if (DebugInfoMask & PDI_HEAP_TAGS) - { - } - if (DebugInfoMask & PDI_HEAP_BLOCKS) - { - } - Buf->HeapInformation = Hp; - Buf->SizeOfInfo = Buf->SizeOfInfo + HSize; - - } - - if (DebugInfoMask & PDI_LOCKS) - { - PLOCK_INFORMATION Lp; - ULONG LSize; - - Lp = (PLOCK_INFORMATION)(Buf + Buf->SizeOfInfo); - LSize = sizeof(LOCK_INFORMATION); - Buf->LockInformation = Lp; - Buf->SizeOfInfo = Buf->SizeOfInfo + LSize; - } - - DPRINT("QueryProcessDebugInformation end \n"); - DPRINT("QueryDebugInfo : %d\n", Buf->SizeOfInfo); -} -else -{ - HANDLE hProcess; - CLIENT_ID ClientId; - OBJECT_ATTRIBUTES ObjectAttributes; - - Buf->Unknown[0] = (ULONG)NtCurrentProcess(); - - ClientId.UniqueThread = 0; - ClientId.UniqueProcess = (HANDLE)ProcessId; - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); - - Status = NtOpenProcess( &hProcess, - (PROCESS_ALL_ACCESS), - &ObjectAttributes, - &ClientId ); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - if (DebugInfoMask & PDI_MODULES) - { - PMODULE_INFORMATION Mp; - ULONG ReturnSize = 0; - ULONG MSize; - - Mp = (PMODULE_INFORMATION)(Buf + Buf->SizeOfInfo); - - Status = RtlpQueryRemoteProcessModules( hProcess, - NULL, - 0, - &ReturnSize); - - Status = RtlpQueryRemoteProcessModules( hProcess, - Mp, - ReturnSize , - &ReturnSize); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - MSize = Mp->ModuleCount * (sizeof(MODULE_INFORMATION) + 8); - Buf->ModuleInformation = Mp; - Buf->SizeOfInfo = Buf->SizeOfInfo + MSize; - } - - if (DebugInfoMask & PDI_HEAPS) - { - PHEAP_INFORMATION Hp; - ULONG HSize; - - Hp = (PHEAP_INFORMATION)(Buf + Buf->SizeOfInfo); - HSize = sizeof(HEAP_INFORMATION); - if (DebugInfoMask & PDI_HEAP_TAGS) - { - } - if (DebugInfoMask & PDI_HEAP_BLOCKS) - { - } - Buf->HeapInformation = Hp; - Buf->SizeOfInfo = Buf->SizeOfInfo + HSize; - - } - - if (DebugInfoMask & PDI_LOCKS) - { - PLOCK_INFORMATION Lp; - ULONG LSize; - - Lp = (PLOCK_INFORMATION)(Buf + Buf->SizeOfInfo); - LSize = sizeof(LOCK_INFORMATION); - Buf->LockInformation = Lp; - Buf->SizeOfInfo = Buf->SizeOfInfo + LSize; - } - - DPRINT("QueryProcessDebugInformation end \n"); - DPRINT("QueryDebugInfo : %d\n", Buf->SizeOfInfo); -} - return Status; - -} - -/* EOL */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/handle.c --- trunk/reactos/lib/ntdll/rtl/handle.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/handle.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,193 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Handle table - * FILE: lib/ntdll/rtl/handle.c - * PROGRAMER: Eric Kohl <ekohl(a)rz-online.de> - */ - -/* INCLUDES ******************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -VOID STDCALL -RtlInitializeHandleTable(ULONG TableSize, - ULONG HandleSize, - PRTL_HANDLE_TABLE HandleTable) -{ - /* initialize handle table */ - memset(HandleTable, - 0, - sizeof(RTL_HANDLE_TABLE)); - HandleTable->MaximumNumberOfHandles = TableSize; - HandleTable->SizeOfHandleTableEntry = HandleSize; -} - - -/* - * @implemented - */ -VOID STDCALL -RtlDestroyHandleTable(PRTL_HANDLE_TABLE HandleTable) -{ - PVOID ArrayPointer; - ULONG ArraySize; - - /* free handle array */ - if (HandleTable->CommittedHandles) - { - ArrayPointer = (PVOID)HandleTable->CommittedHandles; - ArraySize = HandleTable->SizeOfHandleTableEntry * HandleTable->MaximumNumberOfHandles; - NtFreeVirtualMemory(NtCurrentProcess(), - &ArrayPointer, - &ArraySize, - MEM_RELEASE); - } -} - - -/* - * @implemented - */ -PRTL_HANDLE_TABLE_ENTRY STDCALL -RtlAllocateHandle(PRTL_HANDLE_TABLE HandleTable, - PULONG Index) -{ - PRTL_HANDLE_TABLE_ENTRY *pp_new, *pph, ph; - NTSTATUS Status; - PRTL_HANDLE_TABLE_ENTRY retval; - PVOID ArrayPointer; - ULONG ArraySize; - - pp_new = &HandleTable->FreeHandles; - - if (HandleTable->FreeHandles == NULL) - { - /* no free handle available */ - if (HandleTable->UnCommittedHandles == NULL) - { - /* allocate handle array */ - ArraySize = HandleTable->SizeOfHandleTableEntry * HandleTable->MaximumNumberOfHandles; - ArrayPointer = NULL; - - /* FIXME - only reserve handles here! */ - Status = NtAllocateVirtualMemory(NtCurrentProcess(), - (PVOID*)&ArrayPointer, - 0, - &ArraySize, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - return NULL; - - /* update handle array pointers */ - HandleTable->FreeHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; - HandleTable->MaxReservedHandles = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)ArrayPointer + ArraySize); - HandleTable->CommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; - HandleTable->UnCommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; - } - - /* FIXME - should check if handles need to be committed */ - - /* build free list in handle array */ - ph = HandleTable->FreeHandles; - pph = pp_new; - while (ph < HandleTable->MaxReservedHandles) - { - *pph = ph; - pph = &ph->NextFree; - ph = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)ph + HandleTable->SizeOfHandleTableEntry); - } - *pph = 0; - } - - /* remove handle from free list */ - retval = *pp_new; - *pp_new = retval->NextFree; - retval->NextFree = NULL; - - if (Index) - *Index = ((ULONG)((ULONG_PTR)retval - (ULONG_PTR)HandleTable->CommittedHandles) / - HandleTable->SizeOfHandleTableEntry); - - return retval; -} - - -/* - * @implemented - */ -BOOLEAN STDCALL -RtlFreeHandle(PRTL_HANDLE_TABLE HandleTable, - PRTL_HANDLE_TABLE_ENTRY Handle) -{ -#if DBG - /* check if handle is valid */ - if (RtlIsValidHandle(HandleTable, Handle)) - return FALSE; -#endif - - /* clear handle */ - memset(Handle, 0, HandleTable->SizeOfHandleTableEntry); - - /* add handle to free list */ - Handle->NextFree = HandleTable->FreeHandles; - HandleTable->FreeHandles = Handle; - - return TRUE; -} - - -/* - * @implemented - */ -BOOLEAN STDCALL -RtlIsValidHandle(PRTL_HANDLE_TABLE HandleTable, - PRTL_HANDLE_TABLE_ENTRY Handle) -{ - if ((HandleTable != NULL) - && (Handle >= HandleTable->CommittedHandles) - && (Handle < HandleTable->MaxReservedHandles) - && (Handle->Flags & RTL_HANDLE_VALID)) - return TRUE; - return FALSE; -} - - -/* - * @implemented - */ -BOOLEAN STDCALL -RtlIsValidIndexHandle(IN PRTL_HANDLE_TABLE HandleTable, - IN ULONG Index, - OUT PRTL_HANDLE_TABLE_ENTRY *Handle) -{ - PRTL_HANDLE_TABLE_ENTRY InternalHandle; - - DPRINT("RtlIsValidIndexHandle(HandleTable %p Index %x Handle %p)\n", HandleTable, Index, Handle); - - if (HandleTable == NULL) - return FALSE; - - DPRINT("Handles %p HandleSize %x\n", - HandleTable->CommittedHandles, HandleTable->SizeOfHandleTableEntry); - - InternalHandle = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)HandleTable->CommittedHandles + - (HandleTable->SizeOfHandleTableEntry * Index)); - if (!RtlIsValidHandle(HandleTable, InternalHandle)) - return FALSE; - - DPRINT("InternalHandle %p\n", InternalHandle); - - if (Handle != NULL) - *Handle = InternalHandle; - - return TRUE; -} - -/* EOF */ _____ Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,14 +1,13 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/rtl/libsup.c * PURPOSE: Rtl library support routines * PROGRAMMER: Gunnar Dalsnes - * UPDATE HISTORY: - * */ +/* INCLUDES *****************************************************************/ + #include <ntdll.h> #define NDEBUG #include <debug.h> @@ -16,13 +15,54 @@ /* FUNCTIONS ***************************************************************/ KPROCESSOR_MODE +STDCALL RtlpGetMode() { return UserMode; } +PPEB +STDCALL +RtlpCurrentPeb(VOID) +{ + return NtCurrentPeb(); +} + +/* + * @implemented + */ +VOID STDCALL +RtlAcquirePebLock(VOID) +{ + PPEB Peb = NtCurrentPeb (); + Peb->FastPebLockRoutine (Peb->FastPebLock); +} + + +/* + * @implemented + */ +VOID STDCALL +RtlReleasePebLock(VOID) +{ + PPEB Peb = NtCurrentPeb (); + Peb->FastPebUnlockRoutine (Peb->FastPebLock); +} + +/* +* @implemented +*/ +ULONG +STDCALL +RtlGetNtGlobalFlags(VOID) +{ + PPEB pPeb = NtCurrentPeb(); + return pPeb->NtGlobalFlag; +} + PVOID +STDCALL RtlpAllocateMemory(UINT Bytes, ULONG Tag) { @@ -35,6 +75,7 @@ VOID +STDCALL RtlpFreeMemory(PVOID Mem, ULONG Tag) { _____ Deleted: trunk/reactos/lib/ntdll/rtl/math.c --- trunk/reactos/lib/ntdll/rtl/math.c 2005-09-07 21:25:42 UTC (rev 17730) +++ trunk/reactos/lib/ntdll/rtl/math.c 2005-09-08 00:09:32 UTC (rev 17731) @@ -1,221 +0,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -double atan (double __x); -double ceil (double __x); -double cos (double __x); -double fabs (double __x); -double floor (double __x); -double log (double __x); -double __log2 (double __x); -double pow (double __x, double __y); -double sin (double __x); -double sqrt (double __x); -double tan (double __x); - -int _fltused = 0x9875; - -double atan (double __x) [truncated at 1000 lines; 7082 more skipped]

19 years

[gdalsnes] 17730: indent with astyle v1.15.3: --style=ansi -c -s3 -S --convert-tabs

by gdalsnes＠svn.reactos.com

indent with astyle v1.15.3: --style=ansi -c -s3 -S --convert-tabs Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsys/win32k/ntuser/callback.c Modified: trunk/reactos/subsys/win32k/ntuser/caret.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/clipboard.c Modified: trunk/reactos/subsys/win32k/ntuser/csr.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/guicheck.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/metric.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsys/win32k/ntuser/object.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/prop.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c Modified: trunk/reactos/subsys/win32k/ntuser/ssec.c Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c Modified: trunk/reactos/subsys/win32k/ntuser/timer.c Modified: trunk/reactos/subsys/win32k/ntuser/useratom.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c --- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-07 21:05:16 UTC (rev 17729) +++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-07 21:25:42 UTC (rev 17730) @@ -59,13 +59,13 @@ NTSTATUS FASTCALL InitAcceleratorImpl(VOID) { - return(STATUS_SUCCESS); + return(STATUS_SUCCESS); } NTSTATUS FASTCALL CleanupAcceleratorImpl(VOID) { - return(STATUS_SUCCESS); + return(STATUS_SUCCESS); } @@ -73,7 +73,7 @@ PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel) { PACCELERATOR_TABLE Accel= UserGetObject(&gHandleTable, hAccel, otAccel); - + if (Accel) { ASSERT(USER_BODY_TO_HEADER(Accel)->RefCount >= 0); @@ -92,132 +92,132 @@ int STDCALL NtUserCopyAcceleratorTable( - HACCEL hAccel, - LPACCEL Entries, - int EntriesCount) + HACCEL hAccel, + LPACCEL Entries, + int EntriesCount) { - PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE Accel; - NTSTATUS Status; - int Ret; - DECLARE_RETURN(int); + PWINSTATION_OBJECT WindowStation; + PACCELERATOR_TABLE Accel; + NTSTATUS Status; + int Ret; + DECLARE_RETURN(int); - DPRINT("Enter NtUserCopyAcceleratorTable\n"); - UserEnterShared(); + DPRINT("Enter NtUserCopyAcceleratorTable\n"); + UserEnterShared(); - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - RETURN(0); - } + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), + UserMode, + 0, + &WindowStation); - if (!(Accel = UserGetAccelObject(hAccel))) - { - ObDereferenceObject(WindowStation); - RETURN(0); - } + if (!NT_SUCCESS(Status)) + { + SetLastNtError(STATUS_ACCESS_DENIED); + RETURN(0); + } - if(Entries) - { - Ret = min(EntriesCount, Accel->Count); - Status = MmCopyToCaller(Entries, Accel->Table, Ret * sizeof(ACCEL)); - if (!NT_SUCCESS(Status)) - { + if (!(Accel = UserGetAccelObject(hAccel))) + { ObDereferenceObject(WindowStation); - SetLastNtError(Status); RETURN(0); - } - } - else - { - Ret = Accel->Count; - } + } - ObDereferenceObject(WindowStation); + if(Entries) + { + Ret = min(EntriesCount, Accel->Count); + Status = MmCopyToCaller(Entries, Accel->Table, Ret * sizeof(ACCEL)); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(WindowStation); + SetLastNtError(Status); + RETURN(0); + } + } + else + { + Ret = Accel->Count; + } - RETURN(Ret); - + ObDereferenceObject(WindowStation); + + RETURN(Ret); + CLEANUP: - DPRINT("Leave NtUserCopyAcceleratorTable, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserCopyAcceleratorTable, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } HACCEL STDCALL NtUserCreateAcceleratorTable( - LPACCEL Entries, - SIZE_T EntriesCount) + LPACCEL Entries, + SIZE_T EntriesCount) { - PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE Accel; - NTSTATUS Status; - HACCEL hAccel; - DECLARE_RETURN(HACCEL); + PWINSTATION_OBJECT WindowStation; + PACCELERATOR_TABLE Accel; + NTSTATUS Status; + HACCEL hAccel; + DECLARE_RETURN(HACCEL); - DPRINT("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d)\n", + DPRINT("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d)\n", Entries, EntriesCount); - UserEnterExclusive(); + UserEnterExclusive(); - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - RETURN( FALSE ); - } + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), + UserMode, + 0, + &WindowStation); - Accel = ObmCreateObject(&gHandleTable, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); - - if (Accel == NULL) - { - ObDereferenceObject(WindowStation); - SetLastNtError(STATUS_NO_MEMORY); - RETURN( (HACCEL) 0 ); - } + if (!NT_SUCCESS(Status)) + { + SetLastNtError(STATUS_ACCESS_DENIED); + RETURN( FALSE ); + } - Accel->Count = EntriesCount; - if (Accel->Count > 0) - { - Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), TAG_ACCEL); - if (Accel->Table == NULL) - { - ObmDeleteObject(hAccel, otAccel); - ObDereferenceObject(WindowStation); - SetLastNtError(Status); - RETURN( (HACCEL) 0); - } + Accel = ObmCreateObject(&gHandleTable, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); - Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount * sizeof(ACCEL)); - if (!NT_SUCCESS(Status)) - { - ExFreePool(Accel->Table); - ObmDeleteObject(hAccel, otAccel); + if (Accel == NULL) + { ObDereferenceObject(WindowStation); - SetLastNtError(Status); - RETURN((HACCEL) 0); - } - } + SetLastNtError(STATUS_NO_MEMORY); + RETURN( (HACCEL) 0 ); + } - ObDereferenceObject(WindowStation); + Accel->Count = EntriesCount; + if (Accel->Count > 0) + { + Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), TAG_ACCEL); + if (Accel->Table == NULL) + { + ObmDeleteObject(hAccel, otAccel); + ObDereferenceObject(WindowStation); + SetLastNtError(Status); + RETURN( (HACCEL) 0); + } - /* FIXME: Save HandleTable in a list somewhere so we can clean it up again */ + Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount * sizeof(ACCEL)); + if (!NT_SUCCESS(Status)) + { + ExFreePool(Accel->Table); + ObmDeleteObject(hAccel, otAccel); + ObDereferenceObject(WindowStation); + SetLastNtError(Status); + RETURN((HACCEL) 0); + } + } - RETURN(hAccel); - + ObDereferenceObject(WindowStation); + + /* FIXME: Save HandleTable in a list somewhere so we can clean it up again */ + + RETURN(hAccel); + CLEANUP: - DPRINT("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d) = %x\n", - Entries, EntriesCount,_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d) = %x\n", + Entries, EntriesCount,_ret_); + UserLeave(); + END_CLEANUP; } @@ -225,219 +225,224 @@ BOOLEAN STDCALL NtUserDestroyAcceleratorTable( - HACCEL hAccel) + HACCEL hAccel) { - PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE Accel; - NTSTATUS Status; - DECLARE_RETURN(BOOLEAN); + PWINSTATION_OBJECT WindowStation; + PACCELERATOR_TABLE Accel; + NTSTATUS Status; + DECLARE_RETURN(BOOLEAN); - /* FIXME: If the handle table is from a call to LoadAcceleratorTable, decrement it's - usage count (and return TRUE). - FIXME: Destroy only tables created using CreateAcceleratorTable. - */ + /* FIXME: If the handle table is from a call to LoadAcceleratorTable, decrement it's + usage count (and return TRUE). + FIXME: Destroy only tables created using CreateAcceleratorTable. + */ - DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", hAccel); - UserEnterExclusive(); + DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", hAccel); + UserEnterExclusive(); - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - DPRINT1("E1\n"); - RETURN( FALSE); - } + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), + UserMode, + 0, + &WindowStation); - if (!(Accel = UserGetAccelObject(hAccel))) - { - ObDereferenceObject(WindowStation); - RETURN( FALSE); - } + if (!NT_SUCCESS(Status)) + { + SetLastNtError(STATUS_ACCESS_DENIED); + DPRINT1("E1\n"); + RETURN( FALSE); + } - ObmDeleteObject(hAccel, otAccel); + if (!(Accel = UserGetAccelObject(hAccel))) + { + ObDereferenceObject(WindowStation); + RETURN( FALSE); + } - if (Accel->Table != NULL) - { - ExFreePool(Accel->Table); - } + ObmDeleteObject(hAccel, otAccel); - ObDereferenceObject(WindowStation); + if (Accel->Table != NULL) + { + ExFreePool(Accel->Table); + } - RETURN( TRUE); - + ObDereferenceObject(WindowStation); + + RETURN( TRUE); + CLEANUP: - DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", hAccel,_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", hAccel,_ret_); + UserLeave(); + END_CLEANUP; } -static +static BOOLEAN FASTCALL co_IntTranslateAccelerator( - PWINDOW_OBJECT Window, - UINT message, - WPARAM wParam, - LPARAM lParam, - BYTE fVirt, - WORD key, - WORD cmd) + PWINDOW_OBJECT Window, + UINT message, + WPARAM wParam, + LPARAM lParam, + BYTE fVirt, + WORD key, + WORD cmd) { - UINT mesg = 0; + UINT mesg = 0; - ASSERT_REFS_CO(Window); + ASSERT_REFS_CO(Window); - DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x)\n", - Window->hSelf, message, wParam, lParam, fVirt, key, cmd); + DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x)\n", + Window->hSelf, message, wParam, lParam, fVirt, key, cmd); - if (wParam != key) - { + if (wParam != key) + { DPRINT("T0\n"); return FALSE; - } + } - if (message == WM_CHAR) - { + if (message == WM_CHAR) + { if (!(fVirt & FALT) && !(fVirt & FVIRTKEY)) - { - DPRINT("found accel for WM_CHAR: ('%c')\n", wParam & 0xff); - goto found; - } - } - else - { + { + DPRINT("found accel for WM_CHAR: ('%c')\n", wParam & 0xff); + goto found; + } + } + else + { if ((fVirt & FVIRTKEY) > 0) - { - INT mask = 0; - DPRINT("found accel for virt_key %04x (scan %04x)\n", - wParam, 0xff & HIWORD(lParam)); + { + INT mask = 0; + DPRINT("found accel for virt_key %04x (scan %04x)\n", + wParam, 0xff & HIWORD(lParam)); - DPRINT("NtUserGetKeyState(VK_SHIFT) = 0x%x\n", - UserGetKeyState(VK_SHIFT)); - DPRINT("NtUserGetKeyState(VK_CONTROL) = 0x%x\n", - UserGetKeyState(VK_CONTROL)); - DPRINT("NtUserGetKeyState(VK_MENU) = 0x%x\n", - UserGetKeyState(VK_MENU)); + DPRINT("NtUserGetKeyState(VK_SHIFT) = 0x%x\n", + UserGetKeyState(VK_SHIFT)); + DPRINT("NtUserGetKeyState(VK_CONTROL) = 0x%x\n", + UserGetKeyState(VK_CONTROL)); + DPRINT("NtUserGetKeyState(VK_MENU) = 0x%x\n", + UserGetKeyState(VK_MENU)); - if (UserGetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT; - if (UserGetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL; - if (UserGetKeyState(VK_MENU) & 0x8000) mask |= FALT; - if (mask == (fVirt & (FSHIFT | FCONTROL | FALT))) goto found; - DPRINT("but incorrect SHIFT/CTRL/ALT-state\n"); - } + if (UserGetKeyState(VK_SHIFT) & 0x8000) + mask |= FSHIFT; + if (UserGetKeyState(VK_CONTROL) & 0x8000) + mask |= FCONTROL; + if (UserGetKeyState(VK_MENU) & 0x8000) + mask |= FALT; + if (mask == (fVirt & (FSHIFT | FCONTROL | FALT))) + goto found; + DPRINT("but incorrect SHIFT/CTRL/ALT-state\n"); + } else - { - if (!(lParam & 0x01000000)) /* no special_key */ - { - if ((fVirt & FALT) && (lParam & 0x20000000)) - { /* ^^ ALT pressed */ - DPRINT("found accel for Alt-%c\n", wParam & 0xff); - goto found; - } + { + if (!(lParam & 0x01000000)) /* no special_key */ + { + if ((fVirt & FALT) && (lParam & 0x20000000)) + { /* ^^ ALT pressed */ + DPRINT("found accel for Alt-%c\n", wParam & 0xff); + goto found; } - } - } + } + } + } - DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = FALSE\n", - Window->hSelf, message, wParam, lParam, fVirt, key, cmd); + DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = FALSE\n", + Window->hSelf, message, wParam, lParam, fVirt, key, cmd); - return FALSE; + return FALSE; - found: - if (message == WM_KEYUP || message == WM_SYSKEYUP) - mesg = 1; - else if (IntGetCaptureWindow()) - mesg = 2; - else if (!IntIsWindowVisible(Window->hSelf)) /* FIXME: WINE IsWindowEnabled == IntIsWindowVisible? */ - mesg = 3; - else - { +found: + if (message == WM_KEYUP || message == WM_SYSKEYUP) + mesg = 1; + else if (IntGetCaptureWindow()) + mesg = 2; + else if (!IntIsWindowVisible(Window->hSelf)) /* FIXME: WINE IsWindowEnabled == IntIsWindowVisible? */ + mesg = 3; + else + { #if 0 - HMENU hMenu, hSubMenu, hSysMenu; - UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos; + HMENU hMenu, hSubMenu, hSysMenu; + UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos; - hMenu = (UserGetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) ? 0 : GetMenu(hWnd); - hSysMenu = get_win_sys_menu(hWnd); + hMenu = (UserGetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) ? 0 : GetMenu(hWnd); + hSysMenu = get_win_sys_menu(hWnd); - /* find menu item and ask application to initialize it */ - /* 1. in the system menu */ - hSubMenu = hSysMenu; - nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) - { - co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hSysMenu, 0L); - if(hSubMenu != hSysMenu) + /* find menu item and ask application to initialize it */ + /* 1. in the system menu */ + hSubMenu = hSysMenu; + nPos = cmd; + if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + { + co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hSysMenu, 0L); + if(hSubMenu != hSysMenu) + { + nPos = MENU_FindSubMenu(&hSysMenu, hSubMenu); + TRACE_(accel)("hSysMenu = %p, hSubMenu = %p, nPos = %d\n", hSysMenu, hSubMenu, nPos); + co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE)); + } + uSysStat = GetMenuState(GetSubMenu(hSysMenu, 0), cmd, MF_BYCOMMAND); + } + else /* 2. in the window's menu */ + { + hSubMenu = hMenu; + nPos = cmd; + if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + { + co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L); + if(hSubMenu != hMenu) { - nPos = MENU_FindSubMenu(&hSysMenu, hSubMenu); - TRACE_(accel)("hSysMenu = %p, hSubMenu = %p, nPos = %d\n", hSysMenu, hSubMenu, nPos); - co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE)); + nPos = MENU_FindSubMenu(&hMenu, hSubMenu); + TRACE_(accel)("hMenu = %p, hSubMenu = %p, nPos = %d\n", hMenu, hSubMenu, nPos); + co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, FALSE)); } - uSysStat = GetMenuState(GetSubMenu(hSysMenu, 0), cmd, MF_BYCOMMAND); - } - else /* 2. in the window's menu */ - { - hSubMenu = hMenu; - nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) - { - co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L); - if(hSubMenu != hMenu) - { - nPos = MENU_FindSubMenu(&hMenu, hSubMenu); - TRACE_(accel)("hMenu = %p, hSubMenu = %p, nPos = %d\n", hMenu, hSubMenu, nPos); - co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, FALSE)); - } - uStat = GetMenuState(hMenu, cmd, MF_BYCOMMAND); - } - } + uStat = GetMenuState(hMenu, cmd, MF_BYCOMMAND); + } + } - if (uSysStat != (UINT)-1) - { - if (uSysStat & (MF_DISABLED|MF_GRAYED)) - mesg=4; + if (uSysStat != (UINT)-1) + { + if (uSysStat & (MF_DISABLED|MF_GRAYED)) + mesg=4; + else + mesg=WM_SYSCOMMAND; + } + else + { + if (uStat != (UINT)-1) + { + if (IsIconic(hWnd)) + mesg=5; else - mesg=WM_SYSCOMMAND; - } - else - { - if (uStat != (UINT)-1) { - if (IsIconic(hWnd)) - mesg=5; - else - { - if (uStat & (MF_DISABLED|MF_GRAYED)) - mesg=6; - else - mesg=WM_COMMAND; - } + if (uStat & (MF_DISABLED|MF_GRAYED)) + mesg=6; + else + mesg=WM_COMMAND; } - else - { - mesg=WM_COMMAND; - } - } + } + else + { + mesg=WM_COMMAND; + } + } #else DPRINT1("menu search not implemented"); mesg = WM_COMMAND; #endif - } - if (mesg == WM_COMMAND) - { + } + + if (mesg == WM_COMMAND) + { DPRINT(", sending WM_COMMAND, wParam=%0x\n", 0x10000 | cmd); co_IntSendMessage(Window->hSelf, mesg, 0x10000 | cmd, 0L); - } - else if (mesg == WM_SYSCOMMAND) - { + } + else if (mesg == WM_SYSCOMMAND) + { DPRINT(", sending WM_SYSCOMMAND, wParam=%0x\n", cmd); co_IntSendMessage(Window->hSelf, mesg, cmd, 0x00010000L); - } - else - { + } + else + { /* some reasons for NOT sending the WM_{SYS}COMMAND message: * #0: unknown (please report!) * #1: for WM_KEYUP,WM_SYSKEYUP @@ -449,104 +454,107 @@ */ DPRINT(", but won't send WM_{SYS}COMMAND, reason is #%d\n", mesg); if (mesg == 0) - { - DPRINT1(" unknown reason - please report!"); - } - } + { + DPRINT1(" unknown reason - please report!"); + } + } - DPRINT("IntTranslateAccelerator(hWnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = TRUE\n", - Window->hSelf, message, wParam, lParam, fVirt, key, cmd); + DPRINT("IntTranslateAccelerator(hWnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = TRUE\n", + Window->hSelf, message, wParam, lParam, fVirt, key, cmd); - return TRUE; + return TRUE; } int STDCALL NtUserTranslateAccelerator( - HWND hWnd, - HACCEL hAccel, - LPMSG Message) + HWND hWnd, + HACCEL hAccel, + LPMSG Message) { - PWINSTATION_OBJECT WindowStation = NULL; - PWINDOW_OBJECT Window = NULL; - PACCELERATOR_TABLE Accel = NULL; - NTSTATUS Status; - ULONG i; - DECLARE_RETURN(int); + PWINSTATION_OBJECT WindowStation = NULL; + PWINDOW_OBJECT Window = NULL; + PACCELERATOR_TABLE Accel = NULL; + NTSTATUS Status; + ULONG i; + DECLARE_RETURN(int); - DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p)\n", - hWnd, hAccel, Message); - UserEnterShared(); + DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p)\n", + hWnd, hAccel, Message); + UserEnterShared(); - if (Message == NULL) - { - SetLastNtError(STATUS_INVALID_PARAMETER); + if (Message == NULL) + { + SetLastNtError(STATUS_INVALID_PARAMETER); RETURN( 0); - } + } - if ((Message->message != WM_KEYDOWN) && - (Message->message != WM_SYSKEYDOWN) && - (Message->message != WM_SYSCHAR) && - (Message->message != WM_CHAR)) - { - RETURN( 0); - } + if ((Message->message != WM_KEYDOWN) && + (Message->message != WM_SYSKEYDOWN) && + (Message->message != WM_SYSCHAR) && + (Message->message != WM_CHAR)) + { + RETURN( 0); + } - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - RETURN( 0); - } + Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), + UserMode, + 0, + &WindowStation); - if (!(Accel = UserGetAccelObject(hAccel))) - { - RETURN( 0); - } + if (!NT_SUCCESS(Status)) + { + SetLastNtError(STATUS_ACCESS_DENIED); + RETURN( 0); + } - UserRefObjectCo(Accel); + if (!(Accel = UserGetAccelObject(hAccel))) + { + RETURN( 0); + } - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN( 0); - } + UserRefObjectCo(Accel); - UserRefObjectCo(Window); - + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN( 0); + } - /* FIXME: Associate AcceleratorTable with the current thread */ + UserRefObjectCo(Window); - for (i = 0; i < Accel->Count; i++) - { + + /* FIXME: Associate AcceleratorTable with the current thread */ + + for (i = 0; i < Accel->Count; i++) + { if (co_IntTranslateAccelerator(Window, Message->message, Message->wParam, Message->lParam, - Accel->Table[i].fVirt, Accel->Table[i].key, - Accel->Table[i].cmd)) - { - DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", - hWnd, hAccel, Message, 1); - RETURN( 1); - } + Accel->Table[i].fVirt, Accel->Table[i].key, + Accel->Table[i].cmd)) + { + DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", + hWnd, hAccel, Message, 1); + RETURN( 1); + } if (((Accel->Table[i].fVirt & 0x80) > 0)) - { - break; - } - } + { + break; + } + } - RETURN( 0); - + RETURN( 0); + CLEANUP: - - if (Window) UserDerefObjectCo(Window); - if (Accel) UserDerefObjectCo(Accel); - if (WindowStation) ObDereferenceObject(WindowStation); + if (Window) + UserDerefObjectCo(Window); + if (Accel) + UserDerefObjectCo(Accel); - DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", - hWnd, hAccel, Message, 0); - UserLeave(); - END_CLEANUP; + if (WindowStation) + ObDereferenceObject(WindowStation); + + DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", + hWnd, hAccel, Message, 0); + UserLeave(); + END_CLEANUP; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/callback.c --- trunk/reactos/subsys/win32k/ntuser/callback.c 2005-09-07 21:05:16 UTC (rev 17729) +++ trunk/reactos/subsys/win32k/ntuser/callback.c 2005-09-07 21:25:42 UTC (rev 17730) @@ -42,368 +42,369 @@ typedef struct _INT_CALLBACK_HEADER { - /* list entry in the W32THREAD structure */ - LIST_ENTRY ListEntry; -} INT_CALLBACK_HEADER, *PINT_CALLBACK_HEADER; + /* list entry in the W32THREAD structure */ + LIST_ENTRY ListEntry; +} +INT_CALLBACK_HEADER, *PINT_CALLBACK_HEADER; PVOID FASTCALL IntCbAllocateMemory(ULONG Size) { - PINT_CALLBACK_HEADER Mem; - PW32THREAD W32Thread; + PINT_CALLBACK_HEADER Mem; + PW32THREAD W32Thread; - if(!(Mem = ExAllocatePoolWithTag(PagedPool, Size + sizeof(INT_CALLBACK_HEADER), - TAG_CALLBACK))) - { - return NULL; - } + if(!(Mem = ExAllocatePoolWithTag(PagedPool, Size + sizeof(INT_CALLBACK_HEADER), + TAG_CALLBACK))) + { + return NULL; + } - W32Thread = PsGetWin32Thread(); - ASSERT(W32Thread); + W32Thread = PsGetWin32Thread(); + ASSERT(W32Thread); - /* insert the callback memory into the thread's callback list */ + /* insert the callback memory into the thread's callback list */ - InsertTailList(&W32Thread->W32CallbackListHead, &Mem->ListEntry); + InsertTailList(&W32Thread->W32CallbackListHead, &Mem->ListEntry); - return (Mem + 1); + return (Mem + 1); } VOID FASTCALL IntCbFreeMemory(PVOID Data) { - PINT_CALLBACK_HEADER Mem; - PW32THREAD W32Thread; + PINT_CALLBACK_HEADER Mem; + PW32THREAD W32Thread; - ASSERT(Data); + ASSERT(Data); - Mem = ((PINT_CALLBACK_HEADER)Data - 1); + Mem = ((PINT_CALLBACK_HEADER)Data - 1); - W32Thread = PsGetWin32Thread(); - ASSERT(W32Thread); + W32Thread = PsGetWin32Thread(); + ASSERT(W32Thread); - /* remove the memory block from the thread's callback list */ - RemoveEntryList(&Mem->ListEntry); + /* remove the memory block from the thread's callback list */ + RemoveEntryList(&Mem->ListEntry); - /* free memory */ - ExFreePool(Mem); + /* free memory */ + ExFreePool(Mem); } VOID FASTCALL IntCleanupThreadCallbacks(PW32THREAD W32Thread) { - PLIST_ENTRY CurrentEntry; - PINT_CALLBACK_HEADER Mem; + PLIST_ENTRY CurrentEntry; + PINT_CALLBACK_HEADER Mem; - while (!IsListEmpty(&W32Thread->W32CallbackListHead)) - { - CurrentEntry = RemoveHeadList(&W32Thread->W32CallbackListHead); - Mem = CONTAINING_RECORD(CurrentEntry, INT_CALLBACK_HEADER, - ListEntry); + while (!IsListEmpty(&W32Thread->W32CallbackListHead)) + { + CurrentEntry = RemoveHeadList(&W32Thread->W32CallbackListHead); + Mem = CONTAINING_RECORD(CurrentEntry, INT_CALLBACK_HEADER, + ListEntry); - /* free memory */ - ExFreePool(Mem); - } + /* free memory */ + ExFreePool(Mem); + } } /* FUNCTIONS *****************************************************************/ VOID STDCALL co_IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback, - HWND hWnd, - UINT Msg, - ULONG_PTR CompletionCallbackContext, - LRESULT Result) + HWND hWnd, + UINT Msg, + ULONG_PTR CompletionCallbackContext, + LRESULT Result) { - SENDASYNCPROC_CALLBACK_ARGUMENTS Arguments; - NTSTATUS Status; + SENDASYNCPROC_CALLBACK_ARGUMENTS Arguments; + NTSTATUS Status; - Arguments.Callback = CompletionCallback; - Arguments.Wnd = hWnd; - Arguments.Msg = Msg; - Arguments.Context = CompletionCallbackContext; - Arguments.Result = Result; - - UserLeaveCo(); - - Status = NtW32Call(USER32_CALLBACK_SENDASYNCPROC, - &Arguments, - sizeof(SENDASYNCPROC_CALLBACK_ARGUMENTS), - NULL, - NULL); - - UserEnterCo(); - - if (!NT_SUCCESS(Status)) - { + Arguments.Callback = CompletionCallback; + Arguments.Wnd = hWnd; + Arguments.Msg = Msg; + Arguments.Context = CompletionCallbackContext; + Arguments.Result = Result; + + UserLeaveCo(); + + Status = NtW32Call(USER32_CALLBACK_SENDASYNCPROC, + &Arguments, + sizeof(SENDASYNCPROC_CALLBACK_ARGUMENTS), + NULL, + NULL); + + UserEnterCo(); + + if (!NT_SUCCESS(Status)) + { return; - } - return; + } + return; [truncated at 1000 lines; 41714 more skipped]

19 years

[gdalsnes] 17729: window pointer was incorrectly passed as wparam to co_IntSendMessage instead of hwnd

by gdalsnes＠svn.reactos.com

window pointer was incorrectly passed as wparam to co_IntSendMessage instead of hwnd Modified: trunk/reactos/subsys/win32k/ntuser/message.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-09-07 20:59:26 UTC (rev 17728) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-09-07 21:05:16 UTC (rev 17729) @@ -506,6 +506,7 @@ USHORT *HitTest) { ULONG Result; + PWINDOW_OBJECT Parent; if(*HitTest == (USHORT)HTTRANSPARENT) { @@ -513,7 +514,14 @@ return TRUE; } - Result = co_IntSendMessage(MsgWindow->hSelf, WM_MOUSEACTIVATE, (WPARAM)IntGetParent(MsgWindow), (LPARAM)MAKELONG(*HitTest, Msg->message)); + Parent = IntGetParent(MsgWindow); + /* fixme: abort if no parent ? */ + Result = co_IntSendMessage(MsgWindow->hSelf, + WM_MOUSEACTIVATE, + (WPARAM) (Parent ? Parent->hSelf : NULL), + (LPARAM)MAKELONG(*HitTest, Msg->message) + ); + switch (Result) { case MA_NOACTIVATEANDEAT:

19 years

[gdalsnes] 17728: -replace user object/handle manager with the one from wine. its simpler, faster and more correct.

by gdalsnes＠svn.reactos.com

-replace user object/handle manager with the one from wine. its simpler, faster and more correct. -convert dozens of functions to take pointers as args, not handles -attempt to simplify/correct refcounting -remove much useless refcounting -make callout refcounts auto undoable (ei. if the thread crash in umode during callback) -misc formatting/naming changes Modified: trunk/reactos/subsys/win32k/eng/window.c Modified: trunk/reactos/subsys/win32k/include/cursoricon.h Modified: trunk/reactos/subsys/win32k/include/object.h Modified: trunk/reactos/subsys/win32k/include/userfuncs.h Modified: trunk/reactos/subsys/win32k/include/win32.h Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/include/winpos.h Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/ntuser.c Modified: trunk/reactos/subsys/win32k/ntuser/object.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/eng/window.c --- trunk/reactos/subsys/win32k/eng/window.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/eng/window.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -197,7 +197,7 @@ STDCALL EngCreateWnd( SURFOBJ *pso, - HWND hwnd, + HWND hWnd, WNDOBJCHANGEPROC pfn, FLONG fl, int iPixelFormat) @@ -209,7 +209,7 @@ DECLARE_RETURN(WNDOBJ*); DPRINT("EngCreateWnd: pso = 0x%x, hwnd = 0x%x, pfn = 0x%x, fl = 0x%x, pixfmt = %d\n", - pso, hwnd, pfn, fl, iPixelFormat); + pso, hWnd, pfn, fl, iPixelFormat); calledFromUser = UserIsEntered(); if (!calledFromUser){ @@ -217,7 +217,7 @@ } /* Get window object */ - Window = IntGetWindowObject(hwnd); + Window = UserGetWindowObject(hWnd); if (Window == NULL) { RETURN( NULL); @@ -227,7 +227,6 @@ WndObjInt = EngAllocMem(0, sizeof (WNDGDI), TAG_WNDOBJ); if (WndObjInt == NULL) { - IntReleaseWindowObject(Window); DPRINT1("Failed to allocate memory for a WND structure!\n"); RETURN( NULL); } @@ -236,7 +235,6 @@ WndObjInt->ClientClipObj = NULL; if (!IntEngWndUpdateClipObj(WndObjInt, Window)) { - IntReleaseWindowObject(Window); EngFreeMem(WndObjInt); RETURN( NULL); } @@ -247,7 +245,7 @@ WndObjUser->pvConsumer = NULL; /* Fill internal object */ - WndObjInt->Hwnd = hwnd; + WndObjInt->Hwnd = hWnd; WndObjInt->ChangeProc = pfn; WndObjInt->Flags = fl; WndObjInt->PixelFormat = iPixelFormat; @@ -255,9 +253,6 @@ /* associate object with window */ InsertTailList(&Window->WndObjListHead, &WndObjInt->ListEntry); - /* release resources */ - IntReleaseWindowObject(Window); - DPRINT("EngCreateWnd: SUCCESS!\n"); RETURN( WndObjUser); _____ Modified: trunk/reactos/subsys/win32k/include/cursoricon.h --- trunk/reactos/subsys/win32k/include/cursoricon.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/cursoricon.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -50,7 +50,7 @@ HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange); BOOL FASTCALL IntSetupCurIconHandles(PWINSTATION_OBJECT WinStaObject); -PCURICON_OBJECT FASTCALL IntGetCurIconObject(PWINSTATION_OBJECT WinStaObject, HANDLE Handle); +PCURICON_OBJECT FASTCALL IntGetCurIconObject(HANDLE Handle); PCURICON_OBJECT FASTCALL IntCreateCurIconHandle(PWINSTATION_OBJECT WinStaObject); VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PW32PROCESS Win32Process); _____ Modified: trunk/reactos/subsys/win32k/include/object.h --- trunk/reactos/subsys/win32k/include/object.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/object.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -5,106 +5,128 @@ #include <win32k/bitmaps.h> #include <win32k/pen.h> -typedef enum { - otUnknown = 0, - otClass, - otWindow, - otMenu, - otAcceleratorTable, - otCursorIcon, - otHookProc, - otMonitor -} USER_OBJECT_TYPE; +#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 */ -typedef struct _USER_OBJECT_HEADER -/* - * Header for user object - */ -{ - USER_OBJECT_TYPE Type; - LONG HandleCount; - LONG RefCount; - CSHORT Size; -} USER_OBJECT_HEADER, *PUSER_OBJECT_HEADER; -typedef struct _USER_HANDLE -{ - PVOID ObjectBody; -} USER_HANDLE, *PUSER_HANDLE; +#define USER_HEADER_TO_BODY(ObjectHeader) \ + ((PVOID)(((PUSER_OBJECT_HEADER)ObjectHeader) + 1)) -#define HANDLE_BLOCK_ENTRIES ((PAGE_SIZE-sizeof(LIST_ENTRY))/sizeof(USER_HANDLE)) +#define USER_BODY_TO_HEADER(ObjectBody) \ + ((PUSER_OBJECT_HEADER)(((PUSER_OBJECT_HEADER)ObjectBody) - 1)) -typedef struct _USER_HANDLE_BLOCK + + +typedef struct _USER_HANDLE_ENTRY { - LIST_ENTRY ListEntry; - USER_HANDLE Handles[HANDLE_BLOCK_ENTRIES]; -} USER_HANDLE_BLOCK, *PUSER_HANDLE_BLOCK; + void *ptr; /* pointer to object */ + unsigned short type; /* object type (0 if free) */ + unsigned short generation; /* generation counter */ +} USER_HANDLE_ENTRY, * PUSER_HANDLE_ENTRY; + + typedef struct _USER_HANDLE_TABLE { - LIST_ENTRY ListHead; -} USER_HANDLE_TABLE, *PUSER_HANDLE_TABLE; + PUSER_HANDLE_ENTRY handles; + PUSER_HANDLE_ENTRY freelist; + int nb_handles; + int allocated_handles; +} USER_HANDLE_TABLE, * PUSER_HANDLE_TABLE; -ULONG FASTCALL -ObmGetReferenceCount( - PVOID ObjectBody); -ULONG FASTCALL -ObmGetHandleCount( - PVOID ObjectBody); +typedef enum _USER_OBJECT_TYPE +{ + otFree = 0, + otWindow, + otMenu, + otAccel, + otCursor, + otHook, + otMonitor, + otClass //fixme: remove + +} USER_OBJECT_TYPE; -VOID FASTCALL -ObmReferenceObject( - PVOID ObjectBody); -VOID FASTCALL -ObmDereferenceObject( - PVOID ObjectBody); +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; -NTSTATUS FASTCALL -ObmReferenceObjectByPointer( - PVOID ObjectBody, - USER_OBJECT_TYPE ObjectType); -PVOID FASTCALL -ObmCreateObject( - PUSER_HANDLE_TABLE HandleTable, - PHANDLE Handle, - USER_OBJECT_TYPE ObjectType, - ULONG ObjectSize); +typedef struct _USER_REFERENCE_ENTRY +{ + SINGLE_LIST_ENTRY Entry; + PVOID obj; +} USER_REFERENCE_ENTRY, *PUSER_REFERENCE_ENTRY; -NTSTATUS FASTCALL -ObmCreateHandle( - PUSER_HANDLE_TABLE HandleTable, - PVOID ObjectBody, - PHANDLE HandleReturn); -NTSTATUS FASTCALL -ObmReferenceObjectByHandle( - PUSER_HANDLE_TABLE HandleTable, - HANDLE Handle, - USER_OBJECT_TYPE ObjectType, - PVOID* Object); -NTSTATUS FASTCALL -ObmCloseHandle( - PUSER_HANDLE_TABLE HandleTable, - HANDLE Handle); +#include <malloc.h> -VOID FASTCALL -ObmInitializeHandleTable( - PUSER_HANDLE_TABLE HandleTable); +#define ASSERT_LAST_REF(_obj_) \ +{ \ + PW32THREAD t; \ + PSINGLE_LIST_ENTRY e; \ + PUSER_REFERENCE_ENTRY ref; \ + \ + ASSERT(_obj_); \ + t = PsGetWin32Thread(); \ + ASSERT(t); \ + e = t->ReferencesList.Next; \ + ASSERT(e); \ + ref = CONTAINING_RECORD(e, USER_REFERENCE_ENTRY, Entry); \ + ASSERT(ref); \ + \ + ASSERT(_obj_ == ref->obj); \ + \ +} +#define UserRefObjectCo(_obj_) \ +{ \ + PW32THREAD t; \ + PUSER_REFERENCE_ENTRY ref; \ + \ + ASSERT(_obj_); \ + t = PsGetWin32Thread(); \ + ASSERT(t); \ + ref = (PUSER_REFERENCE_ENTRY)_alloca(sizeof(USER_REFERENCE_ENTRY)); \ + ASSERT(ref); \ + ref->obj = _obj_; \ + ObmReferenceObject(_obj_); \ + \ + PushEntryList(&t->ReferencesList, &ref->Entry); \ + \ +} -VOID FASTCALL -ObmFreeHandleTable( - PUSER_HANDLE_TABLE HandleTable); -PUSER_HANDLE_TABLE FASTCALL -ObmCreateHandleTable(VOID); +#define UserDerefObjectCo(_obj_) \ +{ \ + PW32THREAD t; \ + PSINGLE_LIST_ENTRY e; \ + PUSER_REFERENCE_ENTRY ref; \ + \ + ASSERT(_obj_); \ + t = PsGetWin32Thread(); \ + ASSERT(t); \ + e = PopEntryList(&t->ReferencesList); \ + ASSERT(e); \ + ref = CONTAINING_RECORD(e, USER_REFERENCE_ENTRY, Entry); \ + ASSERT(ref); \ + \ + ASSERT(_obj_ == ref->obj); \ + ObmDereferenceObject(_obj_); \ + \ +} -VOID FASTCALL ObmDestroyHandleTable (PUSER_HANDLE_TABLE HandleTable); - VOID INTERNAL_CALL InitGdiObjectHandleTable (VOID); VOID FASTCALL CreateStockObjects (VOID); _____ Modified: trunk/reactos/subsys/win32k/include/userfuncs.h --- trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -1,18 +1,52 @@ #ifndef _WIN32K_USERFUNCS_H #define _WIN32K_USERFUNCS_H -//currently unused -#define ASSERT_REFS(obj) ASSERT(ObmGetReferenceCount(obj) >= 2) -#define UserReferenceWindowObjectCo(o) IntReferenceWindowObject(o) -#define UserDereferenceWindowObjectCo(o) IntReleaseWindowObject(o) +#define ASSERT_REFS_CO(obj) \ +{ \ + LONG ref = USER_BODY_TO_HEADER(obj)->RefCount;\ + if (!(ref >= 1)){ \ + DPRINT1("obj 0x%x, refs %i\n", obj, ref); \ + ASSERT(FALSE); \ + } \ +} -#define UserReferenceAccelObjectCo(o) IntReferenceWindowObject(o) -#define UserDereferenceAccelObjectCo(o) IntReleaseWindowObject(o) +#define DUMP_REFS(obj) DPRINT1("obj 0x%x, refs %i\n",obj, USER_BODY_TO_HEADER(obj)->RefCount) -extern PUSER_HANDLE_TABLE gHandleTable; + +VOID FASTCALL ObmReferenceObject(PVOID obj); +BOOL FASTCALL ObmDereferenceObject(PVOID obj); + +#define IntReferenceWindowObject(o) ObmReferenceObject(o) + +VOID FASTCALL IntReleaseWindowObject(PWINDOW_OBJECT Window); +PWINDOW_OBJECT FASTCALL IntGetWindowObject(HWND hWnd); +PVOID FASTCALL +ObmCreateObject(PUSER_HANDLE_TABLE ht, HANDLE* h,USER_OBJECT_TYPE type , ULONG size); + +BOOL FASTCALL +ObmDeleteObject(HANDLE h, USER_OBJECT_TYPE type ); + +//#define UserRefObjectCo(o) ObmReferenceObject(o) +//#define UserDerefObjectCo(o) ObmDereferenceObject(o) +BOOL FASTCALL ObmCreateHandleTable(); + + +extern USER_HANDLE_TABLE gHandleTable; + + +/******************** HANDLE.C ***************/ + + +PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ); +VOID UserInitHandleTable(PUSER_HANDLE_TABLE ht, PVOID mem, ULONG bytes); +HANDLE UserAllocHandle(PUSER_HANDLE_TABLE ht, PVOID object, USER_OBJECT_TYPE type ); +PVOID UserGetObject(PUSER_HANDLE_TABLE ht, HANDLE handle, USER_OBJECT_TYPE type ); +PVOID UserFreeHandle(PUSER_HANDLE_TABLE ht, HANDLE handle ); +PVOID UserGetNextHandle(PUSER_HANDLE_TABLE ht, HANDLE* handle, USER_OBJECT_TYPE type ); + /*************** WINSTA.C ***************/ HWINSTA FASTCALL UserGetProcessWindowStation(VOID); @@ -25,7 +59,7 @@ /*************** WINPOS.C ***************/ BOOL FASTCALL -UserGetClientOrigin(HWND hWnd, LPPOINT Point); +UserGetClientOrigin(PWINDOW_OBJECT Window, LPPOINT Point); /*************** FOCUS.C ***************/ @@ -81,7 +115,7 @@ /*************** PAINTING.C ***************/ -BOOL FASTCALL UserValidateRgn(HWND hWnd, HRGN hRgn); +BOOL FASTCALL co_UserValidateRgn(PWINDOW_OBJECT Window, HRGN hRgn); /*************** WINDOW.C ***************/ _____ Modified: trunk/reactos/subsys/win32k/include/win32.h --- trunk/reactos/subsys/win32k/include/win32.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/win32.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -13,6 +13,8 @@ HANDLE hDesktop; DWORD MessagePumpHookValue; BOOLEAN IsExiting; + SINGLE_LIST_ENTRY ReferencesList; + } W32THREAD, *PW32THREAD; #include <poppack.h> _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/window.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -123,15 +123,7 @@ #define IntIsBroadcastHwnd(hWnd) \ (hWnd == HWND_BROADCAST || hWnd == HWND_TOPMOST) -#define IntGetWindowObject(hWnd) \ - IntGetProcessWindowObject(PsGetWin32Thread(), hWnd) -#define IntReferenceWindowObject(WndObj) \ - ObmReferenceObjectByPointer(WndObj, otWindow) - -#define IntReleaseWindowObject(WndObj) \ - ObmDereferenceObject(WndObj) - #define IntWndBelongsToThread(WndObj, W32Thread) \ (((WndObj->OwnerThread && WndObj->OwnerThread->Tcb.Win32Thread)) && \ (WndObj->OwnerThread->Tcb.Win32Thread == W32Thread)) @@ -143,9 +135,6 @@ WndObj->OwnerThread->ThreadsProcess->UniqueProcessId -PWINDOW_OBJECT FASTCALL -IntGetProcessWindowObject(PW32THREAD Thread, HWND hWnd); - BOOL FASTCALL IntIsWindow(HWND hWnd); _____ Modified: trunk/reactos/subsys/win32k/include/winpos.h --- trunk/reactos/subsys/win32k/include/winpos.h 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/include/winpos.h 2005-09-07 20:59:26 UTC (rev 17728) @@ -17,7 +17,7 @@ UINT FASTCALL co_WinPosArrangeIconicWindows(PWINDOW_OBJECT parent); BOOL FASTCALL -IntGetClientOrigin(HWND hWnd, LPPOINT Point); +IntGetClientOrigin(PWINDOW_OBJECT Window, LPPOINT Point); LRESULT FASTCALL co_WinPosGetNonClientSize(HWND Wnd, RECT* WindowRect, RECT* ClientRect); UINT FASTCALL @@ -26,7 +26,7 @@ UINT FASTCALL co_WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos); BOOLEAN FASTCALL -co_WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx, +co_WinPosSetWindowPos(PWINDOW_OBJECT Wnd, HWND WndInsertAfter, INT x, INT y, INT cx, INT cy, UINT flags); BOOLEAN FASTCALL co_WinPosShowWindow(PWINDOW_OBJECT Window, INT Cmd); _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -219,11 +219,14 @@ } else { + PSINGLE_LIST_ENTRY e; + DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); Win32Thread->IsExiting = TRUE; HOOK_DestroyThreadHooks(Thread); UnregisterThreadHotKeys(Thread); + /* what if this co_ func crash in umode? what will clean us up then? */ co_DestroyThreadWindows(Thread); IntBlockInput(Win32Thread, FALSE); MsqDestroyMessageQueue(Win32Thread->MessageQueue); @@ -232,6 +235,17 @@ { ObDereferenceObject(Win32Thread->Desktop); } + + /* cleanup user object references stack */ + e = PopEntryList(&Win32Thread->ReferencesList); + while (e) + { + PUSER_REFERENCE_ENTRY ref = CONTAINING_RECORD(e, USER_REFERENCE_ENTRY, Entry); + DPRINT1("thread clean: remove reference obj 0x%x\n",ref->obj); + ObmDereferenceObject(ref->obj); + + e = PopEntryList(&Win32Thread->ReferencesList); + } } RETURN( STATUS_SUCCESS); _____ Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c --- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -70,21 +70,19 @@ static -PACCELERATOR_TABLE FASTCALL UserGetAccelObjectNoRef(HACCEL hAccel) +PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel) { - PACCELERATOR_TABLE Accel=NULL; - NTSTATUS Status = ObmReferenceObjectByHandle(gHandleTable, - hAccel, - otAcceleratorTable, - (PVOID*)&Accel); - - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); - return NULL; - } + PACCELERATOR_TABLE Accel= UserGetObject(&gHandleTable, hAccel, otAccel); - ObmDereferenceObject(Accel); + if (Accel) + { + ASSERT(USER_BODY_TO_HEADER(Accel)->RefCount >= 0); + } + else + { + SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); + } + return Accel; } @@ -118,7 +116,7 @@ RETURN(0); } - if (!(Accel = UserGetAccelObjectNoRef(hAccel))) + if (!(Accel = UserGetAccelObject(hAccel))) { ObDereferenceObject(WindowStation); RETURN(0); @@ -177,11 +175,7 @@ RETURN( FALSE ); } - Accel = ObmCreateObject( - gHandleTable, - (PHANDLE)&hAccel, - otAcceleratorTable, - sizeof(ACCELERATOR_TABLE)); + Accel = ObmCreateObject(&gHandleTable, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); if (Accel == NULL) { @@ -196,7 +190,7 @@ Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), TAG_ACCEL); if (Accel->Table == NULL) { - ObmCloseHandle(gHandleTable, hAccel); + ObmDeleteObject(hAccel, otAccel); ObDereferenceObject(WindowStation); SetLastNtError(Status); RETURN( (HACCEL) 0); @@ -206,7 +200,7 @@ if (!NT_SUCCESS(Status)) { ExFreePool(Accel->Table); - ObmCloseHandle(gHandleTable, hAccel); + ObmDeleteObject(hAccel, otAccel); ObDereferenceObject(WindowStation); SetLastNtError(Status); RETURN((HACCEL) 0); @@ -258,13 +252,13 @@ RETURN( FALSE); } - if (!(Accel = UserGetAccelObjectNoRef(hAccel))) + if (!(Accel = UserGetAccelObject(hAccel))) { ObDereferenceObject(WindowStation); RETURN( FALSE); } - ObmCloseHandle(gHandleTable, hAccel); + ObmDeleteObject(hAccel, otAccel); if (Accel->Table != NULL) { @@ -294,7 +288,7 @@ { UINT mesg = 0; - ASSERT_REFS(Window); + ASSERT_REFS_CO(Window); DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x)\n", Window->hSelf, message, wParam, lParam, fVirt, key, cmd); @@ -509,19 +503,19 @@ RETURN( 0); } - if (!(Accel = UserGetAccelObjectNoRef(hAccel))) + if (!(Accel = UserGetAccelObject(hAccel))) { RETURN( 0); } - UserReferenceAccelObjectCo(Accel); + UserRefObjectCo(Accel); if (!(Window = UserGetWindowObject(hWnd))) { RETURN( 0); } - UserReferenceWindowObjectCo(Window); + UserRefObjectCo(Window); /* FIXME: Associate AcceleratorTable with the current thread */ @@ -546,8 +540,8 @@ CLEANUP: - if (Window) UserReferenceWindowObjectCo(Window); - if (Accel) UserReferenceAccelObjectCo(Accel); + if (Window) UserDerefObjectCo(Window); + if (Accel) UserDerefObjectCo(Accel); if (WindowStation) ObDereferenceObject(WindowStation); _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -299,7 +299,7 @@ } objectSize = sizeof(WNDCLASS_OBJECT) + lpwcx->cbClsExtra; - ClassObject = ObmCreateObject(NULL, NULL, otClass, objectSize); + ClassObject = ObmCreateObject(&gHandleTable, NULL, otClass, objectSize); if (ClassObject == 0) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -538,22 +538,18 @@ NtUserGetClassLong(HWND hWnd, DWORD Offset, BOOL Ansi) { PWINDOW_OBJECT Window; - LONG Ret; DECLARE_RETURN(DWORD); DPRINT("Enter NtUserGetClassLong\n"); UserEnterExclusive(); - Window = IntGetWindowObject(hWnd); - if (Window == NULL) + if (!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN(0); } - Ret = IntGetClassLong(Window, Offset, Ansi); - IntReleaseWindowObject(Window); - RETURN(Ret); + RETURN(IntGetClassLong(Window, Offset, Ansi)); + CLEANUP: DPRINT("Leave NtUserGetClassLong, ret=%i\n",_ret_); UserLeave(); @@ -565,6 +561,8 @@ { PWINDOW_OBJECT Parent, Owner; + ASSERT_REFS_CO(Window); + if ((int)Offset >= 0) { DPRINT("SetClassLong(%x, %d, %x)\n", Window->hSelf, Offset, dwNewLong); @@ -669,14 +667,18 @@ DPRINT("Enter NtUserSetClassLong\n"); UserEnterExclusive(); - if (!(Window = IntGetWindowObject(hWnd))) + if (!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN(0); } + + UserRefObjectCo(Window); + Ret = IntGetClassLong(Window, Offset, Ansi); co_IntSetClassLong(Window, Offset, dwNewLong, Ansi); - IntReleaseWindowObject(Window); + + UserDerefObjectCo(Window); + RETURN(Ret); CLEANUP: _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -71,21 +71,36 @@ return TRUE; } -PCURICON_OBJECT FASTCALL -IntGetCurIconObject(PWINSTATION_OBJECT WinStaObject, HANDLE Handle) + + + +/* temp hack */ +PCURICON_OBJECT FASTCALL UserGetCurIconObject(HANDLE hWnd) { - PCURICON_OBJECT Object; - NTSTATUS Status; - - Status = ObmReferenceObjectByHandle(gHandleTable, - Handle, otCursorIcon, (PVOID*)&Object); - if (!NT_SUCCESS(Status)) + PCURICON_OBJECT Window = (PCURICON_OBJECT)UserGetObject(&gHandleTable, hWnd, otCursor); + if (!Window) { + SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); return NULL; } - return Object; + + ASSERT(USER_BODY_TO_HEADER(Window)->RefCount >= 0); + return Window; } +PCURICON_OBJECT FASTCALL +IntGetCurIconObject(HANDLE Handle) +{ + PCURICON_OBJECT ci = UserGetCurIconObject(Handle); + if (ci) + { + ASSERT(USER_BODY_TO_HEADER(ci)->RefCount >= 0); + + USER_BODY_TO_HEADER(ci)->RefCount++; + } + return ci; +} + #define COLORCURSORS_ALLOWED FALSE HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, @@ -362,7 +377,9 @@ { Object = CONTAINING_RECORD(CurrentEntry, CURICON_OBJECT, ListEntry); CurrentEntry = CurrentEntry->Flink; - if(NT_SUCCESS(ObmReferenceObjectByPointer(Object, otCursorIcon))) + +// if(NT_SUCCESS(ObmReferenceObjectByPointer(Object, otCursorIcon))) //<- huh???? + ObmReferenceObject( Object); { if((Object->hModule == hModule) && (Object->hRsrc == hRsrc)) { @@ -380,6 +397,7 @@ } } ObmDereferenceObject(Object); + } return NULL; @@ -391,7 +409,7 @@ PCURICON_OBJECT Object; HANDLE Handle; - Object = ObmCreateObject(gHandleTable, &Handle, otCursorIcon, sizeof(CURICON_OBJECT)); + Object = ObmCreateObject(&gHandleTable, &Handle, otCursor, sizeof(CURICON_OBJECT)); if(!Object) { @@ -405,7 +423,7 @@ if (! ReferenceCurIconByProcess(Object)) { DPRINT1("Failed to add process\n"); - ObmCloseHandle(gHandleTable, Handle); + ObmDeleteObject(Handle, otCursor); ObmDereferenceObject(Object); return NULL; } @@ -483,7 +501,7 @@ bmpMask = Object->IconInfo.hbmMask; bmpColor = Object->IconInfo.hbmColor; - Ret = NT_SUCCESS(ObmCloseHandle(gHandleTable, Object->Self)); + Ret = ObmDeleteObject(Object->Self, otCursor); /* delete bitmaps */ if(bmpMask) @@ -520,7 +538,10 @@ { Object = CONTAINING_RECORD(CurrentEntry, CURICON_OBJECT, ListEntry); CurrentEntry = CurrentEntry->Flink; - if(NT_SUCCESS(ObmReferenceObjectByPointer(Object, otCursorIcon))) + + + ObmReferenceObject(Object); +// if(NT_SUCCESS(ObmReferenceObjectByPointer(Object, otCursorIcon))) { ProcessEntry = Object->ProcessList.Flink; while (ProcessEntry != &Object->ProcessList) @@ -537,6 +558,8 @@ ObmDereferenceObject(Object); } + + } ObDereferenceObject(WinStaObject); @@ -646,7 +669,7 @@ RETURN( FALSE); } - CurIconObject = IntGetCurIconObject(WinStaObject, Handle); + CurIconObject = IntGetCurIconObject(Handle); if(CurIconObject) { if(IconInfo) @@ -712,7 +735,7 @@ RETURN( FALSE); } - CurIconObject = IntGetCurIconObject(WinStaObject, Handle); + CurIconObject = IntGetCurIconObject(Handle); if(CurIconObject) { /* Copy fields */ @@ -929,7 +952,6 @@ { PWINSTATION_OBJECT WinStaObject; PCURICON_OBJECT Object; - NTSTATUS Status; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserDestroyCursorIcon\n"); @@ -941,13 +963,18 @@ RETURN( FALSE); } - Status = ObmReferenceObjectByHandle(gHandleTable, Handle, otCursorIcon, (PVOID*)&Object); - if(!NT_SUCCESS(Status)) + if (!(Object = IntGetCurIconObject(Handle))) { - ObDereferenceObject(WinStaObject); - SetLastNtError(Status); - RETURN( FALSE); + ObDereferenceObject(WinStaObject); + RETURN(FALSE); } +// Status = ObmReferenceObjectByHandle(gHandleTable, Handle, otCursorIcon, (PVOID*)&Object); +// if(!NT_SUCCESS(Status)) +// { +// ObDereferenceObject(WinStaObject); +// SetLastNtError(Status); +// RETURN( FALSE); +// } if(IntDestroyCurIconObject(WinStaObject, Object, FALSE)) { @@ -1098,7 +1125,7 @@ RETURN( (HCURSOR)0); } - CurIconObject = IntGetCurIconObject(WinStaObject, hCursor); + CurIconObject = IntGetCurIconObject(hCursor); if(CurIconObject) { OldCursor = IntSetCursor(WinStaObject, CurIconObject, FALSE); @@ -1142,7 +1169,7 @@ RETURN( FALSE); } - CurIconObject = IntGetCurIconObject(WinStaObject, Handle); + CurIconObject = IntGetCurIconObject(Handle); if(CurIconObject) { /* Copy fields */ @@ -1222,7 +1249,7 @@ RETURN( FALSE); } - CurIconObject = IntGetCurIconObject(WinStaObject, Handle); + CurIconObject = IntGetCurIconObject(Handle); if(CurIconObject) { CurIconObject->hModule = hModule; @@ -1338,7 +1365,7 @@ RETURN( FALSE); } - CurIconObject = IntGetCurIconObject(WinStaObject, hIcon); + CurIconObject = IntGetCurIconObject(hIcon); if(CurIconObject) { hbmMask = CurIconObject->IconInfo.hbmMask; _____ Modified: trunk/reactos/subsys/win32k/ntuser/focus.c --- trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-07 19:37:28 UTC (rev 17727) +++ trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-07 20:59:26 UTC (rev 17728) @@ -63,7 +63,7 @@ { PWINDOW_OBJECT Window, Owner, Parent; - if (hWnd) + if (hWnd && (Window = IntGetWindowObject(hWnd))) { /* Send palette messages */ if (co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) @@ -73,25 +73,26 @@ } if (UserGetWindow(hWnd, GW_HWNDPREV) != NULL) - co_WinPosSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, + co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOSENDCHANGING); - Window = IntGetWindowObject(hWnd); - if (Window) { - Owner = IntGetOwner(Window); - if (!Owner) { - Parent = IntGetParent(Window); - if (!Parent) + + Owner = IntGetOwner(Window); + if (!Owner) + { + Parent = IntGetParent(Window); + if (!Parent) co_IntShellHookNotify(HSHELL_WINDOWACTIVATED, (LPARAM) hWnd); - else + else IntReleaseWindowObject(Parent); - } else { - IntReleaseWindowObject(Owner); - } - - IntReleaseWindowObject(Window); + } + else + { + IntReleaseWindowObject(Owner); } + IntReleaseWindowObject(Window); + /* FIXME: IntIsWindow */ co_IntPostOrSendMessage(hWnd, WM_NCACTIVATE, (WPARAM)(hWnd == UserGetForegroundWindow()), 0); @@ -154,6 +155,8 @@ HWND hWndFocusPrev = NULL; PUSER_MESSAGE_QUEUE PrevForegroundQueue; + ASSERT_REFS_CO(Window); + DPRINT("IntSetForegroundAndFocusWindow(%x, %x, %s)\n", hWnd, hWndFocus, MouseActivate ? "TRUE" : "FALSE"); DPRINT("(%wZ)\n", &Window->WindowName); @@ -214,6 +217,8 @@ BOOL FASTCALL co_IntSetForegroundWindow(PWINDOW_OBJECT Window) { + ASSERT_REFS_CO(Window); + return co_IntSetForegroundAndFocusWindow(Window, Window, FALSE); } @@ -223,6 +228,8 @@ HWND Top; PWINDOW_OBJECT TopWindow; + ASSERT_REFS_CO(Window); + if(Window->Style & WS_DISABLED) { BOOL Ret; @@ -269,12 +276,14 @@ } HWND FASTCALL -co_IntSetActiveWindow(PWINDOW_OBJECT Window) +co_IntSetActiveWindow(PWINDOW_OBJECT Window OPTIONAL) { PUSER_MESSAGE_QUEUE ThreadQueue; HWND hWndPrev; HWND hWnd = 0; + if (Window) ASSERT_REFS_CO(Window); + ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue; ASSERT(ThreadQueue != 0); @@ -404,10 +413,8 @@ PUSER_MESSAGE_QUEUE ThreadQueue; HWND hWndPrev; - Window = IntGetWindowObject(hWnd); - if (Window == NULL) + if (!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN( 0); } @@ -417,13 +424,13 @@ if (Window->MessageQueue != ThreadQueue) { - IntReleaseWindowObject(Window); SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN( 0); } [truncated at 1000 lines; 2443 more skipped]

19 years

[ion] 17727: Implement NTDLL's CSR routines in a compatible way. Fix prototypes, argument count, deprecated functions and new functions. Some functions will not work (or are designed not to work) fully until the new CSR is committed, but they keep the same functionality as the previous versions (no regressions found; tested with cmd, cmt, putty, telnet, ps). Also added NtSecureConnectPort.

by ion＠svn.reactos.com

Implement NTDLL's CSR routines in a compatible way. Fix prototypes, argument count, deprecated functions and new functions. Some functions will not work (or are designed not to work) fully until the new CSR is committed, but they keep the same functionality as the previous versions (no regressions found; tested with cmd, cmt, putty, telnet, ps). Also added NtSecureConnectPort. Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/subsys/csrss/csrss.h Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/misc/dllmain.c Added: trunk/reactos/lib/ntdll/csr/api.c Modified: trunk/reactos/lib/ntdll/csr/capture.c Added: trunk/reactos/lib/ntdll/csr/connect.c Deleted: trunk/reactos/lib/ntdll/csr/lpc.c Deleted: trunk/reactos/lib/ntdll/csr/probe.c Deleted: trunk/reactos/lib/ntdll/csr/srv.c Deleted: trunk/reactos/lib/ntdll/csr/thread.c Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/lib/ntdll/ntdll.xml Modified: trunk/reactos/subsys/csrss/init.c Modified: trunk/reactos/tools/nci/sysfuncs.lst _____ Modified: trunk/reactos/include/ndk/umfuncs.h --- trunk/reactos/include/ndk/umfuncs.h 2005-09-07 19:09:56 UTC (rev 17726) +++ trunk/reactos/include/ndk/umfuncs.h 2005-09-07 19:37:28 UTC (rev 17727) @@ -8,29 +8,53 @@ #define _UMFUNCS_H /* DEPENDENCIES **************************************************************/ +struct _CSR_API_MESSAGE; +struct _CSR_CAPTURE_BUFFER; /* PROTOTYPES ****************************************************************/ /* * CSR Functions */ +PVOID +NTAPI +CsrAllocateCaptureBuffer( + ULONG ArgumentCount, + ULONG BufferSize +); + +ULONG +NTAPI +CsrAllocateMessagePointer( + struct _CSR_CAPTURE_BUFFER *CaptureBuffer, + ULONG MessageLength, + PVOID *CaptureData +); + +VOID +NTAPI +CsrCaptureMessageBuffer( + struct _CSR_CAPTURE_BUFFER *CaptureBuffer, + PVOID MessageString, + ULONG StringLength, + PVOID *CapturedData +); + NTSTATUS NTAPI CsrClientConnectToServer( PWSTR ObjectDirectory, ULONG ServerId, - PVOID Unknown, - PVOID Context, - ULONG ContextLength, + PVOID ConnectionInfo, + PULONG ConnectionInfoSize, PBOOLEAN ServerToServerCall ); -struct _CSR_API_MESSAGE; NTSTATUS NTAPI CsrClientCallServer( struct _CSR_API_MESSAGE *Request, - PVOID CapturedBuffer OPTIONAL, + struct _CSR_CAPTURE_BUFFER *CaptureBuffer OPTIONAL, ULONG ApiNumber, ULONG RequestLength ); @@ -39,6 +63,10 @@ NTAPI CsrIdentifyAlertableThread(VOID); +VOID +NTAPI +CsrFreeCaptureBuffer(struct _CSR_CAPTURE_BUFFER *CaptureBuffer); + NTSTATUS NTAPI CsrNewThread(VOID); @@ -53,7 +81,7 @@ VOID NTAPI CsrProbeForRead( - IN CONST PVOID Address, + IN PVOID Address, IN ULONG Length, IN ULONG Alignment ); @@ -61,24 +89,11 @@ VOID NTAPI CsrProbeForWrite( - IN CONST PVOID Address, + IN PVOID Address, IN ULONG Length, IN ULONG Alignment ); -NTSTATUS -NTAPI -CsrCaptureParameterBuffer( - PVOID ParameterBuffer, - ULONG ParameterBufferSize, - PVOID* ClientAddress, - PVOID* ServerAddress -); - -NTSTATUS -NTAPI -CsrReleaseParameterBuffer(PVOID ClientAddress); - /* * Debug Functions */ _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-09-07 19:09:56 UTC (rev 17726) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-09-07 19:37:28 UTC (rev 17727) @@ -3322,8 +3322,39 @@ IN ULONG Flags ); + +NTSYSCALLAPI NTSTATUS NTAPI +NtSecureConnectPort( + PHANDLE PortHandle, + PUNICODE_STRING PortName, + PSECURITY_QUALITY_OF_SERVICE SecurityQos, + PPORT_VIEW ClientView OPTIONAL, + PSID Sid OPTIONAL, + PREMOTE_PORT_VIEW ServerView OPTIONAL, + PULONG MaxMessageLength OPTIONAL, + PVOID ConnectionInformation OPTIONAL, + PULONG ConnectionInformationLength OPTIONAL +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwSecureConnectPort( + PHANDLE PortHandle, + PUNICODE_STRING PortName, + PSECURITY_QUALITY_OF_SERVICE SecurityQos, + PPORT_VIEW ClientView OPTIONAL, + PSID Sid OPTIONAL, + PREMOTE_PORT_VIEW ServerView OPTIONAL, + PULONG MaxMessageLength OPTIONAL, + PVOID ConnectionInformation OPTIONAL, + PULONG ConnectionInformationLength OPTIONAL +); + +NTSTATUS +NTAPI NtSetBootEntryOrder( IN ULONG Unknown1, IN ULONG Unknown2 _____ Modified: trunk/reactos/include/subsys/csrss/csrss.h --- trunk/reactos/include/subsys/csrss/csrss.h 2005-09-07 19:09:56 UTC (rev 17726) +++ trunk/reactos/include/subsys/csrss/csrss.h 2005-09-07 19:37:28 UTC (rev 17727) @@ -484,6 +484,7 @@ typedef struct _CSR_API_MESSAGE { PORT_MESSAGE Header; + PVOID CsrCaptureData; ULONG Type; NTSTATUS Status; union @@ -544,4 +545,75 @@ } Data; } CSR_API_MESSAGE, *PCSR_API_MESSAGE; +/* Types used in the new CSR. Temporarly here for proper compile of NTDLL */ +#define CSR_SRV_SERVER 0 + +#define CsrSrvClientConnect 0 +#define CsrSrvIdentifyAlertableThread 3 +#define CsrSrvSetPriorityClass 4 + +#define CSR_MAKE_OPCODE(s,m) ((s) << 16) | (m) + +typedef struct _CSR_CONNECTION_INFO +{ + ULONG Version; + ULONG Unknown; + HANDLE ObjectDirectory; + PVOID SharedSectionBase; + PVOID SharedSectionHeap; + PVOID SharedSectionData; + ULONG DebugFlags; + ULONG Unknown2[3]; + HANDLE ProcessId; +} CSR_CONNECTION_INFO, *PCSR_CONNECTION_INFO; + +typedef struct _CSR_CLIENT_CONNECT +{ + ULONG ServerId; + PVOID ConnectionInfo; + ULONG ConnectionInfoSize; +} CSR_CLIENT_CONNECT, *PCSR_CLIENT_CONNECT; + +typedef struct _CSR_IDENTIFY_ALTERTABLE_THREAD +{ + CLIENT_ID Cid; +} CSR_IDENTIFY_ALTERTABLE_THREAD, *PCSR_IDENTIFY_ALTERTABLE_THREAD; + +typedef struct _CSR_SET_PRIORITY_CLASS +{ + HANDLE hProcess; + ULONG PriorityClass; +} CSR_SET_PRIORITY_CLASS, *PCSR_SET_PRIORITY_CLASS; + +typedef struct _CSR_API_MESSAGE2 +{ + PORT_MESSAGE Header; + union + { + CSR_CONNECTION_INFO ConnectionInfo; + struct + { + PVOID CsrCaptureData; + CSR_API_NUMBER Opcode; + ULONG Status; + ULONG Reserved; + union + { + CSR_CLIENT_CONNECT ClientConnect; + CSR_SET_PRIORITY_CLASS SetPriorityClass; + CSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; + }; + }; + }; +} CSR_API_MESSAGE2, *PCSR_API_MESSAGE2; + +typedef struct _CSR_CAPTURE_BUFFER +{ + ULONG Size; + struct _CSR_CAPTURE_BUFFER *PreviousCaptureBuffer; + ULONG PointerCount; + ULONG_PTR BufferEnd; + ULONG_PTR PointerArray[1]; +} CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER; + #endif /* __INCLUDE_CSRSS_CSRSS_H */ _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-09-07 19:09:56 UTC (rev 17726) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-09-07 19:37:28 UTC (rev 17727) @@ -1546,8 +1546,8 @@ BOOL bUnicode) { CSR_API_MESSAGE Request; ULONG CsrRequest; + PCSR_CAPTURE_BUFFER CaptureBuffer; NTSTATUS Status; - PVOID BufferBase; PVOID BufferTargetBase; ULONG Size; @@ -1559,40 +1559,55 @@ Size = nLength * sizeof(INPUT_RECORD); - Status = CsrCaptureParameterBuffer(NULL, Size, &BufferBase, &BufferTargetBase); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } + /* Allocate a Capture Buffer */ + DPRINT1("IntPeekConsoleInput: %lx %p\n", Size, lpNumberOfEventsRead); + CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); + /* Allocate space in the Buffer */ + CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); + DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + + /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(PEEK_CONSOLE_INPUT, CSR_CONSOLE); Request.Data.PeekConsoleInputRequest.ConsoleHandle = hConsoleInput; Request.Data.PeekConsoleInputRequest.Unicode = bUnicode; Request.Data.PeekConsoleInputRequest.Length = nLength; Request.Data.PeekConsoleInputRequest.InputRecord = (INPUT_RECORD*)BufferTargetBase; + /* Call the server */ + DPRINT1("Calling Server\n"); Status = CsrClientCallServer(&Request, - NULL, + CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); + DPRINT1("Server returned: %x\n", Request.Status); - if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + /* Check for success*/ + if (NT_SUCCESS(Request.Status)) { - CsrReleaseParameterBuffer(BufferBase); - return FALSE; + /* Return the number of events read */ + DPRINT1("Events read: %lx\n", Request.Data.PeekConsoleInputRequest.Length); + *lpNumberOfEventsRead = Request.Data.PeekConsoleInputRequest.Length; + + /* Copy into the buffer */ + DPRINT1("Copying to buffer\n"); + RtlCopyMemory(lpBuffer, + Request.Data.PeekConsoleInputRequest.InputRecord, + sizeof(INPUT_RECORD) * *lpNumberOfEventsRead); } - - memcpy(lpBuffer, BufferBase, sizeof(INPUT_RECORD) * Request.Data.PeekConsoleInputRequest.Length); - - CsrReleaseParameterBuffer(BufferBase); - - if(lpNumberOfEventsRead != NULL) + else { - *lpNumberOfEventsRead = Request.Data.PeekConsoleInputRequest.Length; + /* Error out */ + *lpNumberOfEventsRead = 0; + SetLastErrorByStatus(Request.Status); } - return TRUE; + /* Release the capture buffer */ + DPRINT1("Release buffer and return\n"); + CsrFreeCaptureBuffer(CaptureBuffer); + + /* Return TRUE or FALSE */ + return NT_SUCCESS(Request.Status); } /*-------------------------------------------------------------- @@ -1751,8 +1766,8 @@ BOOL bUnicode) { CSR_API_MESSAGE Request; ULONG CsrRequest; - - PVOID BufferBase, BufferTargetBase; + PCSR_CAPTURE_BUFFER CaptureBuffer; + PVOID BufferTargetBase; NTSTATUS Status; DWORD Size; @@ -1764,37 +1779,55 @@ Size = nLength * sizeof(INPUT_RECORD); - Status = CsrCaptureParameterBuffer((PVOID)lpBuffer, Size, &BufferBase, &BufferTargetBase); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } + /* Allocate a Capture Buffer */ + DPRINT1("IntWriteConsoleInput: %lx %p\n", Size, lpNumberOfEventsWritten); + CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); + /* Allocate space in the Buffer */ + CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); + DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + + /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(WRITE_CONSOLE_INPUT, CSR_CONSOLE); Request.Data.WriteConsoleInputRequest.ConsoleHandle = hConsoleInput; Request.Data.WriteConsoleInputRequest.Unicode = bUnicode; Request.Data.WriteConsoleInputRequest.Length = nLength; Request.Data.WriteConsoleInputRequest.InputRecord = (PINPUT_RECORD)BufferTargetBase; - Status = CsrClientCallServer(&Request, NULL, + /* Call the server */ + DPRINT1("Calling Server\n"); + Status = CsrClientCallServer(&Request, + CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); + DPRINT1("Server returned: %x\n", Request.Status); - CsrReleaseParameterBuffer(BufferBase); + /* Check for success*/ + if (NT_SUCCESS(Request.Status)) + { + /* Return the number of events read */ + DPRINT1("Events read: %lx\n", Request.Data.WriteConsoleInputRequest.Length); + *lpNumberOfEventsWritten = Request.Data.WriteConsoleInputRequest.Length; - if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) - { - SetLastErrorByStatus(Status); - return FALSE; + /* Copy into the buffer */ + DPRINT1("Copying to buffer\n"); + RtlCopyMemory(lpBuffer, + Request.Data.WriteConsoleInputRequest.InputRecord, + sizeof(INPUT_RECORD) * *lpNumberOfEventsWritten); } - - if(lpNumberOfEventsWritten != NULL) + else { - *lpNumberOfEventsWritten = Request.Data.WriteConsoleInputRequest.Length; + /* Error out */ + *lpNumberOfEventsWritten = 0; + SetLastErrorByStatus(Request.Status); } - return TRUE; + /* Release the capture buffer */ + DPRINT1("Release buffer and return\n"); + CsrFreeCaptureBuffer(CaptureBuffer); + + /* Return TRUE or FALSE */ + return NT_SUCCESS(Request.Status); } @@ -1851,8 +1884,7 @@ BOOL bUnicode) { CSR_API_MESSAGE Request; ULONG CsrRequest; - - PVOID BufferBase; + PCSR_CAPTURE_BUFFER CaptureBuffer; PVOID BufferTargetBase; NTSTATUS Status; DWORD Size, SizeX, SizeY; @@ -1865,13 +1897,15 @@ Size = dwBufferSize.X * dwBufferSize.Y * sizeof(CHAR_INFO); - Status = CsrCaptureParameterBuffer(NULL, Size, &BufferBase, &BufferTargetBase); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } + /* Allocate a Capture Buffer */ + DPRINT1("IntReadConsoleOutput: %lx %p\n", Size, lpReadRegion); + CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); + /* Allocate space in the Buffer */ + CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); + DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + + /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(READ_CONSOLE_OUTPUT, CSR_CONSOLE); Request.Data.ReadConsoleOutputRequest.ConsoleHandle = hConsoleOutput; Request.Data.ReadConsoleOutputRequest.Unicode = bUnicode; @@ -1880,28 +1914,43 @@ Request.Data.ReadConsoleOutputRequest.ReadRegion = *lpReadRegion; Request.Data.ReadConsoleOutputRequest.CharInfo = (PCHAR_INFO)BufferTargetBase; + /* Call the server */ + DPRINT1("Calling Server\n"); Status = CsrClientCallServer(&Request, - NULL, + CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); + DPRINT1("Server returned: %x\n", Request.Status); - if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) + /* Check for success*/ + if (NT_SUCCESS(Request.Status)) { - SetLastErrorByStatus(Status); - CsrReleaseParameterBuffer(BufferBase); - return FALSE; + /* Copy into the buffer */ + DPRINT1("Copying to buffer\n"); + SizeX = Request.Data.ReadConsoleOutputRequest.ReadRegion.Right - + Request.Data.ReadConsoleOutputRequest.ReadRegion.Left + 1; + SizeY = Request.Data.ReadConsoleOutputRequest.ReadRegion.Bottom - + Request.Data.ReadConsoleOutputRequest.ReadRegion.Top + 1; + RtlCopyMemory(lpBuffer, + Request.Data.ReadConsoleOutputRequest.CharInfo, + sizeof(CHAR_INFO) * SizeX * SizeY); } + else + { + /* Error out */ + SetLastErrorByStatus(Request.Status); + } - SizeX = Request.Data.ReadConsoleOutputRequest.ReadRegion.Right - Request.Data.ReadConsoleOutputRequest.ReadRegion.Left + 1; - SizeY = Request.Data.ReadConsoleOutputRequest.ReadRegion.Bottom - Request.Data.ReadConsoleOutputRequest.ReadRegion.Top + 1; + /* Return the read region */ + DPRINT1("read region: %lx\n", Request.Data.ReadConsoleOutputRequest.ReadRegion); + *lpReadRegion = Request.Data.ReadConsoleOutputRequest.ReadRegion; - memcpy(lpBuffer, BufferBase, sizeof(CHAR_INFO) * SizeX * SizeY); + /* Release the capture buffer */ + DPRINT1("Release buffer and return\n"); + CsrFreeCaptureBuffer(CaptureBuffer); - CsrReleaseParameterBuffer(BufferBase); - - *lpReadRegion = Request.Data.ReadConsoleOutputRequest.ReadRegion; - - return TRUE; + /* Return TRUE or FALSE */ + return NT_SUCCESS(Request.Status); } /*-------------------------------------------------------------- @@ -1953,49 +2002,59 @@ BOOL bUnicode) { CSR_API_MESSAGE Request; ULONG CsrRequest; + PCSR_CAPTURE_BUFFER CaptureBuffer; NTSTATUS Status; ULONG Size; - PVOID BufferBase; PVOID BufferTargetBase; Size = dwBufferSize.Y * dwBufferSize.X * sizeof(CHAR_INFO); - Status = CsrCaptureParameterBuffer((PVOID)lpBuffer, - Size, - &BufferBase, - &BufferTargetBase); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } + /* Allocate a Capture Buffer */ + DPRINT1("IntWriteConsoleOutput: %lx %p\n", Size, lpWriteRegion); + CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); + /* Allocate space in the Buffer */ + CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); + DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + + /* Copy from the buffer */ + DPRINT1("Copying into buffer\n"); + RtlCopyMemory(BufferTargetBase, lpBuffer, Size); + + /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(WRITE_CONSOLE_OUTPUT, CSR_CONSOLE); Request.Data.WriteConsoleOutputRequest.ConsoleHandle = hConsoleOutput; Request.Data.WriteConsoleOutputRequest.Unicode = bUnicode; Request.Data.WriteConsoleOutputRequest.BufferSize = dwBufferSize; Request.Data.WriteConsoleOutputRequest.BufferCoord = dwBufferCoord; Request.Data.WriteConsoleOutputRequest.WriteRegion = *lpWriteRegion; - Request.Data.WriteConsoleOutputRequest.CharInfo = - (CHAR_INFO*)BufferTargetBase; + Request.Data.WriteConsoleOutputRequest.CharInfo = (CHAR_INFO*)BufferTargetBase; + /* Call the server */ + DPRINT1("Calling Server\n"); Status = CsrClientCallServer(&Request, - NULL, - CsrRequest, - sizeof(CSR_API_MESSAGE)); + CaptureBuffer, + CsrRequest, + sizeof(CSR_API_MESSAGE)); + DPRINT1("Server returned: %x\n", Request.Status); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) - { - CsrReleaseParameterBuffer(BufferBase); - SetLastErrorByStatus(Status); - return FALSE; - } + /* Check for success*/ + if (!NT_SUCCESS(Request.Status)) + { + /* Error out */ + SetLastErrorByStatus(Request.Status); + } - CsrReleaseParameterBuffer(BufferBase); - + /* Return the read region */ + DPRINT1("read region: %lx\n", Request.Data.WriteConsoleOutputRequest.WriteRegion); *lpWriteRegion = Request.Data.WriteConsoleOutputRequest.WriteRegion; - return(TRUE); + /* Release the capture buffer */ + DPRINT1("Release buffer and return\n"); + CsrFreeCaptureBuffer(CaptureBuffer); + + /* Return TRUE or FALSE */ + return NT_SUCCESS(Request.Status); } /*-------------------------------------------------------------- _____ Modified: trunk/reactos/lib/kernel32/misc/dllmain.c --- trunk/reactos/lib/kernel32/misc/dllmain.c 2005-09-07 19:09:56 UTC (rev 17726) +++ trunk/reactos/lib/kernel32/misc/dllmain.c 2005-09-07 19:37:28 UTC (rev 17727) @@ -16,6 +16,8 @@ #define NDEBUG #include "../include/debug.h" +#define CSR_BASE_DLL 0 // <- This should be 1 when CSR gets committed + /* GLOBALS *******************************************************************/ extern UNICODE_STRING SystemDirectory; @@ -198,42 +200,47 @@ } -BOOL STDCALL +BOOL +STDCALL DllMain(HANDLE hDll, - DWORD dwReason, - LPVOID lpReserved) + DWORD dwReason, + LPVOID lpReserved) { - NTSTATUS Status; + NTSTATUS Status; + BOOLEAN IsServer; + ULONG Dummy; + ULONG DummySize = sizeof(Dummy); - (void)lpReserved; + DPRINT("DllMain(hInst %lx, dwReason %lu)\n", + hDll, dwReason); - DPRINT("DllMain(hInst %lx, dwReason %lu)\n", - hDll, dwReason); - - switch (dwReason) + switch (dwReason) { - case DLL_PROCESS_ATTACH: - DPRINT("DLL_PROCESS_ATTACH\n"); + case DLL_PROCESS_ATTACH: - LdrDisableThreadCalloutsForDll ((PVOID)hDll); + /* Don't bother us for each thread */ + LdrDisableThreadCalloutsForDll((PVOID)hDll); - /* - * Connect to the csrss server - */ - Status = CsrClientConnectToServer(L"\\Windows\\ApiPort", - 0, - NULL, - NULL, - 0, - NULL); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Failed to connect to csrss.exe (Status %lx)\n", - Status); - ZwTerminateProcess(NtCurrentProcess(), Status); - return FALSE; - } + /* Connect to the base server */ + Status = CsrClientConnectToServer(L"\\Windows", // <- FIXME: SessionDir + CSR_BASE_DLL, + &Dummy, + &DummySize, + &IsServer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to connect to CSR (Status %lx)\n", Status); + ZwTerminateProcess(NtCurrentProcess(), Status); + return FALSE; + } + /* Check if we are running a CSR Server */ + if (!IsServer) + { + /* Set the termination port for the thread */ + CsrNewThread(); + } + hProcessHeap = RtlGetProcessHeap(); hCurrentModule = hDll; _____ Added: trunk/reactos/lib/ntdll/csr/api.c --- trunk/reactos/lib/ntdll/csr/api.c 2005-09-07 19:09:56 UTC (rev 17726) +++ trunk/reactos/lib/ntdll/csr/api.c 2005-09-07 19:37:28 UTC (rev 17727) @@ -0,0 +1,89 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ntdll/csr/api.c + * PURPOSE: CSR APIs exported through NTDLL + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ +extern HANDLE CsrApiPort; + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrNewThread(VOID) +{ + /* Register the termination port to CSR's */ + return NtRegisterThreadTerminatePort(CsrApiPort); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrSetPriorityClass(HANDLE hProcess, + PULONG PriorityClass) +{ + NTSTATUS Status; + CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */ + PCSR_SET_PRIORITY_CLASS SetPriorityClass = &ApiMessage.SetPriorityClass; + + /* Set up the data for CSR */ + DbgBreakPoint(); + SetPriorityClass->hProcess = hProcess; + SetPriorityClass->PriorityClass = *PriorityClass; + + /* Call it */ + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_MAKE_OPCODE(CsrSrvSetPriorityClass, + CSR_SRV_SERVER), + sizeof(CSR_SET_PRIORITY_CLASS)); + + /* Return what we got, if requested */ + if (*PriorityClass) *PriorityClass = SetPriorityClass->PriorityClass; + + /* Return to caller */ + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CsrIdentifyAlertableThread (VOID) +{ + NTSTATUS Status; + CSR_API_MESSAGE2 ApiMessage; /* <- Remove the "2" when CSR is commited */ + PCSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; + + /* Set up the data for CSR */ + DbgBreakPoint(); + IdentifyAlertableThread = &ApiMessage.IdentifyAlertableThread; + IdentifyAlertableThread->Cid = NtCurrentTeb()->Cid; + + /* Call it */ + Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_MAKE_OPCODE(CsrSrvIdentifyAlertableThread, + CSR_SRV_SERVER), + sizeof(CSR_SET_PRIORITY_CLASS)); + + /* Return to caller */ + return Status; +} + +/* EOF */ _____ Modified: trunk/reactos/lib/ntdll/csr/capture.c --- trunk/reactos/lib/ntdll/csr/capture.c 2005-09-07 19:09:56 UTC (rev 17726) +++ trunk/reactos/lib/ntdll/csr/capture.c 2005-09-07 19:37:28 UTC (rev 17727) @@ -1,9 +1,9 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/csr/capture.c - * PURPOSE: CSRSS Capture API + * PURPOSE: routines for probing and capturing CSR API Messages + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES *****************************************************************/ @@ -13,90 +13,255 @@ #include <debug.h> /* GLOBALS *******************************************************************/ +extern HANDLE CsrPortHeap; -static HANDLE hCaptureHeap = INVALID_HANDLE_VALUE; /* FIXME: use the general NTDLL heap */ - /* FUNCTIONS *****************************************************************/ /* - * @unimplemented + * @implemented */ -PVOID -STDCALL CsrAllocateCaptureBuffer ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2 - ) +VOID +NTAPI +CsrProbeForRead(IN PVOID Address, + IN ULONG Length, + IN ULONG Alignment) { - /* FIXME: implement it! */ - return NULL; + PUCHAR Pointer; + UCHAR Data; + + /* Validate length */ + if (Length == 0) return; + + /* Validate alignment */ + if ((ULONG_PTR)Address & (Alignment - 1)) + { + /* Raise exception if it doesn't match */ + RtlRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); + } + + /* Do the probe */ + Pointer = (PUCHAR)Address; + Data = *Pointer; + Pointer = (PUCHAR)((ULONG)Address + Length -1); + Data = *Pointer; } /* - * @unimplemented + * @implemented */ -VOID STDCALL -CsrCaptureMessageString (DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) +VOID +NTAPI +CsrProbeForWrite(IN PVOID Address, + IN ULONG Length, + IN ULONG Alignment) { + PUCHAR Pointer; + UCHAR Data; + + /* Validate length */ + if (Length == 0) return; + + /* Validate alignment */ + if ((ULONG_PTR)Address & (Alignment - 1)) + { + /* Raise exception if it doesn't match */ + RtlRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); + } + + /* Do the probe */ + Pointer = (PUCHAR)Address; + Data = *Pointer; + *Pointer = Data; + Pointer = (PUCHAR)((ULONG)Address + Length -1); + Data = *Pointer; + *Pointer = Data; } /* - * @unimplemented + * @implemented */ -VOID STDCALL -CsrAllocateCapturePointer(ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2) +PVOID +NTAPI +CsrAllocateCaptureBuffer(ULONG ArgumentCount, + ULONG BufferSize) { + PCSR_CAPTURE_BUFFER CaptureBuffer; + /* Validate size */ + if (BufferSize >= MAXLONG) return NULL; + + /* Add the size of the header and for each pointer to the pointers */ + BufferSize += sizeof(CSR_CAPTURE_BUFFER) + (ArgumentCount * sizeof(PVOID)); + + /* Allocate memory from the port heap */ + CaptureBuffer = RtlAllocateHeap(CsrPortHeap, 0, BufferSize); + + /* Initialize the header */ + CaptureBuffer->Size = BufferSize; + CaptureBuffer->PointerCount = 0; + + /* Initialize all the pointers */ + RtlZeroMemory(CaptureBuffer->PointerArray, + ArgumentCount * sizeof(ULONG_PTR)); + + /* Point the start of the free buffer */ + CaptureBuffer->BufferEnd = (ULONG_PTR)CaptureBuffer->PointerArray + + ArgumentCount * sizeof(ULONG_PTR); + + /* Return the address of the buffer */ + return CaptureBuffer; } /* - * @unimplemented + * @implemented */ -VOID STDCALL CsrAllocateMessagePointer (DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) +ULONG +NTAPI +CsrAllocateMessagePointer(PCSR_CAPTURE_BUFFER CaptureBuffer, + ULONG MessageLength, + PVOID *CaptureData) { + /* If there's no data, our job is easy. */ + if (MessageLength == 0) + { + *CaptureData = NULL; + CaptureData = NULL; + } + else + { + /* Set the capture data at our current available buffer */ + *CaptureData = (PVOID)CaptureBuffer->BufferEnd; + + /* Validate the size */ + if (MessageLength >= MAXLONG) return 0; + + /* Align it to a 4-byte boundary */ + MessageLength = (MessageLength + 3) & ~3; + + /* Move our available buffer beyond this space */ + CaptureBuffer->BufferEnd += MessageLength; + } + + /* Increase the pointer count */ + CaptureBuffer->PointerCount++; + + /* Write down this pointer in the array */ + CaptureBuffer->PointerArray[CaptureBuffer->PointerCount] = (ULONG_PTR)CaptureData; + + /* Return the aligned length */ + return MessageLength; } /* - * @unimplemented + * @implemented */ -VOID STDCALL -CsrCaptureMessageBuffer(ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3) +VOID +NTAPI +CsrCaptureMessageBuffer(PCSR_CAPTURE_BUFFER CaptureBuffer, + PVOID MessageString, + ULONG StringLength, + PVOID *CapturedData) { + /* Simply allocate a message pointer in the buffer */ + CsrAllocateMessagePointer(CaptureBuffer, StringLength, CapturedData); + /* Check if there was any data */ + if (!MessageString || !StringLength) return; + + /* Copy the data into the buffer */ + RtlMoveMemory(*CapturedData, MessageString, StringLength); } /* - * @unimplemented + * @implemented */ -BOOLEAN STDCALL CsrFreeCaptureBuffer (PVOID CaptureBuffer) +VOID +NTAPI +CsrFreeCaptureBuffer(PCSR_CAPTURE_BUFFER CaptureBuffer) { - /* FIXME: use NTDLL own heap */ - return RtlFreeHeap (hCaptureHeap, 0, CaptureBuffer); + /* Free it from the heap */ + RtlFreeHeap(CsrPortHeap, 0, CaptureBuffer); } /* * @implemented */ -PLARGE_INTEGER STDCALL [truncated at 1000 lines; 971 more skipped]

19 years

[amunger] 17726: Fix include so packlib builds after latest wine sync.

by amunger＠svn.reactos.com

Fix include so packlib builds after latest wine sync. Modified: trunk/rosapps/packmgr/lib/download.cpp _____ Modified: trunk/rosapps/packmgr/lib/download.cpp --- trunk/rosapps/packmgr/lib/download.cpp 2005-09-07 17:54:47 UTC (rev 17725) +++ trunk/rosapps/packmgr/lib/download.cpp 2005-09-07 19:09:56 UTC (rev 17726) @@ -13,7 +13,7 @@ #include "package.hpp" #include "expat.h" #include "log.h" -#include <wine/urlmon.h> +#include <urlmon.h> HRESULT WINAPI URLDownloadToFileA( LPUNKNOWN pCaller,

19 years

[gvg] 17725: Make sure memory will be freed on delete of DIB section

by gvg＠svn.reactos.com

Make sure memory will be freed on delete of DIB section Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-09-07 17:20:28 UTC (rev 17724) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-09-07 17:54:47 UTC (rev 17725) @@ -923,6 +923,7 @@ return NULL; } bmp->dib = (DIBSECTION *) dib; + bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; /* WINE NOTE: WINE makes use of a colormap, which is a color translation table between the DIB and the X physical device. Obviously, this is left out of the ReactOS implementation. Instead, we call

19 years

[hbirr] 17724: Fixed the definition of RtlUnicodeStringToCountedOemSize. This will fix bug 756.

by hbirr＠svn.reactos.com

Fixed the definition of RtlUnicodeStringToCountedOemSize. This will fix bug 756. Modified: trunk/reactos/include/ndk/rtlfuncs.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-09-07 16:34:46 UTC (rev 17723) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-09-07 17:20:28 UTC (rev 17724) @@ -839,7 +839,7 @@ ((STRING)->Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR) \ ) #define RtlUnicodeStringToCountedOemSize(STRING) ( \ - (ULONG)(RtlUnicodeStringToOemSize(STRING) - sizeof(UNICODE_NULL)) \ + (ULONG)(RtlUnicodeStringToOemSize(STRING) - sizeof(ANSI_NULL)) \ ) #endif

19 years

[gvg] 17723: Update status

by gvg＠svn.reactos.com

Update status Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-09-07 16:33:53 UTC (rev 17722) +++ trunk/reactos/media/doc/README.WINE 2005-09-07 16:34:46 UTC (rev 17723) @@ -26,48 +26,48 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-20050725 -reactos/tools/wpp # Synced to Wine-20050725 +reactos/tools/unicode # Synced to Wine-20050830 +reactos/tools/wpp # Synced to Wine-20050830 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-20050725 +reactos/tools/winebuild # Synced to Wine-20050830 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-20050725 +reactos/tools/wrc # Synced to Wine-20050830 reactos/tools/widl # Forked at Wine-20050628 The following libraries are shared with Wine. -reactos/lib/cabinet # Synced to Wine-20050725 -reactos/lib/comctl32 # Synced to Wine-20050725 -reactos/lib/comdlg32 # Synced to Wine-20050725 +reactos/lib/cabinet # Synced to Wine-20050830 +reactos/lib/comctl32 # Synced to Wine-20050830 +reactos/lib/comdlg32 # Synced to Wine-20050830 reactos/lib/dbghelp # reactos/lib/dinput # Forked at Wine-20050310 -reactos/lib/dinput8 # Synced to Wine-20050725 -reactos/lib/icmp # Synced to Wine-20050725 +reactos/lib/dinput8 # Synced to Wine-20050830 +reactos/lib/icmp # Synced to Wine-20050830 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20050725 +reactos/lib/mpr # Synced to Wine-20050830 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-20050725 -reactos/lib/msi # Synced to Wine-20050725 +reactos/lib/msimg32 # Synced to Wine-20050830 +reactos/lib/msi # Synced to Wine-20050830 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync -reactos/lib/objsel # Synced to Wine-20050726 +reactos/lib/objsel # Synced to Wine-20050830 reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-20050725 -reactos/lib/oleaut32 # Synced to Wine-20050725 -reactos/lib/oledlg # Synced to Wine-20050725 -reactos/lib/olepro32 # Synced to Wine-20050725 -reactos/lib/riched20 # Synced to Wine-20050725 -reactos/lib/richedit # Synced to Wine-20050725 -reactos/lib/rpcrt4 # Synced to Wine-20050725 +reactos/lib/ole32 # Synced to Wine-20050830 +reactos/lib/oleaut32 # Synced to Wine-20050830 +reactos/lib/oledlg # Synced to Wine-20050830 +reactos/lib/olepro32 # Synced to Wine-20050830 +reactos/lib/riched20 # Synced to Wine-20050830 +reactos/lib/richedit # Synced to Wine-20050830 +reactos/lib/rpcrt4 # Synced to Wine-20050830 reactos/lib/setupapi # Forked at Wine-20050524 -reactos/lib/shell32 # Synced to Wine-20050725 -reactos/lib/shdocvw # Synced to Wine-20050725 -reactos/lib/shlwapi # Synced to Wine-20050725 +reactos/lib/shell32 # Synced to Wine-20050830 +reactos/lib/shdocvw # Synced to Wine-20050830 +reactos/lib/shlwapi # Synced to Wine-20050830 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-20050725 -reactos/lib/uxtheme # Synced to Wine-20050725 +reactos/lib/urlmon # Synced to Wine-20050830 +reactos/lib/uxtheme # Synced to Wine-20050830 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync reactos/lib/winmm # Forked at Wine-20050628 @@ -77,7 +77,7 @@ ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-20050725 +reactos/subsys/system/msiexec # Synced to Wine-20050830 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

19 years

[gvg] 17722: Finish Wine-20050830 import

by gvg＠svn.reactos.com

Finish Wine-20050830 import Deleted: vendor/wine/dlls/cabinet/Wine-20050725/ Added: vendor/wine/dlls/cabinet/Wine-20050830/ Deleted: vendor/wine/dlls/comctl32/Wine-20050725/ Added: vendor/wine/dlls/comctl32/Wine-20050830/ Deleted: vendor/wine/dlls/commdlg/Wine-20050725/ Added: vendor/wine/dlls/commdlg/Wine-20050830/ Deleted: vendor/wine/dlls/dinput8/Wine-20050725/ Added: vendor/wine/dlls/dinput8/Wine-20050830/ Deleted: vendor/wine/dlls/dsound/Wine-20050725/ Added: vendor/wine/dlls/dsound/Wine-20050830/ Deleted: vendor/wine/dlls/icmp/Wine-20050725/ Added: vendor/wine/dlls/icmp/Wine-20050830/ Deleted: vendor/wine/dlls/midimap/Wine-20050725/ Added: vendor/wine/dlls/midimap/Wine-20050830/ Deleted: vendor/wine/dlls/mpr/Wine-20050725/ Added: vendor/wine/dlls/mpr/Wine-20050830/ Deleted: vendor/wine/dlls/msi/Wine-20050725/ Added: vendor/wine/dlls/msi/Wine-20050830/ Deleted: vendor/wine/dlls/msimg32/Wine-20050725/ Added: vendor/wine/dlls/msimg32/Wine-20050830/ Added: vendor/wine/dlls/objsel/Wine-20050830/ Deleted: vendor/wine/dlls/ole32/Wine-20050725/ Added: vendor/wine/dlls/ole32/Wine-20050830/ Deleted: vendor/wine/dlls/oleaut32/Wine-20050725/ Added: vendor/wine/dlls/oleaut32/Wine-20050830/ Deleted: vendor/wine/dlls/oledlg/Wine-20050725/ Added: vendor/wine/dlls/oledlg/Wine-20050830/ Deleted: vendor/wine/dlls/olepro32/Wine-20050725/ Added: vendor/wine/dlls/olepro32/Wine-20050830/ Deleted: vendor/wine/dlls/riched20/Wine-20050725/ Added: vendor/wine/dlls/riched20/Wine-20050830/ Deleted: vendor/wine/dlls/richedit/Wine-20050725/ Added: vendor/wine/dlls/richedit/Wine-20050830/ Deleted: vendor/wine/dlls/rpcrt4/Wine-20050725/ Added: vendor/wine/dlls/rpcrt4/Wine-20050830/ Deleted: vendor/wine/dlls/shdocvw/Wine-20050725/ Added: vendor/wine/dlls/shdocvw/Wine-20050830/ Deleted: vendor/wine/dlls/shell32/Wine-20050725/ Added: vendor/wine/dlls/shell32/Wine-20050830/ Deleted: vendor/wine/dlls/shlwapi/Wine-20050725/ Added: vendor/wine/dlls/shlwapi/Wine-20050830/ Deleted: vendor/wine/dlls/urlmon/Wine-20050725/ Added: vendor/wine/dlls/urlmon/Wine-20050830/ Deleted: vendor/wine/dlls/uxtheme/Wine-20050725/ Added: vendor/wine/dlls/uxtheme/Wine-20050830/ Deleted: vendor/wine/libs/unicode/Wine-20050725/ Added: vendor/wine/libs/unicode/Wine-20050830/ Deleted: vendor/wine/libs/wpp/Wine-20050725/ Added: vendor/wine/libs/wpp/Wine-20050830/ Deleted: vendor/wine/programs/msiexec/Wine-20050725/ Added: vendor/wine/programs/msiexec/Wine-20050830/ Deleted: vendor/wine/tools/winebuild/Wine-20050725/ Added: vendor/wine/tools/winebuild/Wine-20050830/ Deleted: vendor/wine/tools/wrc/Wine-20050725/ Added: vendor/wine/tools/wrc/Wine-20050830/ _____ Copied: vendor/wine/dlls/cabinet/Wine-20050830 (from rev 17721, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-20050830 (from rev 17721, vendor/wine/dlls/comctl32/current) _____ Copied: vendor/wine/dlls/commdlg/Wine-20050830 (from rev 17721, vendor/wine/dlls/commdlg/current) _____ Copied: vendor/wine/dlls/dinput8/Wine-20050830 (from rev 17721, vendor/wine/dlls/dinput8/current) _____ Copied: vendor/wine/dlls/dsound/Wine-20050830 (from rev 17721, vendor/wine/dlls/dsound/current) _____ Copied: vendor/wine/dlls/icmp/Wine-20050830 (from rev 17721, vendor/wine/dlls/icmp/current) _____ Copied: vendor/wine/dlls/midimap/Wine-20050830 (from rev 17721, vendor/wine/dlls/midimap/current) _____ Copied: vendor/wine/dlls/mpr/Wine-20050830 (from rev 17721, vendor/wine/dlls/mpr/current) _____ Copied: vendor/wine/dlls/msi/Wine-20050830 (from rev 17721, vendor/wine/dlls/msi/current) _____ Copied: vendor/wine/dlls/msimg32/Wine-20050830 (from rev 17721, vendor/wine/dlls/msimg32/current) _____ Copied: vendor/wine/dlls/objsel/Wine-20050830 (from rev 17721, vendor/wine/dlls/objsel/current) _____ Copied: vendor/wine/dlls/ole32/Wine-20050830 (from rev 17721, vendor/wine/dlls/ole32/current) _____ Copied: vendor/wine/dlls/oleaut32/Wine-20050830 (from rev 17721, vendor/wine/dlls/oleaut32/current) _____ Copied: vendor/wine/dlls/oledlg/Wine-20050830 (from rev 17721, vendor/wine/dlls/oledlg/current) _____ Copied: vendor/wine/dlls/olepro32/Wine-20050830 (from rev 17721, vendor/wine/dlls/olepro32/current) _____ Copied: vendor/wine/dlls/riched20/Wine-20050830 (from rev 17721, vendor/wine/dlls/riched20/current) _____ Copied: vendor/wine/dlls/richedit/Wine-20050830 (from rev 17721, vendor/wine/dlls/richedit/current) _____ Copied: vendor/wine/dlls/rpcrt4/Wine-20050830 (from rev 17721, vendor/wine/dlls/rpcrt4/current) _____ Copied: vendor/wine/dlls/shdocvw/Wine-20050830 (from rev 17721, vendor/wine/dlls/shdocvw/current) _____ Copied: vendor/wine/dlls/shell32/Wine-20050830 (from rev 17721, vendor/wine/dlls/shell32/current) _____ Copied: vendor/wine/dlls/shlwapi/Wine-20050830 (from rev 17721, vendor/wine/dlls/shlwapi/current) _____ Copied: vendor/wine/dlls/urlmon/Wine-20050830 (from rev 17721, vendor/wine/dlls/urlmon/current) _____ Copied: vendor/wine/dlls/uxtheme/Wine-20050830 (from rev 17721, vendor/wine/dlls/uxtheme/current) _____ Copied: vendor/wine/libs/unicode/Wine-20050830 (from rev 17721, vendor/wine/libs/unicode/current) _____ Copied: vendor/wine/libs/wpp/Wine-20050830 (from rev 17721, vendor/wine/libs/wpp/current) _____ Copied: vendor/wine/programs/msiexec/Wine-20050830 (from rev 17721, vendor/wine/programs/msiexec/current) _____ Copied: vendor/wine/tools/winebuild/Wine-20050830 (from rev 17721, vendor/wine/tools/winebuild/current) _____ Copied: vendor/wine/tools/wrc/Wine-20050830 (from rev 17721, vendor/wine/tools/wrc/current)

19 years

← Newer
1
...
43
44
45
46
47
48
49
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005