Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mf] 16618: fix build of ctm
by mf＠svn.reactos.com 17 Jul '05

17 Jul '05

fix build of ctm Modified: trunk/rosapps/sysutils/ctm/ctm.c _____ Modified: trunk/rosapps/sysutils/ctm/ctm.c --- trunk/rosapps/sysutils/ctm/ctm.c 2005-07-17 12:51:28 UTC (rev 16617) +++ trunk/rosapps/sysutils/ctm/ctm.c 2005-07-17 13:14:44 UTC (rev 16618) @@ -31,8 +31,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -//#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows //headers -//#include <windows.h> +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows //headers +#include <windows.h> + #include <stdlib.h> #include <malloc.h> #include <memory.h> @@ -40,8 +41,9 @@ #include <process.h> #include <stdio.h> -#include <ddk/ntddk.h> +#define NTOS_MODE_USER #include <ndk/ntndk.h> + #include <epsapi/epsapi.h> #include "ctm.h" @@ -372,8 +374,8 @@ return; #endif // Get processor information - SysProcessorTimeInfo = (PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)malloc(sizeof(SYSTEM_PROCESSO R_PERFORMANCE_INFORMATION) * SystemBasicInfo.NumberProcessors); - status = NtQuerySystemInformation(SystemProcessorPerformanceInformation, SysProcessorTimeInfo, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * SystemBasicInfo.NumberProcessors, &ulSize); + SysProcessorTimeInfo = (PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)malloc(sizeof(SYSTEM_PROCESSO R_PERFORMANCE_INFORMATION) * SystemBasicInfo.NumberOfProcessors); + status = NtQuerySystemInformation(SystemProcessorPerformanceInformation, SysProcessorTimeInfo, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * SystemBasicInfo.NumberOfProcessors, &ulSize); // Get process information @@ -382,7 +384,7 @@ #ifdef TIMES liCurrentKernelTime.QuadPart = 0; liCurrentIdleTime.QuadPart = 0; - for (Idx=0; Idx<SystemBasicInfo.NumberProcessors; Idx++) { + for (Idx=0; Idx<SystemBasicInfo.NumberOfProcessors; Idx++) { liCurrentKernelTime.QuadPart += SysProcessorTimeInfo[Idx].KernelTime.QuadPart; liCurrentKernelTime.QuadPart += SysProcessorTimeInfo[Idx].DpcTime.QuadPart; liCurrentKernelTime.QuadPart += SysProcessorTimeInfo[Idx].InterruptTime.QuadPart; @@ -404,8 +406,8 @@ dbKernelTime = dbKernelTime / dbSystemTime; // CurrentCpuUsage% = 100 - (CurrentCpuIdle * 100) / NumberOfProcessors - dbIdleTime = 100.0 - dbIdleTime * 100.0 / (double)SystemBasicInfo.NumberProcessors;// + 0.5; - dbKernelTime = 100.0 - dbKernelTime * 100.0 / (double)SystemBasicInfo.NumberProcessors;// + 0.5; + dbIdleTime = 100.0 - dbIdleTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors;// + 0.5; + dbKernelTime = 100.0 - dbKernelTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors;// + 0.5; } // Store new CPU's idle and system time @@ -470,7 +472,7 @@ double CurTime = Li2Double(pSPI->KernelTime) + Li2Double(pSPI->UserTime); double OldTime = Li2Double(pPDOld->KernelTime) + Li2Double(pPDOld->UserTime); double CpuTime = (CurTime - OldTime) / dbSystemTime; - CpuTime = CpuTime * 100.0 / (double)SystemBasicInfo.NumberProcessors; // + 0.5; + CpuTime = CpuTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; // + 0.5; pPerfData[Idx].CPUUsage = (ULONG)CpuTime; #else

1 0

[mf] 16617: replace TIME struct by LARGE_INTEGER
by mf＠svn.reactos.com 17 Jul '05

17 Jul '05

replace TIME struct by LARGE_INTEGER Modified: trunk/rosapps/sysutils/ctm/ctm.h _____ Modified: trunk/rosapps/sysutils/ctm/ctm.h --- trunk/rosapps/sysutils/ctm/ctm.h 2005-07-17 12:50:56 UTC (rev 16616) +++ trunk/rosapps/sysutils/ctm/ctm.h 2005-07-17 12:51:28 UTC (rev 16617) @@ -33,7 +33,7 @@ WCHAR UserName[MAX_PATH]; ULONG SessionId; ULONG CPUUsage; - TIME CPUTime; + LARGE_INTEGER CPUTime; ULONG WorkingSetSizeBytes; ULONG PeakWorkingSetSizeBytes; ULONG WorkingSetSizeDelta; @@ -49,9 +49,9 @@ ULONG GDIObjectCount; //IO_COUNTERS IOCounters; - TIME UserTime; - TIME KernelTime; - LARGE_INTEGER CreateTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER KernelTime; + LARGE_INTEGER CreateTime; } PERFDATA, *PPERFDATA; #define SystemTimeInformation 3

1 0

[mf] 16616: fix ndk header usage
by mf＠svn.reactos.com 17 Jul '05

17 Jul '05

fix ndk header usage Modified: trunk/rosapps/sysutils/ctm/ctm.c _____ Modified: trunk/rosapps/sysutils/ctm/ctm.c --- trunk/rosapps/sysutils/ctm/ctm.c 2005-07-17 12:31:31 UTC (rev 16615) +++ trunk/rosapps/sysutils/ctm/ctm.c 2005-07-17 12:50:56 UTC (rev 16616) @@ -32,7 +32,7 @@ //#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows //headers -#include <windows.h> +//#include <windows.h> #include <stdlib.h> #include <malloc.h> #include <memory.h> @@ -41,8 +41,8 @@ #include <stdio.h> #include <ddk/ntddk.h> -#include <epsapi.h> -#include <ntos/zwtypes.h> +#include <ndk/ntndk.h> +#include <epsapi/epsapi.h> #include "ctm.h" #include "resource.h"

1 0

[mf] 16615: fix argc type
by mf＠svn.reactos.com 17 Jul '05

17 Jul '05

fix argc type Modified: trunk/rosapps/sysutils/ctm/ctm.c _____ Modified: trunk/rosapps/sysutils/ctm/ctm.c --- trunk/rosapps/sysutils/ctm/ctm.c 2005-07-17 12:31:16 UTC (rev 16614) +++ trunk/rosapps/sysutils/ctm/ctm.c 2005-07-17 12:31:31 UTC (rev 16615) @@ -559,7 +559,7 @@ } -int main(int *argc, char **argv) +int main(int argc, char **argv) { int i; TCHAR lpStr[80];

1 0

[mf] 16614: replace old <defines.h> by <windows.h>
by mf＠svn.reactos.com 17 Jul '05

17 Jul '05

replace old <defines.h> by <windows.h> Modified: trunk/rosapps/sysutils/ctm/ctm.rc Modified: trunk/rosapps/templates/dialog/dialog.rc Modified: trunk/rosapps/tests/carets/carets.rc Modified: trunk/rosapps/tests/dirdlg/dirdlg.rc Modified: trunk/rosapps/tests/icontest/icontest.rc Modified: trunk/rosapps/tests/mdi/mdi.rc Modified: trunk/rosapps/tests/miditest/miditest.rc Modified: trunk/rosapps/tests/popupmenu/popupmenu.rc _____ Modified: trunk/rosapps/sysutils/ctm/ctm.rc --- trunk/rosapps/sysutils/ctm/ctm.rc 2005-07-17 12:30:09 UTC (rev 16613) +++ trunk/rosapps/sysutils/ctm/ctm.rc 2005-07-17 12:31:16 UTC (rev 16614) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Console Task Manager\0" _____ Modified: trunk/rosapps/templates/dialog/dialog.rc --- trunk/rosapps/templates/dialog/dialog.rc 2005-07-17 12:30:09 UTC (rev 16613) +++ trunk/rosapps/templates/dialog/dialog.rc 2005-07-17 12:31:16 UTC (rev 16614) @@ -78,7 +78,7 @@ 2 TEXTINCLUDE DISCARDABLE BEGIN - "#include ""defines.h""\r\n" + "#include ""windows.h""\r\n" "#include ""reactos\\resource.h""\r\n" "#include ""resource.h""\r\n" "\0" _____ Modified: trunk/rosapps/tests/carets/carets.rc --- trunk/rosapps/tests/carets/carets.rc 2005-07-17 12:30:09 UTC (rev 16613) +++ trunk/rosapps/tests/carets/carets.rc 2005-07-17 12:31:16 UTC (rev 16614) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #include <reactos/resource.h> #include "resource.h" _____ Modified: trunk/rosapps/tests/dirdlg/dirdlg.rc --- trunk/rosapps/tests/dirdlg/dirdlg.rc 2005-07-17 12:30:09 UTC (rev 16613) +++ trunk/rosapps/tests/dirdlg/dirdlg.rc 2005-07-17 12:31:16 UTC (rev 16614) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #include <reactos/resource.h> #include "resource.h" _____ Modified: trunk/rosapps/tests/icontest/icontest.rc --- trunk/rosapps/tests/icontest/icontest.rc 2005-07-17 12:30:09 UTC (rev 16613) +++ trunk/rosapps/tests/icontest/icontest.rc 2005-07-17 12:31:16 UTC (rev 16614) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #include <reactos/resource.h> #include "resource.h" _____ Modified: trunk/rosapps/tests/mdi/mdi.rc --- trunk/rosapps/tests/mdi/mdi.rc 2005-07-17 12:30:09 UTC (rev 16613) +++ trunk/rosapps/tests/mdi/mdi.rc 2005-07-17 12:31:16 UTC (rev 16614) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #include <reactos/resource.h> #include "resource.h" _____ Modified: trunk/rosapps/tests/miditest/miditest.rc --- trunk/rosapps/tests/miditest/miditest.rc 2005-07-17 12:30:09 UTC (rev 16613) +++ trunk/rosapps/tests/miditest/miditest.rc 2005-07-17 12:31:16 UTC (rev 16614) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #include <reactos/resource.h> #include "resource.h" _____ Modified: trunk/rosapps/tests/popupmenu/popupmenu.rc --- trunk/rosapps/tests/popupmenu/popupmenu.rc 2005-07-17 12:30:09 UTC (rev 16613) +++ trunk/rosapps/tests/popupmenu/popupmenu.rc 2005-07-17 12:31:16 UTC (rev 16614) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #include <reactos/resource.h> #include "resource.h"

1 0

[mf] 16613: replace old <defines.h> by <windows.h>
by mf＠svn.reactos.com 17 Jul '05

17 Jul '05

replace old <defines.h> by <windows.h> Modified: trunk/rosapps/devutils/zoomin/zoomin.rc _____ Modified: trunk/rosapps/devutils/zoomin/zoomin.rc --- trunk/rosapps/devutils/zoomin/zoomin.rc 2005-07-17 12:26:24 UTC (rev 16612) +++ trunk/rosapps/devutils/zoomin/zoomin.rc 2005-07-17 12:30:09 UTC (rev 16613) @@ -1,6 +1,6 @@ -/* $Id: zoomin.rc,v 1.2 2004/10/16 22:30:17 gvg Exp $ */ +/* $Id$ */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Zoomin by Robert Dickenson\0"

1 0

[jimtabor] 16612: Implemented NtUser-GetMenuItemRect.
by jimtabor＠svn.reactos.com 17 Jul '05

17 Jul '05

Implemented NtUser-GetMenuItemRect. Modified: trunk/reactos/lib/user32/windows/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-07-17 12:24:15 UTC (rev 16611) +++ trunk/reactos/lib/user32/windows/menu.c 2005-07-17 12:26:24 UTC (rev 16612) @@ -3792,7 +3792,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL GetMenuItemRect(HWND hWnd, @@ -3800,8 +3800,7 @@ UINT uItem, LPRECT lprcItem) { - UNIMPLEMENTED; - return(FALSE); + return NtUserGetMenuItemRect( hWnd, hMenu, uItem, lprcItem); } _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-07-17 12:24:15 UTC (rev 16611) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-07-17 12:26:24 UTC (rev 16612) @@ -1558,7 +1558,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL NtUserGetMenuItemRect( @@ -1567,9 +1567,50 @@ UINT uItem, LPRECT lprcItem) { - UNIMPLEMENTED + ROSMENUINFO mi; + ROSMENUITEMINFO mii; + HWND referenceHwnd; + LPPOINT lpPoints; + LPRECT lpRect; + POINT FromOffset; + LONG XMove, YMove; + ULONG i; + NTSTATUS Status; + + if(!NtUserMenuItemInfo(hMenu, uItem, MF_BYPOSITION, &mii, FALSE)) + return FALSE; + + referenceHwnd = hWnd; - return 0; + if(!hWnd) + { + if(!NtUserMenuInfo(hMenu, &mi, FALSE)) return FALSE; + if(mi.Wnd == 0) return FALSE; + referenceHwnd = mi.Wnd; + } + + if (lprcItem == NULL) return FALSE; + *lpRect = mii.Rect; + lpPoints = (LPPOINT)lpRect; + + if(!NtUserGetClientOrigin(referenceHwnd, &FromOffset)) return FALSE; + + XMove = FromOffset.x; + YMove = FromOffset.y; + + for (i = 0; i < 2; i++) + { + lpPoints[i].x += XMove; + lpPoints[i].y += YMove; + } + + Status = MmCopyToCaller(lprcItem, lpPoints, sizeof(POINT)); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + return TRUE; }

1 0

[navaraf] 16611: DPC stands for Deferred Procedure Call.
by navaraf＠svn.reactos.com 17 Jul '05

17 Jul '05

DPC stands for Deferred Procedure Call. Modified: trunk/reactos/doc/INTERNALS _____ Modified: trunk/reactos/doc/INTERNALS --- trunk/reactos/doc/INTERNALS 2005-07-17 11:15:55 UTC (rev 16610) +++ trunk/reactos/doc/INTERNALS 2005-07-17 12:24:15 UTC (rev 16611) @@ -33,7 +33,7 @@ It is a design goal not to spend too much time in ISRs, for this reason ISRs should postpone most processing till it can run at a lower IRQL. The -mechanism for this is a Delayed Procedure Call (DPC). When a DPC object is +mechanism for this is a Deferred Procedure Call (DPC). When a DPC object is created, it is associated with a function. The DPC object can then be inserted in the DPC queue from an ISR. If the IRQL on return from the ISR is less than DISPATCH_LEVEL the DPC queue will be drained, otherwise this will happen when

1 0

[chorns] 16610: Avoid GNU make warnings
by chorns＠svn.reactos.com 17 Jul '05

17 Jul '05

Avoid GNU make warnings Modified: trunk/rosapps/sysutils/sysutils.xml _____ Modified: trunk/rosapps/sysutils/sysutils.xml --- trunk/rosapps/sysutils/sysutils.xml 2005-07-17 11:07:14 UTC (rev 16609) +++ trunk/rosapps/sysutils/sysutils.xml 2005-07-17 11:15:55 UTC (rev 16610) @@ -23,14 +23,21 @@ </directory> +<module name="win32err" type="objectlibrary"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <file>win32err.c</file> +</module> + <module name="chklib" type="win32cui" installbase="system32" installname="chklib.exe" warnings="true"> <linkerflag>--numeric-sort</linkerflag> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <library>kernel32</library> + <library>win32err</library> <file>chklib.c</file> - <file>win32err.c</file> <file>chklib.rc</file> </module> @@ -41,8 +48,8 @@ <define name="_WIN32_WINNT">0x0501</define> <library>kernel32</library> <library>user32</library> + <library>win32err</library> <file>shutdown.c</file> - <file>win32err.c</file> <file>shutdown.rc</file> </module> @@ -62,7 +69,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> + <library>win32err</library> <file>ldd.c</file> - <file>win32err.c</file> <file>ldd.rc</file> </module>

1 0

[chorns] 16609: Add missing directory tag
by chorns＠svn.reactos.com 17 Jul '05

17 Jul '05

Add missing directory tag Modified: trunk/reactos/modules/directory.xml _____ Modified: trunk/reactos/modules/directory.xml --- trunk/reactos/modules/directory.xml 2005-07-17 10:57:38 UTC (rev 16608) +++ trunk/reactos/modules/directory.xml 2005-07-17 11:07:14 UTC (rev 16609) @@ -1,5 +1,7 @@ -<xi:include href="rosapps/directory.xml"> - <xi:fallback> - <xi:include href="empty.xml" /> - </xi:fallback> -</xi:include> +<directory name="rosapps"> + <xi:include href="rosapps/directory.xml"> + <xi:fallback> + <xi:include href="empty.xml" /> + </xi:fallback> + </xi:include> +</directory>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs