Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[ros-arm-bringup] 34658: - Easy there cowboy, just because you can write good code doesn't mean you shouldn't even try building it. - Fix x86 build failure, good thing everyone is probably asleep.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Tue Jul 22 01:04:06 2008 New Revision: 34658 URL: http://svn.reactos.org/svn/reactos?rev=34658&view=rev Log: - Easy there cowboy, just because you can write good code doesn't mean you shouldn't even try building it. - Fix x86 build failure, good thing everyone is probably asleep. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Tue Jul 22 01:04:06 2008 @@ -1196,7 +1196,11 @@ { Prcb = KiProcessorBlock[i]; Pcr = CONTAINING_RECORD(Prcb, KPCR, Prcb); +#ifdef _M_ARM // This code should probably be done differently sii->ContextSwitches = Pcr->ContextSwitches; +#else + sii->ContextSwitches = ((PKIPCR)Pcr)->ContextSwitches; +#endif sii->DpcCount = Prcb->DpcData[0].DpcCount; sii->DpcRate = Prcb->DpcRequestRate; sii->TimeIncrement = ti;

16 years, 5 months

[ros-arm-bringup] 34657: - Um, yeah, the "DiskType" is CLEARLY not an NT FILE_DEVICE_ constant... this makes no sense at all. - Defined some proper constants (somewhat based on guesses, but should be mostly correct) for the DiskType. - Now the code actually makes sense, instead of talking about CD-ROM File Systems and CD-ROMs everywhere (and Controllers and...floppies?!)

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Tue Jul 22 00:49:52 2008 New Revision: 34657 URL: http://svn.reactos.org/svn/reactos?rev=34657&view=rev Log: - Um, yeah, the "DiskType" is CLEARLY not an NT FILE_DEVICE_ constant... this makes no sense at all. - Defined some proper constants (somewhat based on guesses, but should be mostly correct) for the DiskType. - Now the code actually makes sense, instead of talking about CD-ROM File Systems and CD-ROMs everywhere (and Controllers and...floppies?!) Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/include/reactos/drivers/ntddrdsk.h trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Tue Jul 22 00:49:52 2008 @@ -311,15 +311,15 @@ LARGE_INTEGER CurrentOffset; // - // Check if we're a CDROM-type RAM disk + // Check if we're a boot RAM disk // DiskType = Input->DiskType; - if (DiskType > FILE_DEVICE_CD_ROM) + if (DiskType >= RAMDISK_BOOT_DISK) { // // Check if we're an ISO // - if (DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) + if (DiskType == RAMDISK_BOOT_DISK) { // // NTLDR mounted us somewhere @@ -340,10 +340,15 @@ else { // - // The only other possibility is a controller + // The only other possibility is a WIM disk // - if (DiskType != FILE_DEVICE_CONTROLLER) + if (DiskType != RAMDISK_WIM_DISK) + { + // + // Fail + // return STATUS_INVALID_PARAMETER; + } // // Read the view count instead @@ -471,7 +476,7 @@ // // It this an ISO boot ramdisk? // - if (Input->DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) + if (Input->DiskType == RAMDISK_BOOT_DISK) { // // Does it need a drive letter? @@ -536,10 +541,10 @@ GuidString.Buffer = NULL; // - // Check if this is an ISO boot, or a registry ram drive + // Check if this is an boot disk, or a registry ram drive // if (!(Input->Options.ExportAsCd) && - (Input->DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM)) + (Input->DiskType == RAMDISK_BOOT_DISK)) { // // Not an ISO boot, but it's a boot FS -- map it to figure out the @@ -684,12 +689,12 @@ // Validate the disk type // DiskType = Input->DiskType; - if (DiskType == FILE_DEVICE_CONTROLLER) return STATUS_INVALID_PARAMETER; + if (DiskType == RAMDISK_WIM_DISK) return STATUS_INVALID_PARAMETER; // // Look at the disk type // - if (DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) + if (DiskType == RAMDISK_BOOT_DISK) { // // We only allow this as an early-init boot @@ -706,19 +711,18 @@ // // Validate the disk type // - if ((Input->Options.ExportAsCd) && - (DiskType != FILE_DEVICE_CD_ROM_FILE_SYSTEM)) + if ((Input->Options.ExportAsCd) && (DiskType != RAMDISK_BOOT_DISK)) { // // If the type isn't CDFS, it has to at least be raw CD // - if (DiskType != FILE_DEVICE_CD_ROM) return STATUS_INVALID_PARAMETER; + if (DiskType != RAMDISK_MEMORY_MAPPED_DISK) return STATUS_INVALID_PARAMETER; } // // Check if this is an actual file // - if (DiskType <= FILE_DEVICE_CD_ROM) + if (DiskType <= RAMDISK_MEMORY_MAPPED_DISK) { // // Validate the file name @@ -1134,7 +1138,7 @@ // // See if we want to do this sync or async // - if (DeviceExtension->DiskType > FILE_DEVICE_CD_ROM) + if (DeviceExtension->DiskType > RAMDISK_MEMORY_MAPPED_DISK) { // // Do it sync Modified: trunk/reactos/include/reactos/drivers/ntddrdsk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/nt… ============================================================================== --- trunk/reactos/include/reactos/drivers/ntddrdsk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/ntddrdsk.h [iso-8859-1] Tue Jul 22 00:49:52 2008 @@ -36,6 +36,14 @@ #define IOCTL_RAMDISK_BASE FILE_DEVICE_VIRTUAL_DISK #define FSCTL_CREATE_RAM_DISK CTL_CODE(FILE_DEVICE_VIRTUAL_DISK, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS) +// +// Disk Types +// +#define RAMDISK_REGISTRY_DISK 1 // Loaded from the registry +#define RAMDISK_MEMORY_MAPPED_DISK 2 // Loaded from the registry +#define RAMDISK_BOOT_DISK 3 // Used as a boot device +#define RAMDISK_WIM_DISK 4 // Used as an installation device + // // Options when creating a ramdisk // Modified: trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/ramdisk.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c [iso-8859-1] Tue Jul 22 00:49:52 2008 @@ -83,7 +83,7 @@ // RtlZeroMemory(&RamdiskCreate, sizeof(RamdiskCreate)); RamdiskCreate.Version = sizeof(RamdiskCreate); - RamdiskCreate.DiskType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; + RamdiskCreate.DiskType = RAMDISK_BOOT_DISK; RamdiskCreate.BasePage = MemoryDescriptor->BasePage; RamdiskCreate.DiskOffset = 0; RamdiskCreate.DiskLength = MemoryDescriptor->PageCount << PAGE_SHIFT;

16 years, 5 months

[ros-arm-bringup] 34656: - Not only did r34637 break the ARM build, it also doesn't make sense on x86 (or other) builds, because it assumes invalid data layout. For example, on x64 builds, the code would read random data. - In the future, please refer to other code which loops the current processors and gets their KPRCB before attempting a half-assed implementation. KiProcessorBlock should be used.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Tue Jul 22 00:37:01 2008 New Revision: 34656 URL: http://svn.reactos.org/svn/reactos?rev=34656&view=rev Log: - Not only did r34637 break the ARM build, it also doesn't make sense on x86 (or other) builds, because it assumes invalid data layout. For example, on x64 builds, the code would read random data. - In the future, please refer to other code which loops the current processors and gets their KPRCB before attempting a half-assed implementation. KiProcessorBlock should be used. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Tue Jul 22 00:37:01 2008 @@ -1180,7 +1180,7 @@ QSI_DEF(SystemInterruptInformation) { PKPRCB Prcb; - PKIPCR Pcr; + PKPCR Pcr; LONG i; ULONG ti; PSYSTEM_INTERRUPT_INFORMATION sii = (PSYSTEM_INTERRUPT_INFORMATION)Buffer; @@ -1192,10 +1192,10 @@ ti = KeQueryTimeIncrement(); - Prcb = KeGetPcr()->Prcb; for (i = 0; i < KeNumberProcessors; i++) { - Pcr = CONTAINING_RECORD(Prcb, KIPCR, Prcb); + Prcb = KiProcessorBlock[i]; + Pcr = CONTAINING_RECORD(Prcb, KPCR, Prcb); sii->ContextSwitches = Pcr->ContextSwitches; sii->DpcCount = Prcb->DpcData[0].DpcCount; sii->DpcRate = Prcb->DpcRequestRate; @@ -1203,7 +1203,6 @@ sii->DpcBypassCount = 0; sii->ApcBypassCount = 0; sii++; - Prcb = (PKPRCB)((ULONG_PTR)Prcb + PAGE_SIZE); } return STATUS_SUCCESS;

16 years, 5 months

[ros-arm-bringup] 34655: - Build vfatfs instead of CDFS. - Load vfatfs instead of CDFS. - Implement code in the ramdisk driver to handle both ISO and FAT ramdisks. Don't know what the big deal with support ISO ramdisks was supposed to be, when our ramdisk is FAT, and dealing with FAT is a lot easier than CDFS (no TOC emulation and other rubbish that was added).

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Tue Jul 22 00:31:24 2008 New Revision: 34655 URL: http://svn.reactos.org/svn/reactos?rev=34655&view=rev Log: - Build vfatfs instead of CDFS. - Load vfatfs instead of CDFS. - Implement code in the ramdisk driver to handle both ISO and FAT ramdisks. Don't know what the big deal with support ISO ramdisks was supposed to be, when our ramdisk is FAT, and dealing with FAT is a lot easier than CDFS (no TOC emulation and other rubbish that was added). Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=346… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Tue Jul 22 00:31:24 2008 @@ -153,8 +153,8 @@ </directory> </directory> <directory name="filesystems"> - <directory name="cdfs"> - <xi:include href="drivers/filesystems/cdfs/cdfs.rbuild" /> + <directory name="fastfat"> + <xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" /> </directory> </directory> <directory name="base"> Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Tue Jul 22 00:31:24 2008 @@ -762,12 +762,12 @@ ; PNP Root device HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,"" -; Cdfs (ISO96660) filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 +; Virtual FAT filesystem driver +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ImagePath",0x00020000,"system32\drivers\fastfat.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Type",0x00010001,0x00000002 ; RAM Disk class driver HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ErrorControl",0x00010001,0x00000000 Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Tue Jul 22 00:31:24 2008 @@ -23,6 +23,7 @@ #include <rtlfuncs.h> #include <arc/arc.h> #include <reactos/drivers/ntddrdsk.h> +#include "../../../filesystems/fs_rec/fs_rec.h" #include <stdio.h> #define NDEBUG #include <debug.h> @@ -265,6 +266,31 @@ } } +PVOID +NTAPI +RamdiskMapPages(IN PRAMDISK_DRIVE_EXTENSION DeviceExtension, + IN LARGE_INTEGER Offset, + IN ULONG Length, + OUT PULONG OutputLength) +{ + DPRINT1("Mapping %lx bytes at %I64x\n", Length, Offset.QuadPart); + UNIMPLEMENTED; + while (TRUE); + return NULL; +} + +PVOID +NTAPI +RamdiskUnmapPages(IN PRAMDISK_DRIVE_EXTENSION DeviceExtension, + IN PVOID BaseAddress, + IN LARGE_INTEGER Offset, + IN ULONG Length) +{ + UNIMPLEMENTED; + while (TRUE); + return NULL; +} + NTSTATUS NTAPI RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension, @@ -279,6 +305,10 @@ PVOID Buffer; WCHAR LocalBuffer[16]; UNICODE_STRING SymbolicLinkName, DriveString, GuidString, DeviceName; + PPACKED_BIOS_PARAMETER_BLOCK Parameters; + ULONG BytesPerSector, SectorsPerTrack, Heads, BytesRead; + PVOID BaseAddress; + LARGE_INTEGER CurrentOffset; // // Check if we're a CDROM-type RAM disk @@ -380,7 +410,8 @@ Status = IoCreateDevice(DeviceExtension->DeviceObject->DriverObject, sizeof(RAMDISK_DRIVE_EXTENSION), &DeviceName, - FILE_DEVICE_CD_ROM, + (Input->Options.ExportAsCd) ? + FILE_DEVICE_CD_ROM : FILE_DEVICE_DISK, 0, 0, &DeviceObject); @@ -505,18 +536,86 @@ GuidString.Buffer = NULL; // - // Only support ISO stuff for now - // - ASSERT(Input->Options.ExportAsCd == TRUE); - ASSERT(Input->DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM); - - // - // Setup partition parameters - // - DriveExtension->BytesPerSector = 2048; // 512 for Disk - DriveExtension->SectorsPerTrack = 32; // 128 for disk - DriveExtension->NumberOfHeads = 64; // 16 for disk - + // Check if this is an ISO boot, or a registry ram drive + // + if (!(Input->Options.ExportAsCd) && + (Input->DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM)) + { + // + // Not an ISO boot, but it's a boot FS -- map it to figure out the + // drive settings + // + CurrentOffset.QuadPart = 0; + BaseAddress = RamdiskMapPages(DriveExtension, + CurrentOffset, + PAGE_SIZE, + &BytesRead); + if (BaseAddress) + { + // + // Get the data + // + Parameters = (PPACKED_BIOS_PARAMETER_BLOCK)BaseAddress; + BytesPerSector = Parameters->BytesPerSector[0]; + SectorsPerTrack = Parameters->SectorsPerTrack[0]; + Heads = Parameters->Heads[0]; + + // + // Save it + // + DriveExtension->BytesPerSector = BytesPerSector; + DriveExtension->SectorsPerTrack = SectorsPerTrack; + DriveExtension->NumberOfHeads = Heads; + + // + // Unmap now + // + CurrentOffset.QuadPart = 0; + RamdiskUnmapPages(DriveExtension, + BaseAddress, + CurrentOffset, + BytesRead); + } + else + { + // + // Fail + // + Status = STATUS_INSUFFICIENT_RESOURCES; + goto FailCreate; + } + } + + // + // Check if the drive settings haven't been set yet + // + if ((DriveExtension->BytesPerSector == 0) || + (DriveExtension->SectorsPerTrack == 0) || + (DriveExtension->NumberOfHeads == 0)) + { + // + // Check if this is a CD + // + if (Input->Options.ExportAsCd) + { + // + // Setup partition parameters default for ISO 9660 + // + DriveExtension->BytesPerSector = 2048; + DriveExtension->SectorsPerTrack = 32; + DriveExtension->NumberOfHeads = 64; + } + else + { + // + // Setup partition parameters default for FAT + // + DriveExtension->BytesPerSector = 512; + DriveExtension->SectorsPerTrack = 128; + DriveExtension->NumberOfHeads = 16; + } + } + // // Acquire the disk lock // @@ -832,31 +931,6 @@ } } -PVOID -NTAPI -RamdiskMapPages(IN PRAMDISK_DRIVE_EXTENSION DeviceExtension, - IN LARGE_INTEGER Offset, - IN ULONG Length, - OUT PULONG OutputLength) -{ - DPRINT1("Mapping %lx bytes at %I64x\n", Length, Offset.QuadPart); - UNIMPLEMENTED; - while (TRUE); - return NULL; -} - -PVOID -NTAPI -RamdiskUnmapPages(IN PRAMDISK_DRIVE_EXTENSION DeviceExtension, - IN PVOID BaseAddress, - IN LARGE_INTEGER Offset, - IN ULONG Length) -{ - UNIMPLEMENTED; - while (TRUE); - return NULL; -} - NTSTATUS NTAPI RamdiskReadWriteReal(IN PIRP Irp,

16 years, 5 months

[ros-arm-bringup] 34654: - Forgot to commit this with the last update -- this adds the PreviousTrapFrame member to the ARM _KTRAP_FRAME structure.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Tue Jul 22 00:28:14 2008 New Revision: 34654 URL: http://svn.reactos.org/svn/reactos?rev=34654&view=rev Log: - Forgot to commit this with the last update -- this adds the PreviousTrapFrame member to the ARM _KTRAP_FRAME structure. Modified: trunk/reactos/include/ndk/arm/ketypes.h Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Tue Jul 22 00:28:14 2008 @@ -81,6 +81,7 @@ ULONG Spsr; ULONG OldIrql; ULONG PreviousMode; + ULONG PreviousTrapFrame; } KTRAP_FRAME, *PKTRAP_FRAME; #ifndef NTOS_MODE_USER

16 years, 5 months

[jimtabor] 34653: - Rewrite HOOKs, Implement CallNextHookEx and fix prototype for NtUserCallNextHookEx. Move hook structure to ntuser.h for user verifying. - Tested with FF, Seamonkey, Abiword, and the rest of our applications.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jul 21 23:54:53 2008 New Revision: 34653 URL: http://svn.reactos.org/svn/reactos?rev=34653&view=rev Log: - Rewrite HOOKs, Implement CallNextHookEx and fix prototype for NtUserCallNextHookEx. Move hook structure to ntuser.h for user verifying. - Tested with FF, Seamonkey, Abiword, and the rest of our applications. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/hook.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Mon Jul 21 23:54:53 2008 @@ -193,8 +193,65 @@ WPARAM wParam, LPARAM lParam) { - return NtUserCallNextHookEx(Hook, Code, wParam, lParam); -} + PW32CLIENTINFO ClientInfo; + PHOOK pHook; + DWORD Flags, Save; + LRESULT lResult = 0; + + GetConnected(); + + ClientInfo = GetWin32ClientInfo(); + + pHook = ValidateHandle(Hook, VALIDATE_TYPE_HOOK); + + if (!pHook) return 0; + + ClientInfo->phkCurrent = (PHOOK)pHook->Self; // Pass this over to the kernel. + + if (pHook->HookId == WH_CALLWNDPROC || pHook->HookId == WH_CALLWNDPROCRET) + { + Save = ClientInfo->dwHookData; + Flags = ClientInfo->CI_flags & CI_CURTHPRHOOK; +// wParam: If the message was sent by the current thread/process, it is +// nonzero; otherwise, it is zero. + if (wParam) ClientInfo->CI_flags |= CI_CURTHPRHOOK; + else ClientInfo->CI_flags &= ~CI_CURTHPRHOOK; + + if (pHook->HookId == WH_CALLWNDPROC) + { + PCWPSTRUCT pCWP = (PCWPSTRUCT)lParam; + + lResult = NtUserMessageCall( pCWP->hwnd, + pCWP->message, + pCWP->wParam, + pCWP->lParam, + 0, + FNID_CALLWNDPROC, + pHook->Ansi); + } + else + { + PCWPRETSTRUCT pCWPR = (PCWPRETSTRUCT)lParam; + + ClientInfo->dwHookData = pCWPR->lResult; + + lResult = NtUserMessageCall( pCWPR->hwnd, + pCWPR->message, + pCWPR->wParam, + pCWPR->lParam, + 0, + FNID_CALLWNDPROCRET, + pHook->Ansi); + } + ClientInfo->CI_flags ^= ((ClientInfo->CI_flags ^ Flags) & CI_CURTHPRHOOK); + ClientInfo->dwHookData = Save; + } + else + lResult = NtUserCallNextHookEx(Code, wParam, lParam, pHook->Ansi); + + return lResult; +} + /* * @unimplemented @@ -366,6 +423,7 @@ LPARAM lParam; PKBDLLHOOKSTRUCT KeyboardLlData; PMSLLHOOKSTRUCT MouseLlData; + PMSG Msg; Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; @@ -446,6 +504,13 @@ MouseLlData = (PMSLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) MouseLlData); break; + case WH_MSGFILTER: + case WH_SYSMSGFILTER: + case WH_GETMESSAGE: + Msg = (PMSG)((PCHAR) Common + Common->lParam); + FIXME("UHOOK Memory: %x: %x\n",Common, Msg); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) Msg); + break; default: return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Jul 21 23:54:53 2008 @@ -317,12 +317,28 @@ } W32THREADINFO, *PW32THREADINFO; /* Window Client Information structure */ +struct _ETHREAD; + + +typedef struct tagHOOK +{ + LIST_ENTRY Chain; /* Hook chain entry */ + HHOOK Self; /* user handle for this hook */ + struct _ETHREAD* Thread; /* Thread owning the hook */ + int HookId; /* Hook table index */ + HOOKPROC Proc; /* Hook function */ + BOOLEAN Ansi; /* Is it an Ansi hook? */ + ULONG Flags; /* Some internal flags */ + UNICODE_STRING ModuleName; /* Module name for global hooks */ +} HOOK, *PHOOK; typedef struct _CALLBACKWND { HWND hWnd; PVOID pvWnd; } CALLBACKWND, *PCALLBACKWND; + +#define CI_CURTHPRHOOK 0x00000010 typedef struct _W32CLIENTINFO { @@ -334,7 +350,7 @@ DWORD dwTIFlags; PVOID pDeskInfo; ULONG_PTR ulClientDelta; - PVOID phkCurrent; + PHOOK phkCurrent; ULONG fsHooks; HWND hWND; // Will be replaced with CALLBACKWND. PVOID pvWND; // " " @@ -848,10 +864,10 @@ LRESULT NTAPI NtUserCallNextHookEx( - HHOOK Hook, int Code, WPARAM wParam, - LPARAM lParam); + LPARAM lParam, + BOOL Ansi); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] Mon Jul 21 23:54:53 2008 @@ -2,7 +2,7 @@ #define _WIN32K_HOOK_H #define HOOK_THREAD_REFERENCED (0x1) - +#if 0 typedef struct tagHOOK { LIST_ENTRY Chain; /* Hook chain entry */ @@ -14,8 +14,11 @@ ULONG Flags; /* Some internal flags */ UNICODE_STRING ModuleName; /* Module name for global hooks */ } HOOK, *PHOOK; - +#endif #define NB_HOOKS (WH_MAXHOOK-WH_MINHOOK+1) +#define HOOKID_TO_INDEX(HookId) (HookId - WH_MINHOOK) +#define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) +#define ISITHOOKED(HookId) (PsGetCurrentThreadWin32Thread()->Hooks & HOOKID_TO_FLAG(HookId)) typedef struct tagHOOKTABLE { @@ -46,6 +49,7 @@ LRESULT FASTCALL co_EVENT_CallEvents(DWORD, HWND, LONG, LONG); VOID FASTCALL HOOK_DestroyThreadHooks(PETHREAD Thread); PHOOK FASTCALL IntGetHookObject(HHOOK); +LRESULT FASTCALL UserCallNextHookEx( int HookId, int Code, WPARAM wParam, LPARAM lParam, BOOL Ansi); #endif /* _WIN32K_HOOK_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Mon Jul 21 23:54:53 2008 @@ -165,7 +165,7 @@ IntShowOwnedPopups( PWINDOW_OBJECT owner, BOOL fShow ); LRESULT FASTCALL -IntDefWindowProc( PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam); +IntDefWindowProc( PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL Ansi); #endif /* _WIN32K_WINDOW_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Jul 21 23:54:53 2008 @@ -379,6 +379,13 @@ case WH_MOUSE_LL: ArgumentLength += sizeof(MSLLHOOKSTRUCT); break; + case WH_MSGFILTER: + case WH_SYSMSGFILTER: + case WH_GETMESSAGE: + ArgumentLength += sizeof(MSG); + break; +// case WH_SHELL: +// break; default: DPRINT1("Trying to call unsupported window hook %d\n", HookId); return 0; @@ -437,6 +444,16 @@ RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MSLLHOOKSTRUCT)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); break; + case WH_MSGFILTER: + case WH_SYSMSGFILTER: + case WH_GETMESSAGE: + RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MSG)); + Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + DPRINT1("KHOOK Memory: %x\n",Common); + break; +// case WH_SHELL: +// Extra = lParam; +// break; } ResultPointer = NULL; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Mon Jul 21 23:54:53 2008 @@ -4,8 +4,7 @@ * PURPOSE: Misc User funcs * FILE: subsystem/win32/win32k/ntuser/defwnd.c * PROGRAMER: - * REVISION HISTORY: - * 2003/05/22 Created + * */ #include <w32k.h> @@ -22,7 +21,8 @@ PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, - LPARAM lParam) + LPARAM lParam, + BOOL Ansi) { PWINDOW Wnd; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Jul 21 23:54:53 2008 @@ -15,9 +15,6 @@ #define NDEBUG #include <debug.h> -#define HOOKID_TO_INDEX(HookId) (HookId - WH_MINHOOK) -#define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) - static PHOOKTABLE GlobalHooks; @@ -107,11 +104,14 @@ Hook->Thread = Thread; Hook->HookId = HookId; - W32Thread = ((PW32THREAD)Thread->Tcb.Win32Thread); - ASSERT(W32Thread != NULL); - W32Thread->Hooks |= HOOKID_TO_FLAG(HookId); - if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; + if (Thread) + { + W32Thread = ((PW32THREAD)Thread->Tcb.Win32Thread); + ASSERT(W32Thread != NULL); + W32Thread->Hooks |= HOOKID_TO_FLAG(HookId); + if (W32Thread->ThreadInfo != NULL) + W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; + } RtlInitUnicodeString(&Hook->ModuleName, NULL); @@ -318,7 +318,7 @@ return IntCallLowLevelHook(HookId, Code, wParam, lParam, Hook); } - if (Hook->Thread != PsGetCurrentThread()) + if ((Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL)) { DPRINT1("Calling hooks in other threads not implemented yet"); return 0; @@ -394,22 +394,350 @@ break; } } - - ObDereferenceObject(WinStaObj); - } + } +} + +LRESULT +FASTCALL +IntCallDebugHook( + int Code, + WPARAM wParam, + LPARAM lParam) +{ + UNIMPLEMENTED + return 0; +} + +LRESULT +FASTCALL +UserCallNextHookEx( + int HookId, + int Code, + WPARAM wParam, + LPARAM lParam, + BOOL Ansi) +{ + LRESULT lResult = 0; + BOOL BadChk = FALSE; + +// Handle this one first. + if ((HookId == WH_MOUSE) || (HookId == WH_CBT && Code == HCBT_CLICKSKIPPED)) + { + MOUSEHOOKSTRUCTEX Mouse; + if (lParam) + { + _SEH_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(MOUSEHOOKSTRUCTEX), + 1); + RtlCopyMemory( &Mouse, + (PVOID)lParam, + sizeof(MOUSEHOOKSTRUCTEX)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) + { + DPRINT1("HOOK WH_MOUSE read from lParam ERROR!\n"); + } + } + if (!BadChk) + { + lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&Mouse); + } + return lResult; + } + + switch(HookId) + { + case WH_MOUSE_LL: + { + MSLLHOOKSTRUCT Mouse; + if (lParam) + { + _SEH_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(MSLLHOOKSTRUCT), + 1); + RtlCopyMemory( &Mouse, + (PVOID)lParam, + sizeof(MSLLHOOKSTRUCT)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) + { + DPRINT1("HOOK WH_MOUSE_LL read from lParam ERROR!\n"); + } + } + if (!BadChk) + { + lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&Mouse); + } + break; + } + + case WH_KEYBOARD_LL: + { + KBDLLHOOKSTRUCT Keyboard; + if (lParam) + { + _SEH_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(KBDLLHOOKSTRUCT), + 1); + RtlCopyMemory( &Keyboard, + (PVOID)lParam, + sizeof(KBDLLHOOKSTRUCT)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) + { + DPRINT1("HOOK WH_KEYBORD_LL read from lParam ERROR!\n"); + } + } + if (!BadChk) + { + lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&Keyboard); + } + break; + } + + + case WH_MSGFILTER: + case WH_SYSMSGFILTER: + case WH_GETMESSAGE: + { + MSG Msg; + if (lParam) + { + _SEH_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(MSG), + 1); + RtlCopyMemory( &Msg, + (PVOID)lParam, + sizeof(MSG)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) + { + DPRINT1("HOOK WH_XMESSAGEX read from lParam ERROR!\n"); + } + } + if (!BadChk) + { + lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&Msg); + if (lParam && (HookId == WH_GETMESSAGE)) + { + _SEH_TRY + { + ProbeForWrite((PVOID)lParam, + sizeof(MSG), + 1); + RtlCopyMemory((PVOID)lParam, + &Msg, + sizeof(MSG)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) + { + DPRINT1("HOOK WH_GETMESSAGE write to lParam ERROR!\n"); + } + } + } + break; + } + + case WH_CBT: + switch (Code) + { + case HCBT_CREATEWND: + lResult = co_HOOK_CallHooks(HookId, Code, wParam, lParam); + break; + + case HCBT_MOVESIZE: + { + RECT rt; + + if (lParam) + { + _SEH_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(RECT), + 1); + RtlCopyMemory( &rt, + (PVOID)lParam, + sizeof(RECT)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) + { + DPRINT1("HOOK HCBT_MOVESIZE read from lParam ERROR!\n"); + } + } + if (!BadChk) + { + lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&rt); + } + break; + } + + case HCBT_ACTIVATE: + { + CBTACTIVATESTRUCT CbAs; + + if (lParam) + { + _SEH_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(CBTACTIVATESTRUCT), + 1); + RtlCopyMemory( &CbAs, + (PVOID)lParam, + sizeof(CBTACTIVATESTRUCT)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) + { + DPRINT1("HOOK HCBT_ACTIVATE read from lParam ERROR!\n"); + } + } + if (!BadChk) + { + lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)&CbAs); + } + break; + } + /* + The rest just use default. + */ + default: + lResult = co_HOOK_CallHooks(HookId, Code, wParam, lParam); + break; + } + break; + + + case WH_JOURNALPLAYBACK: + case WH_JOURNALRECORD: + { + EVENTMSG EventMsg; + if (lParam) + { + _SEH_TRY + { + ProbeForRead((PVOID)lParam, + sizeof(EVENTMSG), + 1); + RtlCopyMemory( &EventMsg, + (PVOID)lParam, + sizeof(EVENTMSG)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) + { + DPRINT1("HOOK WH_JOURNAL read from lParam ERROR!\n"); + } + } + if (!BadChk) + { + lResult = co_HOOK_CallHooks(HookId, Code, wParam, (LPARAM)(lParam ? &EventMsg : NULL)); + if (lParam) + { + _SEH_TRY + { + ProbeForWrite((PVOID)lParam, + sizeof(EVENTMSG), + 1); + RtlCopyMemory((PVOID)lParam, + &EventMsg, + sizeof(EVENTMSG)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) + { + DPRINT1("HOOK WH_JOURNAL write to lParam ERROR!\n"); + } + } + } + break; + } + + case WH_DEBUG: + lResult = IntCallDebugHook( Code, wParam, lParam); + break; +/* + Default the rest like, WH_FOREGROUNDIDLE, WH_KEYBOARD and WH_SHELL. + */ + case WH_FOREGROUNDIDLE: + case WH_KEYBOARD: + case WH_SHELL: + lResult = co_HOOK_CallHooks(HookId, Code, wParam, lParam); + break; + + default: + DPRINT1("Unsupported HOOK Id -> %d\n",HookId); + break; + } + return lResult; } LRESULT STDCALL NtUserCallNextHookEx( - HHOOK Hook, int Code, WPARAM wParam, - LPARAM lParam) -{ + LPARAM lParam, + BOOL Ansi) +{ + HHOOK Hook; PHOOK HookObj, NextObj; + PW32CLIENTINFO ClientInfo; PWINSTATION_OBJECT WinStaObj; NTSTATUS Status; + LRESULT lResult; + INT HookId; DECLARE_RETURN(LRESULT); DPRINT("Enter NtUserCallNextHookEx\n"); @@ -420,22 +748,17 @@ 0, &WinStaObj); - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( FALSE); - } - - //Status = UserReferenceObjectByHandle(gHandleTable, Hook, - // otHookProc, (PVOID *) &HookObj); + RETURN( 0); + } + ObDereferenceObject(WinStaObj); - // if (! NT_SUCCESS(Status)) - // { - // DPRINT1("Invalid handle passed to NtUserCallNextHookEx\n"); - // SetLastNtError(Status); - // RETURN( 0); - // } + ClientInfo = GetWin32ClientInfo(); + + Hook = (HHOOK)ClientInfo->phkCurrent; if (!(HookObj = IntGetHookObject(Hook))) { @@ -443,6 +766,9 @@ } ASSERT(Hook == HookObj->Self); + + HookId = HookObj->HookId; + Ansi = HookObj->Ansi; if (NULL != HookObj->Thread && (HookObj->Thread != PsGetCurrentThread())) { @@ -451,15 +777,15 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); RETURN( 0); } - + NextObj = IntGetNextHook(HookObj); UserDereferenceObject(HookObj); if (NULL != NextObj) { - DPRINT1("Calling next hook not implemented\n"); - UNIMPLEMENTED - SetLastWin32Error(ERROR_NOT_SUPPORTED); - RETURN( 0); + lResult = UserCallNextHookEx( HookId, Code, wParam, lParam, Ansi); + + if (lResult == 0) RETURN( 0); + RETURN( (LRESULT)NextObj); } RETURN( 0); @@ -570,7 +896,7 @@ /* We only (partially) support local WH_CBT hooks and * WH_KEYBOARD_LL/WH_MOUSE_LL hooks for now */ if ((WH_CBT != HookId || Global) - && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId) // && WH_GETMESSAGE != HookId) + && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId && WH_GETMESSAGE != HookId) { #if 0 /* Removed to get winEmbed working again */ UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Jul 21 23:54:53 2008 @@ -694,7 +694,7 @@ { ThreadQueue->QuitPosted = FALSE; } - return TRUE; + goto MsgExit; } /* Now check for normal messages. */ @@ -741,7 +741,7 @@ if (IntGetPaintMessage(hWnd, MsgFilterMin, MsgFilterMax, PsGetCurrentThreadWin32Thread(), &Msg->Msg, RemoveMessages)) { Msg->FreeLParam = FALSE; - return TRUE; + goto MsgExit; } /* Check for WM_(SYS)TIMER messages */ @@ -802,7 +802,7 @@ // UserDereferenceObject(MsgWindow); // } - return TRUE; + goto MsgExit; } if((Msg->Msg.hwnd && Msg->Msg.message >= WM_MOUSEFIRST && Msg->Msg.message <= WM_MOUSELAST) && @@ -813,7 +813,14 @@ /* eat the message, search again */ goto CheckMessages; } - +MsgExit: + // The WH_GETMESSAGE hook enables an application to monitor messages about to + // be returned by the GetMessage or PeekMessage function. + if(ISITHOOKED(WH_GETMESSAGE)) + { + DPRINT1("Peek WH_GETMESSAGE -> %x\n",&Msg); + co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg); + } return TRUE; } @@ -856,12 +863,10 @@ } Present = co_IntPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg); - // The WH_GETMESSAGE hook enables an application to monitor messages about to - // be returned by the GetMessage or PeekMessage function. - co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg); if (Present) { + Info.Msg = Msg.Msg; /* See if this message type is present in the table */ MsgMemoryEntry = FindMsgMemory(Info.Msg.message); @@ -1862,7 +1867,7 @@ switch(dwType) { case FNID_DEFWINDOWPROC: - lResult = IntDefWindowProc(Window, Msg, wParam, lParam); + lResult = IntDefWindowProc(Window, Msg, wParam, lParam, Ansi); break; } UserDerefObjectCo(Window);

16 years, 5 months

[jmorlan] 34652: - Make console handles start at 3, not 7. - Make CsrGetObject increment the ref count to prevent objects from being deleted while in use. Add CsrReleaseObjectByPointer calls where necessary.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Mon Jul 21 19:33:42 2008 New Revision: 34652 URL: http://svn.reactos.org/svn/reactos?rev=34652&view=rev Log: - Make console handles start at 3, not 7. - Make CsrGetObject increment the ref count to prevent objects from being deleted while in use. Add CsrReleaseObjectByPointer calls where necessary. Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c trunk/reactos/subsystems/win32/csrss/api/process.c trunk/reactos/subsystems/win32/csrss/include/csrplugin.h trunk/reactos/subsystems/win32/csrss/include/win32csr.h trunk/reactos/subsystems/win32/csrss/init.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -63,21 +63,25 @@ NTSTATUS STDCALL CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object ) { - ULONG h = (((ULONG)Handle) >> 2) - 1; + ULONG h = (ULONG)Handle >> 2; DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); if (ProcessData == NULL) { return STATUS_INVALID_PARAMETER; } - if (!CsrIsConsoleHandle(Handle) || ProcessData->HandleTableSize <= h) + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize + || (*Object = ProcessData->HandleTable[h]) == NULL) { DPRINT1("CsrGetObject returning invalid handle (%x)\n", Handle); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_INVALID_HANDLE; } - *Object = ProcessData->HandleTable[h]; + _InterlockedIncrement(&(*Object)->ReferenceCount); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); // DbgPrint( "CsrGetObject returning\n" ); - return *Object ? STATUS_SUCCESS : STATUS_INVALID_HANDLE; + return STATUS_SUCCESS; } @@ -114,7 +118,7 @@ CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle) { - ULONG h = (((ULONG)Handle) >> 2) - 1; + ULONG h = (ULONG)Handle >> 2; Object_t *Object; if (ProcessData == NULL) @@ -171,7 +175,7 @@ ProcessData->HandleTableSize += 64; } ProcessData->HandleTable[i] = Object; - *Handle = (HANDLE)(((i + 1) << 2) | 0x3); + *Handle = (HANDLE)((i << 2) | 0x3); _InterlockedIncrement( &Object->ReferenceCount ); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return(STATUS_SUCCESS); @@ -216,7 +220,7 @@ NTSTATUS STDCALL CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle ) { - ULONG h = (((ULONG)Handle) >> 2) - 1; + ULONG h = (ULONG)Handle >> 2; if (ProcessData == NULL) { Modified: trunk/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -160,7 +160,7 @@ { if (pProcessData->HandleTable[c]) { - CsrReleaseObject(pProcessData, (HANDLE)(((c + 1) << 2)|0x3)); + CsrReleaseObjectByPointer(pProcessData->HandleTable[c]); } } RtlFreeHeap(CsrssApiHeap, 0, pProcessData->HandleTable); @@ -430,6 +430,7 @@ Request->Status = CsrInsertObject(ProcessData, &Request->Data.DuplicateHandleRequest.Handle, Object); + CsrReleaseObjectByPointer(Object); } return Request->Status; } Modified: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -28,6 +28,7 @@ typedef NTSTATUS (STDCALL *CSRSS_GET_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object); +typedef NTSTATUS (STDCALL *CSRSS_RELEASE_OBJECT_BY_POINTER_PROC)(Object_t *Object); typedef NTSTATUS (STDCALL *CSRSS_RELEASE_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData, HANDLE Object ); typedef NTSTATUS (STDCALL *CSRSS_ENUM_PROCESSES_PROC)(CSRSS_ENUM_PROCESS_PROC EnumProc, @@ -37,6 +38,7 @@ { CSRSS_INSERT_OBJECT_PROC CsrInsertObjectProc; CSRSS_GET_OBJECT_PROC CsrGetObjectProc; + CSRSS_RELEASE_OBJECT_BY_POINTER_PROC CsrReleaseObjectByPointerProc; CSRSS_RELEASE_OBJECT_PROC CsrReleaseObjectProc; CSRSS_ENUM_PROCESSES_PROC CsrEnumProcessesProc; } CSRSS_EXPORTED_FUNCS, *PCSRSS_EXPORTED_FUNCS; Modified: trunk/reactos/subsystems/win32/csrss/include/win32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/win32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/win32csr.h [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -28,6 +28,7 @@ NTSTATUS FASTCALL Win32CsrGetObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object); +NTSTATUS FASTCALL Win32CsrReleaseObjectByPointer(Object_t *Object); NTSTATUS FASTCALL Win32CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Object); NTSTATUS FASTCALL Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/init.c [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -252,6 +252,7 @@ } Exports.CsrInsertObjectProc = CsrInsertObject; Exports.CsrGetObjectProc = CsrGetObject; + Exports.CsrReleaseObjectByPointerProc = CsrReleaseObjectByPointer; Exports.CsrReleaseObjectProc = CsrReleaseObject; Exports.CsrEnumProcessesProc = CsrEnumProcesses; if (! (*InitProc)(&ApiDefinitions, &ObjectDefinitions, &InitCompleteProc, Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -47,6 +47,7 @@ return STATUS_INVALID_HANDLE; } + InterlockedIncrement(&ProcessConsole->Header.ReferenceCount); EnterCriticalSection(&(ProcessConsole->Header.Lock)); *Console = ProcessConsole; @@ -1948,12 +1949,12 @@ } else { - return Request->Status = STATUS_INVALID_HANDLE; - } - - Request->Status = STATUS_SUCCESS; - - return Request->Status; + Status = STATUS_INVALID_HANDLE; + } + + Win32CsrReleaseObjectByPointer((Object_t *)Console); + + return Request->Status = Status; } CSR_API(CsrGetConsoleMode) @@ -1987,6 +1988,7 @@ Request->Status = STATUS_INVALID_HANDLE; } + Win32CsrReleaseObjectByPointer((Object_t *)Console); return Request->Status; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -125,6 +125,7 @@ if ((*Object)->Type != Type) { + (CsrExports.CsrReleaseObjectByPointerProc)(*Object); return STATUS_INVALID_HANDLE; } @@ -137,6 +138,13 @@ Win32CsrUnlockObject(Object_t *Object) { LeaveCriticalSection(&(Object->Lock)); + (CsrExports.CsrReleaseObjectByPointerProc)(Object); +} + +NTSTATUS FASTCALL +Win32CsrReleaseObjectByPointer(Object_t *Object) +{ + return (CsrExports.CsrReleaseObjectByPointerProc)(Object); } NTSTATUS FASTCALL

16 years, 5 months

[tkreuzer] 34651: implement HackSecureVirtualMemory as a possible workaround for missing MmSecureVirtualMemory

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 21 18:56:26 2008 New Revision: 34651 URL: http://svn.reactos.org/svn/reactos?rev=34651&view=rev Log: implement HackSecureVirtualMemory as a possible workaround for missing MmSecureVirtualMemory Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mem.c [iso-8859-1] Mon Jul 21 18:56:26 2008 @@ -105,6 +105,69 @@ ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &Header, &MemSize, MEM_RELEASE); } + + +PVOID +NTAPI +HackSecureVirtualMemory( + IN PVOID Address, + IN SIZE_T Size, + IN ULONG ProbeMode, + OUT PVOID *SafeAddress) +{ + NTSTATUS Status = STATUS_SUCCESS; + PMDL mdl; + LOCK_OPERATION Operation; + + if (ProbeMode == PAGE_READONLY) Operation = IoReadAccess; + else if (ProbeMode == PAGE_READWRITE) Operation = IoModifyAccess; + else return NULL; + + mdl = IoAllocateMdl(Address, Size, FALSE, TRUE, NULL); + if (mdl == NULL) + { + return NULL; + } + + _SEH_TRY + { + MmProbeAndLockPages(mdl, UserMode, Operation); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + IoFreeMdl(mdl); + return NULL; + } + + *SafeAddress = MmGetSystemAddressForMdlSafe(mdl, NormalPagePriority); + + if(!*SafeAddress) + { + MmUnlockPages(mdl); + IoFreeMdl(mdl); + return NULL; + } + + return mdl; +} + +VOID +NTAPI +HackUnsecureVirtualMemory( + IN PVOID SecureHandle) +{ + PMDL mdl = (PMDL)SecureHandle; + + MmUnlockPages(mdl); + IoFreeMdl(mdl); +} + /* * @implemented */

16 years, 5 months

[tkreuzer] 34650: fix READ_PORT_xxx macros

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 21 16:53:38 2008 New Revision: 34650 URL: http://svn.reactos.org/svn/reactos?rev=34650&view=rev Log: fix READ_PORT_xxx macros Modified: trunk/reactos/include/ddk/ioaccess.h Modified: trunk/reactos/include/ddk/ioaccess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ioaccess.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ioaccess.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ioaccess.h [iso-8859-1] Mon Jul 21 16:53:38 2008 @@ -38,9 +38,9 @@ #define WRITE_REGISTER_UCHAR(r, v) (*(volatile UCHAR *)(r) = (v)) #define WRITE_REGISTER_USHORT(r, v) (*(volatile USHORT *)(r) = (v)) #define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) -#define READ_PORT_UCHAR(p) (UCHAR)(__inbyte H2I(p)) -#define READ_PORT_USHORT(p) (USHORT)(__inword H2I(p)) -#define READ_PORT_ULONG(p) (ULONG)(__indword H2I(p)) +#define READ_PORT_UCHAR(p) (UCHAR)(__inbyte (H2I(p))) +#define READ_PORT_USHORT(p) (USHORT)(__inword (H2I(p))) +#define READ_PORT_ULONG(p) (ULONG)(__indword (H2I(p))) #define WRITE_PORT_UCHAR(p, v) __outbyte (H2I(p), (v)) #define WRITE_PORT_USHORT(p, v) __outword (H2I(p), (v)) #define WRITE_PORT_ULONG(p, v) __outdword (H2I(p), (v))

16 years, 5 months

[tkreuzer] 34649: fix prototypes of _beginthread and _beginthreadex

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 21 16:46:24 2008 New Revision: 34649 URL: http://svn.reactos.org/svn/reactos?rev=34649&view=rev Log: fix prototypes of _beginthread and _beginthreadex Modified: trunk/reactos/include/crt/process.h trunk/reactos/lib/sdk/crt/process/thread.c trunk/reactos/lib/sdk/crt/process/threadx.c Modified: trunk/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/process.h?rev=… ============================================================================== --- trunk/reactos/include/crt/process.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/process.h [iso-8859-1] Mon Jul 21 16:46:24 2008 @@ -16,6 +16,8 @@ /* Includes a definition of _pid_t and pid_t */ #include <sys/types.h> + +#include <stdint.h> /* * Constants for cwait actions. @@ -92,12 +94,12 @@ * * NOTE: No old names for these functions. Use the underscore. */ -_CRTIMP unsigned long __cdecl __MINGW_NOTHROW +_CRTIMP uintptr_t __cdecl __MINGW_NOTHROW _beginthread (void (*)(void *), unsigned, void*); _CRTIMP void __cdecl __MINGW_NOTHROW _endthread (void); #ifdef __MSVCRT__ -_CRTIMP unsigned long __cdecl __MINGW_NOTHROW +_CRTIMP uintptr_t __cdecl __MINGW_NOTHROW _beginthreadex (void *, unsigned, unsigned (__stdcall *) (void *), void*, unsigned, unsigned*); _CRTIMP void __cdecl __MINGW_NOTHROW _endthreadex (unsigned); Modified: trunk/reactos/lib/sdk/crt/process/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/thread… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/thread.c [iso-8859-1] Mon Jul 21 16:46:24 2008 @@ -80,7 +80,7 @@ /********************************************************************* * _beginthread (MSVCRT.@) */ -unsigned long _beginthread( +uintptr_t _beginthread( _beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ unsigned int stack_size, /* [in] Stack size for new thread or 0 */ void *arglist) /* [in] Argument list to be passed to new thread or NULL */ @@ -98,7 +98,7 @@ trampoline->arglist = arglist; /* FIXME */ - return (unsigned long)CreateThread(NULL, stack_size, _beginthread_trampoline, + return (uintptr_t)CreateThread(NULL, stack_size, _beginthread_trampoline, trampoline, 0, NULL); } Modified: trunk/reactos/lib/sdk/crt/process/threadx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/thread… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/threadx.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/threadx.c [iso-8859-1] Mon Jul 21 16:46:24 2008 @@ -3,7 +3,7 @@ /* * @unimplemented */ -unsigned long CDECL _beginthreadex( +uintptr_t CDECL _beginthreadex( void* security, unsigned stack_size, unsigned (__stdcall *start_address)(void*), @@ -25,7 +25,7 @@ _dosmaperr( GetLastError() ); } - return (unsigned long) NewThread; + return (uintptr_t) NewThread; }

16 years, 5 months

← Newer
1
...
31
32
33
34
35
36
37
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008