Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[chorns] 16621: Clean referenced object libraries when cleaning a module

by chorns＠svn.reactos.com

Clean referenced object libraries when cleaning a module Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-17 14:09:57 UTC (rev 16620) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-17 15:10:03 UTC (rev 16621) @@ -452,13 +452,35 @@ return obj_file; } +string +MingwModuleHandler::GetModuleCleanTarget ( const Module& module ) const +{ + return module.name + "_clean"; +} + void +MingwModuleHandler::GetReferencedObjectLibraryModuleCleanTargets ( vector<string>& moduleNames ) const +{ + for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ ) + { + Library& library = *module.non_if_data.libraries[i]; + if ( library.importedModule->type == ObjectLibrary ) + moduleNames.push_back ( GetModuleCleanTarget ( *library.importedModule ) ); + } +} + +void MingwModuleHandler::GenerateCleanTarget () const { - if ( 0 == clean_files.size() ) - return; - fprintf ( fMakefile, ".PHONY: %s_clean\n", module.name.c_str() ); - fprintf ( fMakefile, "%s_clean:\n\t-@${rm}", module.name.c_str() ); + fprintf ( fMakefile, + ".PHONY: %s_clean\n", + module.name.c_str() ); + vector<string> referencedModuleNames; + GetReferencedObjectLibraryModuleCleanTargets ( referencedModuleNames ); + fprintf ( fMakefile, + "%s: %s\n\t-@${rm}", + GetModuleCleanTarget ( module ).c_str(), + v2s ( referencedModuleNames, 10 ).c_str () ); for ( size_t i = 0; i < clean_files.size(); i++ ) { if ( 9==((i+1)%10) ) _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-17 14:09:57 UTC (rev 16620) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-17 15:10:03 UTC (rev 16621) @@ -199,6 +199,8 @@ void GetRpcHeaderDependencies ( std::vector<std::string>& dependencies ) const; std::string GetRpcServerHeaderFilename ( std::string basename ) const; std::string GetRpcClientHeaderFilename ( std::string basename ) const; + std::string GetModuleCleanTarget ( const Module& module ) const; + void GetReferencedObjectLibraryModuleCleanTargets ( std::vector<std::string>& moduleNames ) const; public: const Module& module; string_list clean_files;

19 years, 3 months

[hpoussin] 16620: Return CR_FAILURE when the function is not implemented

by hpoussin＠svn.reactos.com

Return CR_FAILURE when the function is not implemented Call the right *_Ex function in CM_Get_Child and CM_Get_Parent Modified: trunk/reactos/lib/setupapi/cfgmgr.c _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-17 13:56:22 UTC (rev 16619) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-17 14:09:57 UTC (rev 16620) @@ -241,7 +241,7 @@ PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) { TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags); - return CM_Get_Sibling_Ex(pdnDevInst, dnDevInst, ulFlags, NULL); + return CM_Get_Child_Ex(pdnDevInst, dnDevInst, ulFlags, NULL); } @@ -252,7 +252,7 @@ PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) { FIXME("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); - return CR_SUCCESS; + return CR_FAILURE; } @@ -290,7 +290,7 @@ FIXME("%lx %p %ld %ld %lx\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); - return CR_SUCCESS; + return CR_FAILURE; } @@ -525,7 +525,7 @@ PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) { TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags); - return CM_Get_Sibling_Ex(pdnDevInst, dnDevInst, ulFlags, NULL); + return CM_Get_Parent_Ex(pdnDevInst, dnDevInst, ulFlags, NULL); } @@ -536,7 +536,7 @@ PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) { FIXME("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); - return CR_SUCCESS; + return CR_FAILURE; } @@ -558,7 +558,7 @@ PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) { FIXME("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); - return CR_SUCCESS; + return CR_FAILURE; }

19 years, 3 months

[hpoussin] 16619: Add registry key for PNP root device

by hpoussin＠svn.reactos.com

Add registry key for PNP root device Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-07-17 13:14:44 UTC (rev 16618) +++ trunk/reactos/bootdata/hivesys.inf 2005-07-17 13:56:22 UTC (rev 16619) @@ -368,6 +368,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.ex e" +; PNP Root device +HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,"" + ; 3Com 3c905 Driver HKLM,"SYSTEM\CurrentControlSet\Services\3c90x","ErrorControl",0x00010001 ,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\3c90x","Group",0x00000000,"NDIS"

19 years, 3 months

[mf] 16618: fix build of ctm

by mf＠svn.reactos.com

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

19 years, 3 months

[mf] 16617: replace TIME struct by LARGE_INTEGER

by mf＠svn.reactos.com

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

19 years, 3 months

[mf] 16616: fix ndk header usage

by mf＠svn.reactos.com

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"

19 years, 3 months

[mf] 16615: fix argc type

by mf＠svn.reactos.com

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];

19 years, 3 months

[mf] 16614: replace old <defines.h> by <windows.h>

by mf＠svn.reactos.com

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"

19 years, 3 months

[mf] 16613: replace old <defines.h> by <windows.h>

by mf＠svn.reactos.com

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"

19 years, 3 months

[jimtabor] 16612: Implemented NtUser-GetMenuItemRect.

by jimtabor＠svn.reactos.com

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; }

19 years, 3 months

← Newer
1
...
28
29
30
31
32
33
34
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005