Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[tkreuzer] 41651: Don't save/change/restore the DC pen in IntDrawScrollInterior, where it's not used at all.
by tkreuzer＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: tkreuzer Date: Sun Jun 28 03:12:22 2009 New Revision: 41651 URL: http://svn.reactos.org/svn/reactos?rev=41651&view=rev Log: Don't save/change/restore the DC pen in IntDrawScrollInterior, where it's not used at all. Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sun Jun 28 03:12:22 2009 @@ -99,7 +99,6 @@ INT ThumbSize = ScrollBarInfo->xyThumbBottom - ScrollBarInfo->xyThumbTop; INT ThumbTop = ScrollBarInfo->xyThumbTop; RECT Rect; - HPEN hSavePen; HBRUSH hSaveBrush, hBrush; BOOL TopSelected = FALSE, BottomSelected = FALSE; @@ -124,7 +123,6 @@ hBrush = DefWndControlColor(hDC, CTLCOLOR_SCROLLBAR); } - hSavePen = SelectObject(hDC, GetSysColorPen(COLOR_WINDOWFRAME)); hSaveBrush = SelectObject(hDC, hBrush); /* Calculate the scroll rectangle */ @@ -150,7 +148,6 @@ Rect.bottom - Rect.top, PATCOPY); /* Cleanup and return */ - SelectObject(hDC, hSavePen); SelectObject(hDC, hSaveBrush); return; } @@ -207,7 +204,6 @@ DrawEdge(hDC, &Rect, EDGE_RAISED, BF_RECT | BF_MIDDLE); /* Cleanup */ - SelectObject(hDC, hSavePen); SelectObject(hDC, hSaveBrush); }

1 0

[ros-arm-bringup] 41650: - Copying from destination to destination isn't very smart. - Fix bug when creating the physical memory descriptor block.
by ros-arm-bringup＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: ros-arm-bringup Date: Sun Jun 28 02:51:23 2009 New Revision: 41650 URL: http://svn.reactos.org/svn/reactos?rev=41650&view=rev Log: - Copying from destination to destination isn't very smart. - Fix bug when creating the physical memory descriptor block. Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Sun Jun 28 02:51:23 2009 @@ -260,7 +260,7 @@ // Copy the old buffer into the new, then free it // RtlCopyMemory(NewBuffer->Run, - NewBuffer->Run, + Buffer->Run, sizeof(PHYSICAL_MEMORY_RUN) * Run); ExFreePool(Buffer);

1 0

[ros-arm-bringup] 41649: - Actually it seems MmGetPhysicalMemoryRanges uses the MmPhysicalMemoryBlock, so go ahead and implement that function. - Thanks to Matthieu Suiche (http://www.msuiche.net/2008/09/17/retrieving-mmphysicalmemoryblock-regardless-of-the-nt-version/). - Move physical.c into ARM3 and call it dynamic.c since these functions are for Dynamic Memory (Hotplug) for Server 2003. - Remove the old copyright header, as copy-pasting 5 DDK function definitions and rewriting them to say UN
by ros-arm-bringup＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: ros-arm-bringup Date: Sun Jun 28 02:39:03 2009 New Revision: 41649 URL: http://svn.reactos.org/svn/reactos?rev=41649&view=rev Log: - Actually it seems MmGetPhysicalMemoryRanges uses the MmPhysicalMemoryBlock, so go ahead and implement that function. - Thanks to Matthieu Suiche (http://www.msuiche.net/2008/09/17/retrieving-mmphysicalmemoryblock-regardle…). - Move physical.c into ARM3 and call it dynamic.c since these functions are for Dynamic Memory (Hotplug) for Server 2003. - Remove the old copyright header, as copy-pasting 5 DDK function definitions and rewriting them to say UNIMPLEMENTED isn't much of a copyright. Added: trunk/reactos/ntoskrnl/mm/ARM3/dynamic.c - copied, changed from r41647, trunk/reactos/ntoskrnl/mm/physical.c Removed: trunk/reactos/ntoskrnl/mm/physical.c Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Copied: trunk/reactos/ntoskrnl/mm/ARM3/dynamic.c (from r41647, trunk/reactos/ntoskrnl/mm/physical.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/dynamic.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/physical.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/dynamic.c [iso-8859-1] Sun Jun 28 02:39:03 2009 @@ -1,16 +1,20 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/mm/physical.c - * PURPOSE: Physical Memory Manipulation Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/dynamic.c + * PURPOSE: ARM Memory Manager Dynamic Physical Memory Support + * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#line 15 "ARMÂ³::DYNAMIC" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" /* FUNCTIONS *****************************************************************/ @@ -63,12 +67,61 @@ } /* - * @unimplemented + * @implemented */ PPHYSICAL_MEMORY_RANGE NTAPI MmGetPhysicalMemoryRanges(VOID) { - UNIMPLEMENTED; - return 0; + ULONG Size, i; + PPHYSICAL_MEMORY_RANGE Entry, Buffer; + KIRQL OldIrql; + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + // + // Calculate how much memory we'll need + // + Size = sizeof(PHYSICAL_MEMORY_RANGE) * (MmPhysicalMemoryBlock->NumberOfRuns + 1); + + // + // Allocate a copy + // + Entry = Buffer = ExAllocatePoolWithTag(NonPagedPool, Size, 'hPmM'); + if (!Buffer) return NULL; + + // + // Lock the PFN database + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + // + // Make sure it hasn't changed before we had acquired the lock + // + ASSERT(Size == (sizeof(PHYSICAL_MEMORY_RANGE) * + (MmPhysicalMemoryBlock->NumberOfRuns + 1))); + + // + // Now loop our block + // + for (i = 0; i < MmPhysicalMemoryBlock->NumberOfRuns; i++) + { + // + // Copy the data, but format it into bytes + // + Entry->BaseAddress.QuadPart = MmPhysicalMemoryBlock->Run[i].BasePage << PAGE_SHIFT; + Entry->NumberOfBytes.QuadPart = MmPhysicalMemoryBlock->Run[i].PageCount << PAGE_SHIFT; + Entry++; + } + + // + // Last entry is empty + // + Entry->BaseAddress.QuadPart = 0; + Entry->NumberOfBytes.QuadPart = 0; + + // + // Release the lock and return + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + return Buffer; } Removed: trunk/reactos/ntoskrnl/mm/physical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/physical.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/physical.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/physical.c (removed) @@ -1,74 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/mm/physical.c - * PURPOSE: Physical Memory Manipulation Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmAddPhysicalMemory (IN PPHYSICAL_ADDRESS StartAddress, - IN OUT PLARGE_INTEGER NumberOfBytes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmMarkPhysicalMemoryAsBad(IN PPHYSICAL_ADDRESS StartAddress, - IN OUT PLARGE_INTEGER NumberOfBytes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmMarkPhysicalMemoryAsGood(IN PPHYSICAL_ADDRESS StartAddress, - IN OUT PLARGE_INTEGER NumberOfBytes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -MmRemovePhysicalMemory(IN PPHYSICAL_ADDRESS StartAddress, - IN OUT PLARGE_INTEGER NumberOfBytes) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -PPHYSICAL_MEMORY_RANGE -NTAPI -MmGetPhysicalMemoryRanges(VOID) -{ - UNIMPLEMENTED; - return 0; -} Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jun 28 02:39:03 2009 @@ -360,6 +360,7 @@ </directory> </if> <directory name="ARM3"> + <file>dynamic.c</file> <file>hypermap.c</file> <file>init.c</file> <file>iosup.c</file> @@ -384,7 +385,6 @@ <file>pagefile.c</file> <file>pageop.c</file> <file>pe.c</file> - <file>physical.c</file> <file>pool.c</file> <file>ppool.c</file> <file>procsup.c</file>

1 0

[ros-arm-bringup] 41648: - Call MmArmInitSystem for a second time, this time in Phase 1. - This will call MmInitializeMemoryLimits (now implemented) which will go ahead and create the MmPhysicalMemoryBlock. - This block contains the physical memory "runs" that are valid on the system, allowing the PFN database to differentiate between valid and non-valid RAM (instead of marking things as "BIOS"). - Also this will come in handy later for various utilities.
by ros-arm-bringup＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: ros-arm-bringup Date: Sun Jun 28 02:16:47 2009 New Revision: 41648 URL: http://svn.reactos.org/svn/reactos?rev=41648&view=rev Log: - Call MmArmInitSystem for a second time, this time in Phase 1. - This will call MmInitializeMemoryLimits (now implemented) which will go ahead and create the MmPhysicalMemoryBlock. - This block contains the physical memory "runs" that are valid on the system, allowing the PFN database to differentiate between valid and non-valid RAM (instead of marking things as "BIOS"). - Also this will come in handy later for various utilities. Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Sun Jun 28 02:16:47 2009 @@ -108,11 +108,15 @@ // ULONG MxPfnAllocation; - // // The ARMÂ³ PFN Database // PMMPFN MmArmPfnDatabase; + +// +// This structure describes the different pieces of RAM-backed address space +// +PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; /* PRIVATE FUNCTIONS **********************************************************/ @@ -137,6 +141,142 @@ MmGlobalKernelPageDirectory[Pde] = ((PULONG)PAGEDIRECTORY_MAP)[Pde]; Pde++; } +} + +PPHYSICAL_MEMORY_DESCRIPTOR +NTAPI +MmInitializeMemoryLimits(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PBOOLEAN IncludeType) +{ + PLIST_ENTRY NextEntry; + ULONG Run = 0, InitialRuns = 0; + PFN_NUMBER NextPage = -1, PageCount = 0; + PPHYSICAL_MEMORY_DESCRIPTOR Buffer, NewBuffer; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + + // + // Scan the memory descriptors + // + NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) + { + // + // For each one, increase the memory allocation estimate + // + InitialRuns++; + NextEntry = NextEntry->Flink; + } + + // + // Allocate the maximum we'll ever need + // + Buffer = ExAllocatePoolWithTag(NonPagedPool, + sizeof(PHYSICAL_MEMORY_DESCRIPTOR) + + sizeof(PHYSICAL_MEMORY_RUN) * + (InitialRuns - 1), + 'lMmM'); + if (!Buffer) return NULL; + + // + // For now that's how many runs we have + // + Buffer->NumberOfRuns = InitialRuns; + + // + // Now loop through the descriptors again + // + NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) + { + // + // Grab each one, and check if it's one we should include + // + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + if ((MdBlock->MemoryType < LoaderMaximum) && + (IncludeType[MdBlock->MemoryType])) + { + // + // Add this to our running total + // + PageCount += MdBlock->PageCount; + + // + // Check if the next page is described by the next descriptor + // + if (MdBlock->BasePage == NextPage) + { + // + // Combine it into the same physical run + // + ASSERT(MdBlock->PageCount != 0); + Buffer->Run[Run - 1].PageCount += MdBlock->PageCount; + NextPage += MdBlock->PageCount; + } + else + { + // + // Otherwise just duplicate the descriptor's contents + // + Buffer->Run[Run].BasePage = MdBlock->BasePage; + Buffer->Run[Run].PageCount = MdBlock->PageCount; + NextPage = Buffer->Run[Run].BasePage + Buffer->Run[Run].PageCount; + + // + // And in this case, increase the number of runs + // + Run++; + } + } + + // + // Try the next descriptor + // + NextEntry = MdBlock->ListEntry.Flink; + } + + // + // We should not have been able to go past our initial estimate + // + ASSERT(Run <= Buffer->NumberOfRuns); + + // + // Our guess was probably exaggerated... + // + if (InitialRuns > Run) + { + // + // Allocate a more accurately sized buffer + // + NewBuffer = ExAllocatePoolWithTag(NonPagedPool, + sizeof(PHYSICAL_MEMORY_DESCRIPTOR) + + sizeof(PHYSICAL_MEMORY_RUN) * + (Run - 1), + 'lMmM'); + if (NewBuffer) + { + // + // Copy the old buffer into the new, then free it + // + RtlCopyMemory(NewBuffer->Run, + NewBuffer->Run, + sizeof(PHYSICAL_MEMORY_RUN) * Run); + ExFreePool(Buffer); + + // + // Now use the new buffer + // + Buffer = NewBuffer; + } + } + + // + // Write the final numbers, and return it + // + Buffer->NumberOfRuns = Run; + Buffer->NumberOfPages = PageCount; + return Buffer; } NTSTATUS @@ -152,6 +292,8 @@ PVOID NonPagedPoolExpansionVa, BaseAddress; NTSTATUS Status; ULONG OldCount; + BOOLEAN IncludeType[LoaderMaximum]; + ULONG i; BoundaryAddressMultiple.QuadPart = Low.QuadPart = 0; High.QuadPart = -1; @@ -565,6 +707,36 @@ MiSyncARM3WithROS(MmNonPagedPoolStart, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); MiSyncARM3WithROS((PVOID)HYPER_SPACE, (PVOID)(HYPER_SPACE + PAGE_SIZE - 1)); } + else + { + // + // Instantiate memory that we don't consider RAM/usable + // We use the same exclusions that Windows does, in order to try to be + // compatible with WinLDR-style booting + // + for (i = 0; i < LoaderMaximum; i++) IncludeType[i] = TRUE; + IncludeType[LoaderBad] = FALSE; + IncludeType[LoaderFirmwarePermanent] = FALSE; + IncludeType[LoaderSpecialMemory] = FALSE; + IncludeType[LoaderBBTMemory] = FALSE; + + // + // Build the physical memory block + // + MmPhysicalMemoryBlock = MmInitializeMemoryLimits(LoaderBlock, + IncludeType); + for (i = 0; i < MmPhysicalMemoryBlock->NumberOfRuns; i++) + { + // + // Dump it for debugging + // + PPHYSICAL_MEMORY_RUN Run; + Run = &MmPhysicalMemoryBlock->Run[i]; + DPRINT1("PHYSICAL RAM [0x%08p to 0x%08p]\n", + Run->BasePage << PAGE_SHIFT, + (Run->BasePage + Run->PageCount) << PAGE_SHIFT); + } + } // // Always return success for now Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Jun 28 02:16:47 2009 @@ -28,6 +28,19 @@ MiNotMapped } MI_PFN_CACHE_ATTRIBUTE, *PMI_PFN_CACHE_ATTRIBUTE; +typedef struct _PHYSICAL_MEMORY_RUN +{ + ULONG BasePage; + ULONG PageCount; +} PHYSICAL_MEMORY_RUN, *PPHYSICAL_MEMORY_RUN; + +typedef struct _PHYSICAL_MEMORY_DESCRIPTOR +{ + ULONG NumberOfRuns; + ULONG NumberOfPages; + PHYSICAL_MEMORY_RUN Run[1]; +} PHYSICAL_MEMORY_DESCRIPTOR, *PPHYSICAL_MEMORY_DESCRIPTOR; + extern MMPTE HyperTemplatePte; extern ULONG MmSizeOfNonPagedPoolInBytes; @@ -36,6 +49,7 @@ extern PVOID MmNonPagedPoolExpansionStart; extern PMMPTE MmFirstReservedMappingPte, MmLastReservedMappingPte; extern PMMPTE MiFirstReservedZeroingPte; +extern PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sun Jun 28 02:16:47 2009 @@ -376,7 +376,7 @@ MmInitializePageList(); // - // Initialize ARMÂ³ + // Initialize ARMÂ³ in phase 0 // MmArmInitSystem(0, KeLoaderBlock); @@ -391,6 +391,11 @@ /* Initialize working sets */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); + + // + // Initialize ARMÂ³ in phase 1 + // + MmArmInitSystem(1, KeLoaderBlock); } BOOLEAN

1 0

[spetreolle] 41647: Taskmgr didn't build without compilation units, moving PerfDataGet to perfdata functions fixes it.
by spetreolle＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: spetreolle Date: Sun Jun 28 02:05:53 2009 New Revision: 41647 URL: http://svn.reactos.org/svn/reactos?rev=41647&view=rev Log: Taskmgr didn't build without compilation units, moving PerfDataGet to perfdata functions fixes it. Modified: trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/perfdata.h trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Sun Jun 28 02:05:53 2009 @@ -901,3 +901,18 @@ return ThreadCount; } + +BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData) +{ + BOOL bSuccessful = FALSE; + + EnterCriticalSection(&PerfDataCriticalSection); + if (Index < ProcessCount) + { + *lppData = pPerfData + Index; + bSuccessful = TRUE; + } + LeaveCriticalSection(&PerfDataCriticalSection); + return bSuccessful; +} + Modified: trunk/reactos/base/applications/taskmgr/perfdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.h [iso-8859-1] Sun Jun 28 02:05:53 2009 @@ -60,6 +60,7 @@ void PerfDataUninitialize(void); void PerfDataRefresh(void); +BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData); ULONG PerfDataGetProcessCount(void); ULONG PerfDataGetProcessorUsage(void); ULONG PerfDataGetProcessorSystemUsage(void); Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sun Jun 28 02:05:53 2009 @@ -52,7 +52,6 @@ void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam); void CommaSeparateNumberString(LPWSTR strNumber, int nMaxCount); void ProcessPageShowContextMenu(DWORD dwProcessId); -BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData); BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCount); DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); @@ -454,20 +453,6 @@ } } -BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData) -{ - BOOL bSuccessful = FALSE; - - EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - { - *lppData = pPerfData + Index; - bSuccessful = TRUE; - } - LeaveCriticalSection(&PerfDataCriticalSection); - return bSuccessful; -} - void AddProcess(ULONG Index) { LPPROCESS_PAGE_LIST_ITEM pData;

1 0

[jimtabor] 41646: - Fix callback set and changed data. Process hooks if we are hooked.
by jimtabor＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: jimtabor Date: Sun Jun 28 00:52:33 2009 New Revision: 41646 URL: http://svn.reactos.org/svn/reactos?rev=41646&view=rev Log: - Fix callback set and changed data. Process hooks if we are hooked. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/window.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] Sun Jun 28 00:52:33 2009 @@ -480,6 +480,8 @@ case HCBT_SYSCOMMAND: case HCBT_DESTROYWND: case HCBT_QS: + wParam = Common->wParam; + lParam = Common->lParam; break; default: ERR("HCBT_ not supported = %d\n", Common->Code); 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] Sun Jun 28 00:52:33 2009 @@ -401,7 +401,7 @@ case HCBT_CLICKSKIPPED: ArgumentLength += sizeof(MOUSEHOOKSTRUCT); break; -/* ATM pass on */ +/* ATM pass on */ case HCBT_KEYSKIPPED: case HCBT_MINMAX: case HCBT_SETFOCUS: @@ -469,7 +469,7 @@ case HCBT_CREATEWND: Common->lParam = (LPARAM) (Extra - (PCHAR) Common); CbtCreatewndExtra = (PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS) Extra; - CbtCreatewndExtra->Cs = *(CbtCreateWnd->lpcs); + RtlCopyMemory( &CbtCreatewndExtra->Cs, CbtCreateWnd->lpcs, sizeof(CREATESTRUCTW) ); CbtCreatewndExtra->WndInsertAfter = CbtCreateWnd->hwndInsertAfter; Extra = (PCHAR) (CbtCreatewndExtra + 1); RtlCopyMemory(Extra, WindowName.Buffer, WindowName.Length); @@ -581,7 +581,22 @@ { if (CbtCreatewndExtra) { - CbtCreateWnd->hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; + _SEH2_TRY + { /* + The parameters could have been changed, include the coordinates + and dimensions of the window. We copy it back. + */ + CbtCreateWnd->hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; + CbtCreateWnd->lpcs->x = CbtCreatewndExtra->Cs.x; + CbtCreateWnd->lpcs->y = CbtCreatewndExtra->Cs.y; + CbtCreateWnd->lpcs->cx = CbtCreatewndExtra->Cs.cx; + CbtCreateWnd->lpcs->cy = CbtCreatewndExtra->Cs.cy; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Result = 0; + } + _SEH2_END; } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Jun 28 00:52:33 2009 @@ -1883,18 +1883,22 @@ Cs.dwExStyle = dwExStyle; CbtCreate.lpcs = &Cs; CbtCreate.hwndInsertAfter = HWND_TOP; - if (co_HOOK_CallHooks(WH_CBT, HCBT_CREATEWND, (WPARAM) hWnd, (LPARAM) &CbtCreate)) - { - /* FIXME - Delete window object and remove it from the thread windows list */ - /* FIXME - delete allocated DCE */ - DPRINT1("CBT-hook returned !0\n"); - RETURN( (HWND) NULL); - } - + if (ISITHOOKED(WH_CBT)) + { + if (co_HOOK_CallHooks(WH_CBT, HCBT_CREATEWND, (WPARAM) hWnd, (LPARAM) &CbtCreate)) + { + /* FIXME - Delete window object and remove it from the thread windows list */ + /* FIXME - delete allocated DCE */ + DPRINT1("CBT-hook returned !0\n"); + RETURN( (HWND) NULL); + } + } x = Cs.x; y = Cs.y; nWidth = Cs.cx; nHeight = Cs.cy; +// FIXME: Need to set the Z order in the window link list if the hook callback changed it! +// hwndInsertAfter = CbtCreate.hwndInsertAfter; /* default positioning for overlapped windows */ if(!(Wnd->Style & (WS_POPUP | WS_CHILD))) @@ -2396,8 +2400,11 @@ { BOOLEAN isChild; PWINDOW Wnd; + HWND hWnd; ASSERT_REFS_CO(Window); // FIXME: temp hack? + + hWnd = Window->hSelf; Wnd = Window->Wnd; @@ -2430,9 +2437,9 @@ IntDereferenceMessageQueue(Window->MessageQueue); /* Call hooks */ - if (co_HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) Window->hSelf, 0)) - { - return FALSE; + if (ISITHOOKED(WH_CBT)) + { + if (co_HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) hWnd, 0)) return FALSE; } IntEngWindowChanged(Window, WOC_DELETE);

1 0

[hyperion] 41645: Allow sorting the list of processes in Task Manager by any column. Patch by Maxime Vernier <maximevernier@gmail.com> with fixes by Sylvain Petreolle <spetreolle@yahoo.fr> and KJK::Hyperion <hackbunny@reactos.org> See issue #4608 for more details.
by hyperion＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: hyperion Date: Sat Jun 27 23:16:29 2009 New Revision: 41645 URL: http://svn.reactos.org/svn/reactos?rev=41645&view=rev Log: Allow sorting the list of processes in Task Manager by any column. Patch by Maxime Vernier <maximevernier(a)gmail.com> with fixes by Sylvain Petreolle <spetreolle(a)yahoo.fr> and KJK::Hyperion <hackbunny(a)reactos.org> See issue #4608 for more details. Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/el-GR.rc trunk/reactos/base/applications/taskmgr/lang/en-US.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Ïðåêðàòÿâàíå íà çàäà÷àòà",IDC_ENDPROCESS,144,203,100,14 CONTROL "&Ïîêàçâàíå íà äåéñòâèÿòà íà âñè÷êè ïîòðåáèòåëè",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Ukonèit proces",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Zobrazit procesy vech uivatelù",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -187,7 +187,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Afslut Proces",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Vis Processor fra alle brugere",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -190,7 +190,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Prozess beenden",IDC_ENDPROCESS,171,189,69,14 CONTROL "Prozesse aller &Benutzer anzeigen",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&End Process",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Show processes from all users",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&End Process",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Show processes from all users",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -208,7 +208,7 @@ BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Finalizar Proceso",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Mostrar Procesos de todos los usuario",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Terminer le processus",IDC_ENDPROCESS,171,189,71,14 CONTROL "Aff&icher les processus de tous les utilisateurs",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -189,7 +189,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Folyamat befejezése",IDC_ENDPROCESS,171,189,69,14 CONTROL "Minden felhasználó folya&matait jelenítse meg",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -187,7 +187,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&End Process",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Show processes from all users",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Termina Processo",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Mostra i processi di tutti gli utenti",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 9, "MS UI Gothic" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "vZXÌI¹(&E)",IDC_ENDPROCESS,171,189,69,14 CONTROL "S[U[ÌvZXð\\¦·é(&S)",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -190,7 +190,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "ÀÛ¾÷ ³¡³»±â(&E)",IDC_ENDPROCESS,171,189,69,14 CONTROL "¸ðµç À¯ÀúÀÇ ÇÁ·Î¼¼½º º¸ÀÌ±â(&S)",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Proces beëindigen",IDC_ENDPROCESS,171,189,69,14 CONTROL "Processen van &alle gebruikers weergeven",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Liste2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Avslutt prosess",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Vis prosesser fra alle brukere",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -193,7 +193,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Zakoñcz proces",IDC_ENDPROCESS,171,189,69,14 CONTROL "Po&ka¿ procesy wszystkich u¿ytkowników",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Finalizar processo",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Mostrar processos de todos os usuários",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Oprire proces",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Afiºare procese de la toþi utilizatorii",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -187,7 +187,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Çàâåðøèòü ïðîöåññ",IDC_ENDPROCESS,162,189,79,14 CONTROL "&Ïðîöåññû âñåõ ïîëüçîâàòåëåé",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -187,7 +187,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Ukonèi proces",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Zobrazi procesy vetkých pouívate¾ov",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -205,7 +205,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Avsluta process",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Visa processer från alla användare",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -188,7 +188,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "Çí&ÿòè çàâäàííÿ",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Â³äîáðàæàòè ïðîöåñè âñ³õ êîðèñòóâà÷³â",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -196,7 +196,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "½áÊø½ø³Ì(&E)",IDC_ENDPROCESS,171,189,69,14 CONTROL "ÏÔÊ¾ËùÓÐÓÃ»§µÄ½ø³Ì(&S)",IDC_SHOWALLPROCESSES, Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sat Jun 27 23:16:29 2009 @@ -4,6 +4,7 @@ * procpage.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * Copyright (C) 2009 Maxime Vernier <maxime.vernier(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,14 @@ #include <precomp.h> +#define CMP(x1, x2)\ + (x1 < x2 ? -1 : (x1 > x2 ? 1 : 0)) + +typedef struct +{ + ULONG Index; +} PROCESS_PAGE_LIST_ITEM, *LPPROCESS_PAGE_LIST_ITEM; + HWND hProcessPage; /* Process List Property Page */ HWND hProcessPageListCtrl; /* Process ListCtrl Window */ @@ -31,12 +40,20 @@ static int nProcessPageWidth; static int nProcessPageHeight; - +static BOOL bProcessSort = FALSE; +static BOOL bProcessSortAscending = FALSE; static HANDLE hProcessPageEvent = NULL; /* When this event becomes signaled then we refresh the process list */ - +static ULONG ProcessSortColumnIndex = 0; + +int CALLBACK ProcessPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); +void AddProcess(ULONG Index); +void UpdateProcesses(); +void gethmsfromlargeint(LARGE_INTEGER largeint, DWORD *dwHours, DWORD *dwMinutes, DWORD *dwSeconds); void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam); void CommaSeparateNumberString(LPWSTR strNumber, int nMaxCount); void ProcessPageShowContextMenu(DWORD dwProcessId); +BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData); +BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCount); DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); INT_PTR CALLBACK @@ -158,8 +175,7 @@ LVITEM lvitem; ULONG Index; ULONG ColumnIndex; - IO_COUNTERS iocounters; - LARGE_INTEGER time; + LPPROCESS_PAGE_LIST_ITEM pData; idctrl = (int) wParam; pnmh = (LPNMHDR) lParam; @@ -182,147 +198,11 @@ if (!(pnmdi->item.mask & LVIF_TEXT)) break; + pData = (LPPROCESS_PAGE_LIST_ITEM)pnmdi->item.lParam; + Index = pData->Index; ColumnIndex = pnmdi->item.iSubItem; - Index = pnmdi->item.iItem; - - if (ColumnDataHints[ColumnIndex] == COLUMN_IMAGENAME) - PerfDataGetImageName(Index, pnmdi->item.pszText, pnmdi->item.cchTextMax); - if (ColumnDataHints[ColumnIndex] == COLUMN_PID) - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetProcessId(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_USERNAME) - PerfDataGetUserName(Index, pnmdi->item.pszText, pnmdi->item.cchTextMax); - if (ColumnDataHints[ColumnIndex] == COLUMN_SESSIONID) - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetSessionId(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_CPUUSAGE) - wsprintfW(pnmdi->item.pszText, L"%02d", PerfDataGetCPUUsage(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_CPUTIME) - { - DWORD dwHours; - DWORD dwMinutes; - DWORD dwSeconds; - - time = PerfDataGetCPUTime(Index); -#ifdef _MSC_VER - dwHours = (DWORD)(time.QuadPart / 36000000000L); - dwMinutes = (DWORD)((time.QuadPart % 36000000000L) / 600000000L); - dwSeconds = (DWORD)(((time.QuadPart % 36000000000L) % 600000000L) / 10000000L); -#else - dwHours = (DWORD)(time.QuadPart / 36000000000LL); - dwMinutes = (DWORD)((time.QuadPart % 36000000000LL) / 600000000LL); - dwSeconds = (DWORD)(((time.QuadPart % 36000000000LL) % 600000000LL) / 10000000LL); -#endif - wsprintfW(pnmdi->item.pszText, L"%d:%02d:%02d", dwHours, dwMinutes, dwSeconds); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGE) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetWorkingSetSizeBytes(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - wcscat(pnmdi->item.pszText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PEAKMEMORYUSAGE) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - wcscat(pnmdi->item.pszText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGEDELTA) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetWorkingSetSizeDelta(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - wcscat(pnmdi->item.pszText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTS) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetPageFaultCount(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTSDELTA) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetPageFaultCountDelta(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_VIRTUALMEMORYSIZE) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetVirtualMemorySizeBytes(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - wcscat(pnmdi->item.pszText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEDPOOL) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetPagedPoolUsagePages(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - wcscat(pnmdi->item.pszText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_NONPAGEDPOOL) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetNonPagedPoolUsagePages(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - wcscat(pnmdi->item.pszText, L" K"); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_BASEPRIORITY) - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetBasePriority(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_HANDLECOUNT) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetHandleCount(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_THREADCOUNT) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetThreadCount(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_USEROBJECTS) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetUSERObjectCount(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_GDIOBJECTS) - { - wsprintfW(pnmdi->item.pszText, L"%d", PerfDataGetGDIObjectCount(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADS) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.ReadOperationCount); */ - _ui64tow(iocounters.ReadOperationCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITES) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.WriteOperationCount); */ - _ui64tow(iocounters.WriteOperationCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHER) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.OtherOperationCount); */ - _ui64tow(iocounters.OtherOperationCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADBYTES) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.ReadTransferCount); */ - _ui64tow(iocounters.ReadTransferCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITEBYTES) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.WriteTransferCount); */ - _ui64tow(iocounters.WriteTransferCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHERBYTES) - { - PerfDataGetIOCounters(Index, &iocounters); - /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.OtherTransferCount); */ - _ui64tow(iocounters.OtherTransferCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } + + PerfDataGetText(Index, ColumnIndex, pnmdi->item.pszText, pnmdi->item.cchTextMax); break; @@ -358,12 +238,10 @@ { case HDN_ITEMCLICK: - /* - * FIXME: Fix the column sorting - * - *ListView_SortItems(hApplicationPageListCtrl, ApplicationPageCompareFunc, NULL); - *bSortAscending = !bSortAscending; - */ + ProcessSortColumnIndex = pnmhdr->iItem; + bProcessSortAscending = !bProcessSortAscending; + (void)ListView_SortItems(hProcessPageListCtrl, ProcessPageCompareFunc, NULL); + bProcessSort = TRUE; break; @@ -381,7 +259,6 @@ } } - } void CommaSeparateNumberString(LPWSTR strNumber, int nMaxCount) @@ -513,8 +390,7 @@ /* Reset our event */ ResetEvent(hProcessPageEvent); - if ((ULONG)SendMessageW(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0) != PerfDataGetProcessCount()) - SendMessageW(hProcessPageListCtrl, LVM_SETITEMCOUNT, PerfDataGetProcessCount(), /*LVSICF_NOINVALIDATEALL|*/LVSICF_NOSCROLL); + UpdateProcesses(); if (IsWindowVisible(hProcessPage)) InvalidateRect(hProcessPageListCtrl, NULL, FALSE); @@ -533,3 +409,468 @@ } return 0; } + +void UpdateProcesses() +{ + int i; + BOOL found = FALSE; + ULONG l; + ULONG pid; + LV_ITEM item; + LPPROCESS_PAGE_LIST_ITEM pData; + PPERFDATA pPerfData; + + /* Remove old processes */ + for (i = 0; i < ListView_GetItemCount(hProcessPageListCtrl); i++) + { + memset(&item, 0, sizeof (LV_ITEM)); + item.mask = LVIF_PARAM; + item.iItem = i; + (void)ListView_GetItem(hProcessPageListCtrl, &item); + pData = (LPPROCESS_PAGE_LIST_ITEM)item.lParam; + (void)PerfDataGet(pData->Index, &pPerfData); + pid = PerfDataGetProcessId(pData->Index); + for (l = 0; l < PerfDataGetProcessCount(); l++) + { + if (PerfDataGetProcessId(l) == pid) + { + found = TRUE; + break; + } + } + if (!found) + { + (void)ListView_DeleteItem(hApplicationPageListCtrl, i); + HeapFree(GetProcessHeap(), 0, pData); + } + } + for (l = 0; l < PerfDataGetProcessCount(); l++) + { + AddProcess(l); + } + if (bProcessSort) + { + (void)ListView_SortItems(hProcessPageListCtrl, ProcessPageCompareFunc, NULL); + } +} + +BOOL PerfDataGet(ULONG Index, PPERFDATA *lppData) +{ + BOOL bSuccessful = FALSE; + + EnterCriticalSection(&PerfDataCriticalSection); + if (Index < ProcessCount) + { + *lppData = pPerfData + Index; + bSuccessful = TRUE; + } + LeaveCriticalSection(&PerfDataCriticalSection); + return bSuccessful; +} + +void AddProcess(ULONG Index) +{ + LPPROCESS_PAGE_LIST_ITEM pData; + int i; + LV_ITEM item; + BOOL bAlreadyInList = FALSE; + ULONG pid; + + pid = PerfDataGetProcessId(Index); + + /* Check to see if it's already in our list */ + for (i=0; i<ListView_GetItemCount(hProcessPageListCtrl); i++) + { + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_PARAM; + item.iItem = i; + (void)ListView_GetItem(hProcessPageListCtrl, &item); + pData = (LPPROCESS_PAGE_LIST_ITEM)item.lParam; + if (PerfDataGetProcessId(pData->Index) == pid) + { + bAlreadyInList = TRUE; + break; + } + } + if (!bAlreadyInList) /* Add */ + { + pData = (LPPROCESS_PAGE_LIST_ITEM)HeapAlloc(GetProcessHeap(), 0, sizeof(PROCESS_PAGE_LIST_ITEM)); + pData->Index = Index; + + /* Add the item to the list */ + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_TEXT|LVIF_PARAM; + item.pszText = LPSTR_TEXTCALLBACK; + item.iItem = ListView_GetItemCount(hProcessPageListCtrl); + item.lParam = (LPARAM)pData; + (void)ListView_InsertItem(hProcessPageListCtrl, &item); + } +} + +BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCount) +{ + IO_COUNTERS iocounters; + LARGE_INTEGER time; + + if (ColumnDataHints[ColumnIndex] == COLUMN_IMAGENAME) + PerfDataGetImageName(Index, lpText, nMaxCount); + if (ColumnDataHints[ColumnIndex] == COLUMN_PID) + wsprintfW(lpText, L"%d", PerfDataGetProcessId(Index)); + if (ColumnDataHints[ColumnIndex] == COLUMN_USERNAME) + PerfDataGetUserName(Index, lpText, nMaxCount); + if (ColumnDataHints[ColumnIndex] == COLUMN_SESSIONID) + wsprintfW(lpText, L"%d", PerfDataGetSessionId(Index)); + if (ColumnDataHints[ColumnIndex] == COLUMN_CPUUSAGE) + wsprintfW(lpText, L"%02d", PerfDataGetCPUUsage(Index)); + if (ColumnDataHints[ColumnIndex] == COLUMN_CPUTIME) + { + DWORD dwHours; + DWORD dwMinutes; + DWORD dwSeconds; + + time = PerfDataGetCPUTime(Index); + gethmsfromlargeint(time, &dwHours, &dwMinutes, &dwSeconds); + wsprintfW(lpText, L"%d:%02d:%02d", dwHours, dwMinutes, dwSeconds); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGE) + { + wsprintfW(lpText, L"%d", PerfDataGetWorkingSetSizeBytes(Index) / 1024); + CommaSeparateNumberString(lpText, nMaxCount); + wcscat(lpText, L" K"); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_PEAKMEMORYUSAGE) + { + wsprintfW(lpText, L"%d", PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024); + CommaSeparateNumberString(lpText, nMaxCount); + wcscat(lpText, L" K"); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGEDELTA) + { + wsprintfW(lpText, L"%d", PerfDataGetWorkingSetSizeDelta(Index) / 1024); + CommaSeparateNumberString(lpText, nMaxCount); + wcscat(lpText, L" K"); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTS) + { + wsprintfW(lpText, L"%d", PerfDataGetPageFaultCount(Index)); + CommaSeparateNumberString(lpText, nMaxCount); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTSDELTA) + { + wsprintfW(lpText, L"%d", PerfDataGetPageFaultCountDelta(Index)); + CommaSeparateNumberString(lpText, nMaxCount); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_VIRTUALMEMORYSIZE) + { + wsprintfW(lpText, L"%d", PerfDataGetVirtualMemorySizeBytes(Index) / 1024); + CommaSeparateNumberString(lpText, nMaxCount); + wcscat(lpText, L" K"); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEDPOOL) + { + wsprintfW(lpText, L"%d", PerfDataGetPagedPoolUsagePages(Index) / 1024); + CommaSeparateNumberString(lpText, nMaxCount); + wcscat(lpText, L" K"); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_NONPAGEDPOOL) + { + wsprintfW(lpText, L"%d", PerfDataGetNonPagedPoolUsagePages(Index) / 1024); + CommaSeparateNumberString(lpText, nMaxCount); + wcscat(lpText, L" K"); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_BASEPRIORITY) + wsprintfW(lpText, L"%d", PerfDataGetBasePriority(Index)); + if (ColumnDataHints[ColumnIndex] == COLUMN_HANDLECOUNT) + { + wsprintfW(lpText, L"%d", PerfDataGetHandleCount(Index)); + CommaSeparateNumberString(lpText, nMaxCount); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_THREADCOUNT) + { + wsprintfW(lpText, L"%d", PerfDataGetThreadCount(Index)); + CommaSeparateNumberString(lpText, nMaxCount); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_USEROBJECTS) + { + wsprintfW(lpText, L"%d", PerfDataGetUSERObjectCount(Index)); + CommaSeparateNumberString(lpText, nMaxCount); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_GDIOBJECTS) + { + wsprintfW(lpText, L"%d", PerfDataGetGDIObjectCount(Index)); + CommaSeparateNumberString(lpText, nMaxCount); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADS) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.ReadOperationCount); */ + _ui64tow(iocounters.ReadOperationCount, lpText, 10); + CommaSeparateNumberString(lpText, nMaxCount); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITES) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.WriteOperationCount); */ + _ui64tow(iocounters.WriteOperationCount, lpText, 10); + CommaSeparateNumberString(lpText, nMaxCount); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHER) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.OtherOperationCount); */ + _ui64tow(iocounters.OtherOperationCount, lpText, 10); + CommaSeparateNumberString(lpText, nMaxCount); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADBYTES) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.ReadTransferCount); */ + _ui64tow(iocounters.ReadTransferCount, lpText, 10); + CommaSeparateNumberString(lpText, nMaxCount); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITEBYTES) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.WriteTransferCount); */ + _ui64tow(iocounters.WriteTransferCount, lpText, 10); + CommaSeparateNumberString(lpText, nMaxCount); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHERBYTES) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintfW(pnmdi->item.pszText, L"%d", iocounters.OtherTransferCount); */ + _ui64tow(iocounters.OtherTransferCount, lpText, 10); + CommaSeparateNumberString(lpText, nMaxCount); + } + + return FALSE; +} + + +void gethmsfromlargeint(LARGE_INTEGER largeint, DWORD *dwHours, DWORD *dwMinutes, DWORD *dwSeconds) +{ +#ifdef _MSC_VER + *dwHours = (DWORD)(largeint.QuadPart / 36000000000L); + *dwMinutes = (DWORD)((largeint.QuadPart % 36000000000L) / 600000000L); + *dwSeconds = (DWORD)(((largeint.QuadPart % 36000000000L) % 600000000L) / 10000000L); +#else + *dwHours = (DWORD)(largeint.QuadPart / 36000000000LL); + *dwMinutes = (DWORD)((largeint.QuadPart % 36000000000LL) / 600000000LL); + *dwSeconds = (DWORD)(((largeint.QuadPart % 36000000000LL) % 600000000LL) / 10000000LL); +#endif +} + +int largeintcmp(LARGE_INTEGER l1, LARGE_INTEGER l2) +{ + int ret = 0; + DWORD dwHours1; + DWORD dwMinutes1; + DWORD dwSeconds1; + DWORD dwHours2; + DWORD dwMinutes2; + DWORD dwSeconds2; + + gethmsfromlargeint(l1, &dwHours1, &dwMinutes1, &dwSeconds1); + gethmsfromlargeint(l2, &dwHours2, &dwMinutes2, &dwSeconds2); + ret = CMP(dwHours1, dwHours2); + if (ret == 0) + { + ret = CMP(dwMinutes1, dwMinutes2); + if (ret == 0) + { + ret = CMP(dwSeconds1, dwSeconds2); + } + } + return ret; +} + +int CALLBACK ProcessPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) +{ + int ret = 0; + LPPROCESS_PAGE_LIST_ITEM Param1; + LPPROCESS_PAGE_LIST_ITEM Param2; + ULONG ColumnIndex; + WCHAR text1[260]; + WCHAR text2[260]; + ULONG l1; + ULONG l2; + LARGE_INTEGER time1; + LARGE_INTEGER time2; + IO_COUNTERS iocounters1; + IO_COUNTERS iocounters2; + ULONGLONG ull1; + ULONGLONG ull2; + + if (bProcessSortAscending) { + Param1 = (LPPROCESS_PAGE_LIST_ITEM)lParam1; + Param2 = (LPPROCESS_PAGE_LIST_ITEM)lParam2; + } else { + Param1 = (LPPROCESS_PAGE_LIST_ITEM)lParam2; + Param2 = (LPPROCESS_PAGE_LIST_ITEM)lParam1; + } + ColumnIndex = ProcessSortColumnIndex; + + if (ColumnDataHints[ColumnIndex] == COLUMN_IMAGENAME) + { + PerfDataGetImageName(Param1->Index, text1, sizeof (text1) / sizeof (*text1)); + PerfDataGetImageName(Param2->Index, text2, sizeof (text2) / sizeof (*text2)); + ret = _wcsicmp(text1, text2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_PID) + { + l1 = PerfDataGetProcessId(Param1->Index); + l2 = PerfDataGetProcessId(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_USERNAME) + { + PerfDataGetUserName(Param1->Index, text1, sizeof (text1) / sizeof (*text1)); + PerfDataGetUserName(Param2->Index, text2, sizeof (text2) / sizeof (*text2)); + ret = _wcsicmp(text1, text2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_SESSIONID) + { + l1 = PerfDataGetSessionId(Param1->Index); + l2 = PerfDataGetSessionId(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_CPUUSAGE) + { + l1 = PerfDataGetCPUUsage(Param1->Index); + l2 = PerfDataGetCPUUsage(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_CPUTIME) + { + time1 = PerfDataGetCPUTime(Param1->Index); + time2 = PerfDataGetCPUTime(Param2->Index); + ret = largeintcmp(time1, time2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGE) + { + l1 = PerfDataGetWorkingSetSizeBytes(Param1->Index); + l2 = PerfDataGetWorkingSetSizeBytes(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_PEAKMEMORYUSAGE) + { + l1 = PerfDataGetPeakWorkingSetSizeBytes(Param1->Index); + l2 = PerfDataGetPeakWorkingSetSizeBytes(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGEDELTA) + { + l1 = PerfDataGetWorkingSetSizeDelta(Param1->Index); + l2 = PerfDataGetWorkingSetSizeDelta(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTS) + { + l1 = PerfDataGetPageFaultCount(Param1->Index); + l2 = PerfDataGetPageFaultCount(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTSDELTA) + { + l1 = PerfDataGetPageFaultCountDelta(Param1->Index); + l2 = PerfDataGetPageFaultCountDelta(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_VIRTUALMEMORYSIZE) + { + l1 = PerfDataGetVirtualMemorySizeBytes(Param1->Index); + l2 = PerfDataGetVirtualMemorySizeBytes(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEDPOOL) + { + l1 = PerfDataGetPagedPoolUsagePages(Param1->Index); + l2 = PerfDataGetPagedPoolUsagePages(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_NONPAGEDPOOL) + { + l1 = PerfDataGetNonPagedPoolUsagePages(Param1->Index); + l2 = PerfDataGetNonPagedPoolUsagePages(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_BASEPRIORITY) + { + l1 = PerfDataGetBasePriority(Param1->Index); + l2 = PerfDataGetBasePriority(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_HANDLECOUNT) + { + l1 = PerfDataGetHandleCount(Param1->Index); + l2 = PerfDataGetHandleCount(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_THREADCOUNT) + { + l1 = PerfDataGetThreadCount(Param1->Index); + l2 = PerfDataGetThreadCount(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_USEROBJECTS) + { + l1 = PerfDataGetUSERObjectCount(Param1->Index); + l2 = PerfDataGetUSERObjectCount(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_GDIOBJECTS) + { + l1 = PerfDataGetGDIObjectCount(Param1->Index); + l2 = PerfDataGetGDIObjectCount(Param2->Index); + ret = CMP(l1, l2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADS) + { + PerfDataGetIOCounters(Param1->Index, &iocounters1); + PerfDataGetIOCounters(Param2->Index, &iocounters2); + ull1 = iocounters1.ReadOperationCount; + ull2 = iocounters2.ReadOperationCount; + ret = CMP(ull1, ull2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITES) + { + PerfDataGetIOCounters(Param1->Index, &iocounters1); + PerfDataGetIOCounters(Param2->Index, &iocounters2); + ull1 = iocounters1.WriteOperationCount; + ull2 = iocounters2.WriteOperationCount; + ret = CMP(ull1, ull2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHER) + { + PerfDataGetIOCounters(Param1->Index, &iocounters1); + PerfDataGetIOCounters(Param2->Index, &iocounters2); + ull1 = iocounters1.OtherOperationCount; + ull2 = iocounters2.OtherOperationCount; + ret = CMP(ull1, ull2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADBYTES) + { + PerfDataGetIOCounters(Param1->Index, &iocounters1); + PerfDataGetIOCounters(Param2->Index, &iocounters2); + ull1 = iocounters1.ReadTransferCount; + ull2 = iocounters2.ReadTransferCount; + ret = CMP(ull1, ull2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITEBYTES) + { + PerfDataGetIOCounters(Param1->Index, &iocounters1); + PerfDataGetIOCounters(Param2->Index, &iocounters2); + ull1 = iocounters1.WriteTransferCount; + ull2 = iocounters2.WriteTransferCount; + ret = CMP(ull1, ull2); + } + else if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHERBYTES) + { + PerfDataGetIOCounters(Param1->Index, &iocounters1); + PerfDataGetIOCounters(Param2->Index, &iocounters2); + ull1 = iocounters1.OtherTransferCount; + ull2 = iocounters2.OtherTransferCount; + ret = CMP(ull1, ull2); + } + return ret; +}

1 0

[sginsberg] 41644: - Add some defines in preparation for _WINE. - Add missing ExtDeviceMode and PrivateExtractIconsA/W to PSDK and remove from Wine-only headers, as these are defined in the official PSDK.
by sginsberg＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: sginsberg Date: Sat Jun 27 23:06:00 2009 New Revision: 41644 URL: http://svn.reactos.org/svn/reactos?rev=41644&view=rev Log: - Add some defines in preparation for _WINE. - Add missing ExtDeviceMode and PrivateExtractIconsA/W to PSDK and remove from Wine-only headers, as these are defined in the official PSDK. Modified: trunk/reactos/include/crt/sys/types.h trunk/reactos/include/psdk/dlgs.h trunk/reactos/include/psdk/mmsystem.h trunk/reactos/include/psdk/prsht.h trunk/reactos/include/psdk/winnetwk.h trunk/reactos/include/psdk/winnls.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winspool.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/wine/winspool.h trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/include/crt/sys/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/types.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/types.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/types.h [iso-8859-1] Sat Jun 27 23:06:00 2009 @@ -36,4 +36,21 @@ # endif #endif +#ifdef _WINE +#ifndef _PID_T_ +#define _PID_T_ +#ifndef _WIN64 +typedef int _pid_t; +#else +typedef __int64 _pid_t; +#endif +#ifndef NO_OLDNAMES +#ifndef __pid_t_defined +#define __pid_t_defined +typedef _pid_t pid_t; +#endif /* __pid_t_defined */ +#endif +#endif /* Not _PID_T_ */ +#endif + #endif /* !_INC_TYPES */ Modified: trunk/reactos/include/psdk/dlgs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dlgs.h?rev=41… ============================================================================== --- trunk/reactos/include/psdk/dlgs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dlgs.h [iso-8859-1] Sat Jun 27 23:06:00 2009 @@ -15,6 +15,11 @@ #define FORMATDLGORD31 1543 #define FORMATDLGORD30 1544 #define RUNDLGORD 1545 + +#ifdef _WINE +#define OFN_DONTADDTORECENT 0x02000000 +#define OFN_ENABLEINCLUDENOTIFY 0x00400000 +#endif #if (WINVER >= 0x0400) #define PAGESETUPDLGORD 1546 Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Sat Jun 27 23:06:00 2009 @@ -126,6 +126,11 @@ #define DRV_RESTART DRVCNF_RESTART #define DRV_MCI_FIRST DRV_RESERVED #define DRV_MCI_LAST (DRV_RESERVED+0xFFF) +#ifdef _WINE +#define DRV_SUCCESS 0x0001 +#define DRV_FAILURE 0x0000 +#define DRV_EXITAPPLICATION 0x000C +#endif #define CALLBACK_TYPEMASK 0x70000 #define CALLBACK_NULL 0 #define CALLBACK_WINDOW 0x10000 @@ -905,6 +910,12 @@ #define MCI_OVLY_WHERE_DESTINATION 0x40000 #define MCI_OVLY_WHERE_FRAME 0x80000 #define MCI_OVLY_WHERE_VIDEO 0x100000 +#ifdef _WINE +#define MCI_OPEN_DRIVER 0x0801 +#define MCI_CLOSE_DRIVER 0x0802 +#define MCI_SOUND 0x0812 +#define MCI_SOUND_NAME 0x00000100L +#endif #define NEWTRANSPARENT 3 #define QUERYROPSUPPORT 40 #define SELECTDIB 41 @@ -920,6 +931,18 @@ #endif #ifndef SEEK_END #define SEEK_END 2 +#endif + +#ifdef _WINE +#define MAXWAVEDRIVERS 10 +#define MAXMIDIDRIVERS 10 +#define MAXAUXDRIVERS 10 +#define MAXMCIDRIVERS 32 +#define MAXMIXERDRIVERS 10 +#endif + +#ifdef _WINE +typedef LPCSTR HPCSTR; #endif typedef DWORD MCIERROR; @@ -1132,6 +1155,9 @@ DWORD dwEvent; DWORD dwParms[1]; } MIDIEVENT; +#ifdef _WINE +typedef struct midievent_tag *LPMIDIEVENT; +#endif typedef struct midistrmbuffver_tag { DWORD dwVersion; @@ -1507,6 +1533,24 @@ DWORD dwCallback; DWORD dwTo; } MCI_SEEK_PARMS, *PMCI_SEEK_PARMS,*LPMCI_SEEK_PARMS; + +#ifdef _WINE +typedef struct tagMCI_SOUND_PARMSA { + DWORD_PTR dwCallback; + LPCSTR lpstrSoundName; +} MCI_SOUND_PARMSA, *LPMCI_SOUND_PARMSA; + +typedef struct tagMCI_SOUND_PARMSW { + DWORD_PTR dwCallback; + LPCWSTR lpstrSoundName; +} MCI_SOUND_PARMSW, *LPMCI_SOUND_PARMSW; + +#ifdef UNICODE +typedef MCI_SOUND_PARMSW MCI_SOUND_PARMS; +#else +typedef MCI_SOUND_PARMSA MCI_SOUND_PARMS; +#endif +#endif typedef struct tagMCI_STATUS_PARMS { DWORD dwCallback; Modified: trunk/reactos/include/psdk/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/prsht.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/prsht.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/prsht.h [iso-8859-1] Sat Jun 27 23:06:00 2009 @@ -62,6 +62,10 @@ #define PSH_WIZARD97 0x00002000 #else #define PSH_WIZARD97 0x01000000 +#endif +#ifdef _WINE +#define PSH_WIZARD97_OLD 0x00002000 +#define PSH_WIZARD97_NEW 0x01000000 #endif #endif /* _WIN32_IE >= 0x0400 */ #if (_WIN32_IE >= 0x0500) Modified: trunk/reactos/include/psdk/winnetwk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnetwk.h?re… ============================================================================== --- trunk/reactos/include/psdk/winnetwk.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnetwk.h [iso-8859-1] Sat Jun 27 23:06:00 2009 @@ -287,6 +287,24 @@ DWORD WINAPI WNetRestoreConnectionW(HWND,LPCWSTR); DWORD APIENTRY MultinetGetConnectionPerformanceA(LPNETRESOURCEA,LPNETCONNECTINFOSTRUCT); DWORD APIENTRY MultinetGetConnectionPerformanceW(LPNETRESOURCEW,LPNETCONNECTINFOSTRUCT); + +#ifdef _WINE +typedef struct tagPASSWORD_CACHE_ENTRY +{ + WORD cbEntry; + WORD cbResource; + WORD cbPassword; + BYTE iEntry; + BYTE nType; + BYTE abResource[1]; +} PASSWORD_CACHE_ENTRY; + +typedef BOOL (CALLBACK *ENUMPASSWORDPROC)(PASSWORD_CACHE_ENTRY *, DWORD); +DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD ); +UINT WINAPI WNetEnumCachedPasswords( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD); +DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE ); +#endif + #ifdef UNICODE #define PFNPROCESSPOLICIES PFNPROCESSPOLICIESW #define PFNRECONCILEPROFILE PFNRECONCILEPROFILEW Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Sat Jun 27 23:06:00 2009 @@ -174,6 +174,9 @@ #endif #define CP_ACP 0 +#ifdef _WINE +#define CP_UNIXCP CP_ACP +#endif #define CP_OEMCP 1 #define CP_MACCP 2 #define CP_THREAD_ACP 3 Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jun 27 23:06:00 2009 @@ -70,11 +70,13 @@ #endif #endif +/*#ifdef _WINE*/ #if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) #define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) #else #define __WINE_ALLOC_SIZE(x) #endif +/*#endif*/ #ifndef FORCEINLINE #if (_MSC_VER >= 1200) @@ -881,6 +883,27 @@ #define LANG_YI 0x78 #define LANG_YORUBA 0x6a #define LANG_ZULU 0x35 + +#ifdef _WINE +#define LANG_ESPERANTO 0x8f +#define LANG_WALON 0x90 +#define LANG_CORNISH 0x91 + +#define LANG_GAELIC 0x94 +#define LANG_MALTESE 0x3a +#define LANG_ROMANSH 0x17 +#define LANG_SAAMI 0x3b +#define LANG_LOWER_SORBIAN 0x2e +#define LANG_UPPER_SORBIAN 0x2e +#define LANG_SUTU 0x30 +#define LANG_TAJIK 0x28 +#define LANG_TSONGA 0x31 +#define LANG_TSWANA 0x32 +#define LANG_VENDA 0x33 +#define LANG_XHOSA 0x34 +#define LANG_ZULU 0x35 +#endif + #define SUBLANG_CUSTOM_UNSPECIFIED 0x04 #define SUBLANG_CUSTOM_DEFAULT 0x03 #define SUBLANG_UI_CUSTOM_DEFAULT 0x05 Modified: trunk/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winspool.h?re… ============================================================================== --- trunk/reactos/include/psdk/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winspool.h [iso-8859-1] Sat Jun 27 23:06:00 2009 @@ -827,6 +827,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); BOOL WINAPI EnumPrintProcessorsA(LPSTR,LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); BOOL WINAPI EnumPrintProcessorsW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); +LONG WINAPI ExtDeviceMode(HWND,HANDLE,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD); BOOL WINAPI FindClosePrinterChangeNotification(HANDLE); HANDLE WINAPI FindFirstPrinterChangeNotification(HANDLE,DWORD,DWORD,PVOID); HANDLE WINAPI FindNextPrinterChangeNotification(HANDLE,PDWORD,PVOID,PVOID*); @@ -870,6 +871,11 @@ BOOL WINAPI SetPrinterW(HANDLE,DWORD,PBYTE,DWORD); BOOL WINAPI SetPrinterDataA(HANDLE,LPSTR,DWORD,PBYTE,DWORD); BOOL WINAPI SetPrinterDataW(HANDLE,LPWSTR,DWORD,PBYTE,DWORD); +#ifdef _WINE +LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc); +LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc); +#define StartDocDlg WINELIB_NAME_AW(StartDocDlg) +#endif DWORD WINAPI StartDocPrinterA(HANDLE,DWORD,PBYTE); DWORD WINAPI StartDocPrinterW(HANDLE,DWORD,PBYTE); BOOL WINAPI StartPagePrinter(HANDLE); Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sat Jun 27 23:06:00 2009 @@ -1938,6 +1938,9 @@ #define EN_VSCROLL 1538 #define LB_ADDFILE 406 #define LB_ADDSTRING 384 +#ifdef _WINE +#define LB_CARETOFF 420 +#endif #define LB_DELETESTRING 386 #define LB_DIR 397 #define LB_FINDSTRING 399 @@ -2026,6 +2029,9 @@ #define DCX_INTERSECTRGN 128 #define DCX_VALIDATE 0x200000 #define DCX_EXCLUDEUPDATE 0x100 +#ifdef _WINE +#define DCX_USESTYLE 0x10000 +#endif #define GMDI_GOINTOPOPUPS 2 #define GMDI_USEDISABLED 1 #define FKF_AVAILABLE 2 @@ -4151,6 +4157,8 @@ #if (_WIN32_WINNT >= 0x0501) BOOL WINAPI PrintWindow(HWND,HDC,UINT); #endif +UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); +UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); BOOL WINAPI PtInRect(LPCRECT,POINT); HWND WINAPI RealChildWindowFromPoint(HWND,POINT); UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT); @@ -4487,6 +4495,7 @@ #define PostAppMessage PostAppMessageW #define PostMessage PostMessageW #define PostThreadMessage PostThreadMessageW +#define PrivateExtractIcons PrivateExtractIconsW #define RealGetWindowClass RealGetWindowClassW #define RegisterClass RegisterClassW #define RegisterClassEx RegisterClassExW @@ -4654,6 +4663,7 @@ #define PostAppMessage PostAppMessageA #define PostMessage PostMessageA #define PostThreadMessage PostThreadMessageA +#define PrivateExtractIcons PrivateExtractIconsA #define RealGetWindowClass RealGetWindowClassA #define RegisterClass RegisterClassA #define RegisterClassEx RegisterClassExA Modified: trunk/reactos/include/reactos/wine/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winsp… ============================================================================== --- trunk/reactos/include/reactos/wine/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winspool.h [iso-8859-1] Sat Jun 27 23:06:00 2009 @@ -36,9 +36,6 @@ /* DECLARATIONS */ -LONG WINAPI ExtDeviceMode( HWND hWnd, HANDLE hInst, LPDEVMODEA pDevModeOutput, - LPSTR pDeviceName, LPSTR pPort, LPDEVMODEA pDevModeInput, LPSTR pProfile, - DWORD fMode); LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc); LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc); Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Sat Jun 27 23:06:00 2009 @@ -12,7 +12,4 @@ #define DCX_USESTYLE 0x00010000 #define LB_CARETOFF 0x01a4 -WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); -WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); - #endif /* __WINE_WINUSER_H */

1 0

[cwittich] 41643: fix two kernel32 locale winetests
by cwittich＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: cwittich Date: Sat Jun 27 22:46:10 2009 New Revision: 41643 URL: http://svn.reactos.org/svn/reactos?rev=41643&view=rev Log: fix two kernel32 locale winetests Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Sat Jun 27 22:46:10 2009 @@ -2533,6 +2533,8 @@ ret = wine_get_sortkey(dwMapFlags, srcW, srclenW, lpDestStr, cchDest); if (ret == 0) SetLastError(ERROR_INSUFFICIENT_BUFFER); + else + ret++; goto map_string_exit; }

1 0

[jimtabor] 41642: - Implement the rest of the HCBT_ support.
by jimtabor＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: jimtabor Date: Sat Jun 27 22:36:29 2009 New Revision: 41642 URL: http://svn.reactos.org/svn/reactos?rev=41642&view=rev Log: - Implement the rest of the HCBT_ support. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/window.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] Sat Jun 27 22:36:29 2009 @@ -414,15 +414,17 @@ CBT_CREATEWNDW CbtCreatewndw; CREATESTRUCTA Csa; CBT_CREATEWNDA CbtCreatewnda; - PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra; - WPARAM wParam; - LPARAM lParam; + PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra = NULL; + WPARAM wParam = 0; + LPARAM lParam = 0; PKBDLLHOOKSTRUCT KeyboardLlData; PMSLLHOOKSTRUCT MouseLlData; PMSG Msg; PMOUSEHOOKSTRUCT MHook; PCWPSTRUCT CWP; PCWPRETSTRUCT CWPR; + PRECTL prl; + LPCBTACTIVATESTRUCT pcbtas; Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; @@ -430,39 +432,59 @@ { case WH_CBT: switch(Common->Code) - { + { case HCBT_CREATEWND: CbtCreatewndExtra = (PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS) ((PCHAR) Common + Common->lParam); Csw = CbtCreatewndExtra->Cs; if (NULL != CbtCreatewndExtra->Cs.lpszName) - { + { Csw.lpszName = (LPCWSTR)((PCHAR) CbtCreatewndExtra + (ULONG) CbtCreatewndExtra->Cs.lpszName); - } + } if (0 != HIWORD(CbtCreatewndExtra->Cs.lpszClass)) - { + { Csw.lpszClass = (LPCWSTR)((PCHAR) CbtCreatewndExtra + LOWORD((ULONG) CbtCreatewndExtra->Cs.lpszClass)); - } + } wParam = Common->wParam; if (Common->Ansi) - { + { memcpy(&Csa, &Csw, sizeof(CREATESTRUCTW)); CbtCreatewnda.lpcs = &Csa; CbtCreatewnda.hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; lParam = (LPARAM) &CbtCreatewnda; - } + } else - { + { CbtCreatewndw.lpcs = &Csw; CbtCreatewndw.hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; lParam = (LPARAM) &CbtCreatewndw; - } + } break; + case HCBT_CLICKSKIPPED: + MHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); + lParam = (LPARAM) MHook; + break; + case HCBT_MOVESIZE: + prl = (PRECTL)((PCHAR) Common + Common->lParam); + lParam = (LPARAM) prl; + break; + case HCBT_ACTIVATE: + pcbtas = (LPCBTACTIVATESTRUCT)((PCHAR) Common + Common->lParam); + lParam = (LPARAM) pcbtas; + break; + case HCBT_KEYSKIPPED: + case HCBT_MINMAX: + case HCBT_SETFOCUS: + case HCBT_SYSCOMMAND: + case HCBT_DESTROYWND: + case HCBT_QS: + break; default: + ERR("HCBT_ not supported = %d\n", Common->Code); return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); - } + } if (Common->Proc) Result = Common->Proc(Common->Code, wParam, lParam); @@ -472,11 +494,11 @@ } switch(Common->Code) - { + { case HCBT_CREATEWND: CbtCreatewndExtra->WndInsertAfter = CbtCreatewndw.hwndInsertAfter; break; - } + } break; case WH_KEYBOARD_LL: KeyboardLlData = (PKBDLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); 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] Sat Jun 27 22:36:29 2009 @@ -391,6 +391,25 @@ } } break; + + case HCBT_MOVESIZE: + ArgumentLength += sizeof(RECTL); + break; + case HCBT_ACTIVATE: + ArgumentLength += sizeof(CBTACTIVATESTRUCT); + break; + case HCBT_CLICKSKIPPED: + ArgumentLength += sizeof(MOUSEHOOKSTRUCT); + break; +/* ATM pass on */ + case HCBT_KEYSKIPPED: + case HCBT_MINMAX: + case HCBT_SETFOCUS: + case HCBT_SYSCOMMAND: +/* These types pass through. */ + case HCBT_DESTROYWND: + case HCBT_QS: + break; default: DPRINT1("Trying to call unsupported CBT hook %d\n", Code); return 0; @@ -481,6 +500,18 @@ *((WCHAR *) Extra) = L'\0'; } break; + case HCBT_CLICKSKIPPED: + RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MOUSEHOOKSTRUCT)); + Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + break; + case HCBT_MOVESIZE: + RtlCopyMemory(Extra, (PVOID) lParam, sizeof(RECTL)); + Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + break; + case HCBT_ACTIVATE: + RtlCopyMemory(Extra, (PVOID) lParam, sizeof(CBTACTIVATESTRUCT)); + Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + break; } break; case WH_KEYBOARD_LL: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Jun 27 22:36:29 2009 @@ -2430,13 +2430,10 @@ IntDereferenceMessageQueue(Window->MessageQueue); /* Call hooks */ -#if 0 /* FIXME */ - - if (co_HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) hwnd, 0, TRUE)) + if (co_HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) Window->hSelf, 0)) { return FALSE; } -#endif IntEngWindowChanged(Window, WOC_DELETE); isChild = (0 != (Wnd->Style & WS_CHILD));

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
50
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 June 2009