Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 28119: Create directory before rbuild tries to access it
by hpoussin＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: hpoussin Date: Fri Aug 3 14:12:03 2007 New Revision: 28119 URL: http://svn.reactos.org/svn/reactos?rev=28119&view=rev Log: Create directory before rbuild tries to access it Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28119&r1=2811… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Fri Aug 3 14:12:03 2007 @@ -410,6 +410,7 @@ $(NCI_SERVICE_FILES) $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) + ${mkdir} $(INTERMEDIATE_)media$(SEP)inf 2>$(NUL) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw @$(MAKE) POSTAUTO

1 0

[hpoussin] 28118: Autogenerate syssetup.inf file in intermediate directory
by hpoussin＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: hpoussin Date: Fri Aug 3 13:41:42 2007 New Revision: 28118 URL: http://svn.reactos.org/svn/reactos?rev=28118&view=rev Log: Autogenerate syssetup.inf file in intermediate directory Modified: trunk/reactos/media/inf/inf.rbuild trunk/reactos/tools/rbuild/installfile.cpp trunk/reactos/tools/rbuild/syssetupgenerator.cpp Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=2… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild (original) +++ trunk/reactos/media/inf/inf.rbuild Fri Aug 3 13:41:42 2007 @@ -14,7 +14,7 @@ <installfile base="inf">nettcpip.inf</installfile> <installfile base="inf">ports.inf</installfile> <installfile base="inf">scsi.inf</installfile> -<installfile base="inf">syssetup.inf</installfile> +<installfile base="inf" root="intermediate">syssetup.inf</installfile> <installfile base="inf">usbport.inf</installfile> <installfile base="inf">usbstor.inf</installfile> <installfile base="inf">xboxdisp.inf</installfile> Modified: trunk/reactos/tools/rbuild/installfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/installfile.c… ============================================================================== --- trunk/reactos/tools/rbuild/installfile.cpp (original) +++ trunk/reactos/tools/rbuild/installfile.cpp Fri Aug 3 13:41:42 2007 @@ -23,8 +23,8 @@ using std::string; InstallFile::InstallFile ( const Project& project_, - const XMLElement& installfileNode, - const string& path ) + const XMLElement& installfileNode, + const string& path ) : project ( project_ ), node ( installfileNode ) { @@ -40,7 +40,24 @@ else newname = node.value; name = node.value; - this->path = path; + + att = node.GetAttribute ( "root", false ); + if ( att != NULL) + { + if ( att->value == "intermediate" ) + this->path = Environment::GetIntermediatePath () + sSep + path; + else if ( att->value == "output" ) + this->path = Environment::GetOutputPath () + sSep + path; + else + { + throw InvalidAttributeValueException ( + node.location, + "root", + att->value ); + } + } + else + this->path = path; } InstallFile::~InstallFile () Modified: trunk/reactos/tools/rbuild/syssetupgenerator.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/syssetupgener… ============================================================================== --- trunk/reactos/tools/rbuild/syssetupgenerator.cpp (original) +++ trunk/reactos/tools/rbuild/syssetupgenerator.cpp Fri Aug 3 13:41:42 2007 @@ -39,7 +39,7 @@ unsigned long errorLine; string syssetupTemplate = "media" + sSep + "inf" + sSep + "syssetup.inf.tpl"; - string syssetup = "media" + sSep + "inf" + sSep + "syssetup.inf"; + string syssetup = Environment::GetIntermediatePath() + sSep + "media" + sSep + "inf" + sSep + "syssetup.inf"; if ( 0 != InfHostOpenFile ( &inf, syssetupTemplate.c_str (), &errorLine ) ) throw new FileNotFoundException ( syssetupTemplate );

1 0

[dreimer] 28117: - Rename test to its real and final name. - Add it to help, Changelog and Macros. - Simplify reladdr2line. - Get rid of Temp File use in ssvn.cmd and Rosbe.cmd.
by dreimer＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: dreimer Date: Fri Aug 3 13:34:37 2007 New Revision: 28117 URL: http://svn.reactos.org/svn/reactos?rev=28117&view=rev Log: - Rename test to its real and final name. - Add it to help, Changelog and Macros. - Simplify reladdr2line. - Get rid of Temp File use in ssvn.cmd and Rosbe.cmd. Added: trunk/tools/RosBE-Windows/Root/scut.cmd Removed: trunk/tools/RosBE-Windows/Root/test.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/RosBE.mac trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Fri Aug 3 13:34:37 2007 @@ -1,6 +1,7 @@ *** Oct XXth, 2007 - RosBE 0.3.8 Released - Added DrFred's Config Tool. (Daniel Reimer) +- Added ShortCut Tool (Daniel Reimer) *** Aug XXst, 2007 - RosBE 0.3.7.2 Released (Unsupported) Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Fri Aug 3 13:34:37 2007 @@ -26,6 +26,8 @@ echo with the appropriate number. echo basedir - Switch back to the ReactOS source directory. echo. + echo scut - Define, Remove and Switch to Shortcutted Source- + echo Directories. echo config [OPTIONS] - Configures the way, ReactOS will be built. echo. echo clean [logs] - Fully clean the ReactOS source directory and/or @@ -108,6 +110,16 @@ echo Switches back to the ReactOS source directory. goto :EOF ) +if "%1" == "scut" ( + echo Usage: scut [OPTIONS] + echo Defines, Removes and Switches to Shortcutted Source Directories. + echo. + echo add - Adds a Shortcut. + echo (Optional: "Shortcut" "Directory" as second and third parameter) + echo remove - Removes a shortcut. + echo (Optional: "Shortcut" as second parameter) + goto :EOF +) if not "%1" == "" ( echo Unknown parameter specified. Try 'help [COMMAND]'. goto :EOF Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Fri Aug 3 13:34:37 2007 @@ -17,9 +17,7 @@ color 0A set _VER=0.3.7.2 set ROSBEBASEDIR=%~dp0 -echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed "s/.$//g" > "%Temp%\aaa.tmp" -set /P ROSBEBASEDIR=< "%Temp%\aaa.tmp" -del "%Temp%\aaa.tmp" +for /f "usebackq" %%i in (`"echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed s/.$//g"`) do @SET ROSBEBASEDIR=%%i set ROSBE_SHOWTIME=1 set ROSBE_WRITELOG=1 set _LOGDIR=%CD%\RosBE-Logs Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Fri Aug 3 13:34:37 2007 @@ -6,3 +6,4 @@ MAKE = "%ROSBEBASEDIR%\Build.cmd" $* MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* RADDR2LINE = "%ROSBEBASEDIR%\reladdr2line.cmd" $* +SCUT = "%ROSBEBASEDIR%\scut.cmd" $* Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Fri Aug 3 13:34:37 2007 @@ -14,16 +14,16 @@ :: :: Receive the Parameters and decide what to do. :: -set _1=%1 -set _2=%2 -if "%_1%" == "" ( +if "%1" == "" ( goto :MAN ) -if not "%_1%" == "" ( - if "%_2%" == "" ( +if not "%1" == "" ( + set _1=%1 + if "%2" == "" ( goto :AUTO1 ) else ( + set _2=%2 goto :EOC ) ) @@ -34,16 +34,9 @@ :MAN echo Set the Path to the Executable to be examined. SET /P _1= +:AUTO1 echo Set the Address you wanna analyze inside the Executable. SET /P _2= -echo. -goto :EOC - -:AUTO1 -echo Set the Address you wanna analyze inside the Executable. -echo. -SET /P _2= -goto :EOC :EOC :: Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Fri Aug 3 13:34:37 2007 @@ -57,8 +57,7 @@ if "%1" == "status" ( title Status for /f "usebackq" %%i IN (`svnversion .`) DO @set OFFSVN=%%i - svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn > "%ROSBEBASEDIR%\onsvn.tmp" - set /P ONSVN=< "%ROSBEBASEDIR%\onsvn.tmp" + for /f "usebackq" %%j IN (`"svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn"`) DO @set ONSVN=%%j call :UP goto :ExitSVN ) @@ -71,7 +70,6 @@ :UP echo Recent Offline Revision: %OFFSVN% echo Online HEAD Revision: %ONSVN% -del "%ROSBEBASEDIR%\onsvn.tmp" echo. if %OFFSVN% LSS %ONSVN% ( echo Your Tree is not Up to date. Do you want to update it? Added: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (added) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Fri Aug 3 13:34:37 2007 @@ -1,0 +1,79 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/scut.cmd +:: PURPOSE: Shortcut Creator, Remover and Switcher. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +title Choose your Source Folder... + +if /I "%1"=="" ( + goto :DEF +) +if /I "%1"=="add" ( + goto :ADD +) +if /I "%1"=="remove" ( + goto :REM +) +) else ( + set XY=%1 + goto :RUN +) +goto :END + +:DEF +echo Choose your Source Folder: +SET /P XY= +goto :RUN + +:RUN +for /f "usebackq" %%i in (`"grep \"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir"`) do @SET dir=%%i +cd /D %dir% +goto :END + +:ADD +if not "%2" == "" ( + if not "%3" == "" ( + set CUT=%2 + set DIR=%3 + goto :ADD23 + ) else ( + set CUT=%2 + goto :ADD2 + ) +) else ( + goto :ADD1 +) + +:ADD1 +echo Choose your Shortcut: +SET /P CUT= +:ADD2 +echo Choose your Source Folder: +SET /P DIR= +:ADD23 +echo ^<property name="%CUT%" value="%DIR%" /^> > "%ROSBEBASEDIR%\aaa.tmp" +copy "%ROSBEBASEDIR%\srclist.xml" + "%ROSBEBASEDIR%\aaa.tmp" "%ROSBEBASEDIR%\srclist2.xml" +del "%ROSBEBASEDIR%\srclist.xml" +ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml +goto :END + +:REM +if not "%2" == "" ( + set CUTREM=%2 + goto :REM1 +) +echo Choose your Shortcut: +SET /P CUTREM= +:REM1 +grep -v \"%CUTREM%\" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml" +del "%ROSBEBASEDIR%\srclist.xml" +ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml +goto :END + +:END +title ReactOS Build Environment %_VER% Removed: trunk/tools/RosBE-Windows/Root/test.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/test.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/test.cmd (original) +++ trunk/tools/RosBE-Windows/Root/test.cmd (removed) @@ -1,60 +1,0 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See COPYING in the top level directory -:: FILE: Root/test.cmd -:: PURPOSE: First step in the direction of a Multiple Source Tree "Compatible" RosBE. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> -:: -:: -@echo off - -title Choose your Source Folder... - -if /I "%1"=="" ( - goto :DEF -) -if /I "%1"=="add" ( - goto :ADD -) -if /I "%1"=="remove" ( - goto :REM -) -) else ( - set XY=%1 - goto :RUN -) -goto :END - -:DEF -echo Choose your Source Folder: -SET /P XY= -goto :RUN - -:RUN -grep \"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp" -set /P dir=< "%ROSBEBASEDIR%\aaa.tmp" -del "%ROSBEBASEDIR%\aaa.tmp" -cd /D %dir% -goto :END - -:ADD -echo Choose your Shortcut: -SET /P CUT= -echo Choose your Source Folder: -SET /P DIR= -echo ^<property name="%CUT%" value="%DIR%" /^> > "%ROSBEBASEDIR%\aaa.tmp" -copy "%ROSBEBASEDIR%\srclist.xml" + "%ROSBEBASEDIR%\aaa.tmp" "%ROSBEBASEDIR%\srclist2.xml" -del "%ROSBEBASEDIR%\srclist.xml" -ren "%ROSBEBASEDIR%\srclist2.xml" "srclist.xml" -goto :END - -:REM -echo Choose your Shortcut: -SET /P CUTREM= -grep -v \"%CUTREM%\" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml" -del "%ROSBEBASEDIR%\srclist.xml" -ren "%ROSBEBASEDIR%\srclist2.xml" "srclist.xml" -goto :END - -:END -title ReactOS Build Environment %_VER%

1 0

[hpoussin] 28116: Create the invisible SAS window even in setup mode Explicitly reboot at the end of 2nd stage See issue #2431 for more details.
by hpoussin＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: hpoussin Date: Fri Aug 3 13:28:01 2007 New Revision: 28116 URL: http://svn.reactos.org/svn/reactos?rev=28116&view=rev Log: Create the invisible SAS window even in setup mode Explicitly reboot at the end of 2nd stage See issue #2431 for more details. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/setup.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Fri Aug 3 13:28:01 2007 @@ -794,8 +794,13 @@ WNDCLASSEXW swc; BOOL ret = FALSE; - /* register SAS window class. - * WARNING! MAKE SURE WE ARE IN THE WINLOGON DESKTOP! */ + if (!SwitchDesktop(Session->WinlogonDesktop)) + { + ERR("WL: Failed to switch to winlogon desktop\n"); + goto cleanup; + } + + /* Register SAS window class */ swc.cbSize = sizeof(WNDCLASSEXW); swc.style = CS_SAVEBITS; swc.lpfnWndProc = SASWindowProc; @@ -814,7 +819,7 @@ goto cleanup; } - /* create invisible SAS window */ + /* Create invisible SAS window */ Session->SASWindow = CreateWindowExW( 0, WINLOGON_SAS_CLASS, Modified: trunk/reactos/base/system/winlogon/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.c (original) +++ trunk/reactos/base/system/winlogon/setup.c Fri Aug 3 13:28:01 2007 @@ -85,8 +85,8 @@ } -BOOL -RunSetup (VOID) +static DWORD WINAPI +RunSetupThreadProc (IN LPVOID lpParameter) { PROCESS_INFORMATION ProcessInformation; STARTUPINFOW StartupInfo; @@ -184,4 +184,13 @@ } +BOOL +RunSetup (VOID) +{ + HANDLE hThread; + + hThread = CreateThread(NULL, 0, RunSetupThreadProc, NULL, 0, NULL); + return hThread != NULL; +} + /* EOF */ Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Fri Aug 3 13:28:01 2007 @@ -155,130 +155,6 @@ return TRUE; } - -#if 0 -static BOOL -OpenRegistryKey( - OUT HKEY *WinLogonKey) -{ - return ERROR_SUCCESS == RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\WinLogon", - 0, - KEY_QUERY_VALUE, - WinLogonKey); -} -#endif - -#if 0 -static BOOL -StartProcess( - IN PWCHAR ValueName) -{ - BOOL StartIt; - HKEY WinLogonKey; - DWORD Type; - DWORD Size; - DWORD StartValue; - - StartIt = TRUE; - if (OpenRegistryKey(&WinLogonKey)) - { - Size = sizeof(DWORD); - if (ERROR_SUCCESS == RegQueryValueEx(WinLogonKey, - ValueName, - NULL, - &Type, - (LPBYTE) &StartValue, - &Size)) - { - if (REG_DWORD == Type) - { - StartIt = (0 != StartValue); - } - } - RegCloseKey(WinLogonKey); - } - - return StartIt; -} -#endif - -/* -static BOOL RestartShell( - IN OUT PWLSESSION Session) -{ - HKEY WinLogonKey; - DWORD Type, Size, Value; - - if(OpenRegistryKey(&WinLogonKey)) - { - Size = sizeof(DWORD); - if(ERROR_SUCCESS == RegQueryValueEx(WinLogonKey, - L"AutoRestartShell", - NULL, - &Type, - (LPBYTE)&Value, - &Size)) - { - if(Type == REG_DWORD) - { - RegCloseKey(WinLogonKey); - return (Value != 0); - } - } - RegCloseKey(WinLogonKey); - } - return FALSE; -} -*/ - -#if 0 -static PWCHAR -GetUserInit( - OUT WCHAR *CommandLine, - IN DWORD BufferLength) -{ - HKEY WinLogonKey; - BOOL GotCommandLine; - DWORD Type; - DWORD Size; - WCHAR Shell[_MAX_PATH]; - - GotCommandLine = FALSE; - if (OpenRegistryKey(&WinLogonKey)) - { - Size = MAX_PATH; - if (ERROR_SUCCESS == RegQueryValueEx(WinLogonKey, - L"UserInit", - NULL, - &Type, - (LPBYTE) Shell, - &Size)) - { - if (REG_EXPAND_SZ == Type) - { - ExpandEnvironmentStrings(Shell, CommandLine, _MAX_PATH); - GotCommandLine = TRUE; - } - else if (REG_SZ == Type) - { - wcscpy(CommandLine, Shell); - GotCommandLine = TRUE; - } - } - RegCloseKey(WinLogonKey); - } - - if (! GotCommandLine) - { - GetSystemDirectory(CommandLine, MAX_PATH - 15); - wcscat(CommandLine, L"\\userinit.exe"); - } - - return CommandLine; -} - -#endif BOOL DisplayStatusMessage( @@ -410,22 +286,6 @@ ExitProcess(1); } - /* Check for pending setup */ - if (GetSetupType() != 0) - { - TRACE("WL: Setup mode detected\n"); - - /* Set locale */ - SetDefaultLanguage(FALSE); - - /* Run setup and reboot when done */ - SwitchDesktop(WLSession->ApplicationDesktop); - RunSetup(); - - HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); - ExitProcess(0); - } - if (!StartLsass()) { ERR("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError()); @@ -489,7 +349,18 @@ /* Display logged out screen */ WLSession->LogonStatus = WKSTA_IS_LOGGED_OFF; RemoveStatusMessage(WLSession); - PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_TIMEOUT, 0); + + /* Check for pending setup */ + if (GetSetupType() != 0) + { + TRACE("WL: Setup mode detected\n"); + + /* Run setup and reboot when done */ + SwitchDesktop(WLSession->ApplicationDesktop); + RunSetup(); + } + else + PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_TIMEOUT, 0); /* Message loop for the SAS window */ while (GetMessageW(&Msg, WLSession->SASWindow, 0, 0)) Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Fri Aug 3 13:28:01 2007 @@ -570,8 +570,7 @@ if (!res) goto cleanup; - /* Wait for process termination */ - WaitForSingleObject(ProcessInformation.hProcess, INFINITE); + return 0; cleanup: MessageBoxA( @@ -728,6 +727,7 @@ /// DO NOT REMOVE!!! DbgPrint("SYSREG_CHECKPOINT:SYSSETUP_COMPLETE\n"); + ExitWindowsEx(EWX_REBOOT, 0); return 0; }

1 0

[weiden] 28115: Remove GetClassLong hack for GCL_MENUNAME, this is no longer needed
by weiden＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: weiden Date: Fri Aug 3 12:19:47 2007 New Revision: 28115 URL: http://svn.reactos.org/svn/reactos?rev=28115&view=rev Log: Remove GetClassLong hack for GCL_MENUNAME, this is no longer needed Modified: trunk/reactos/dll/win32/user32/windows/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c (original) +++ trunk/reactos/dll/win32/user32/windows/class.c Fri Aug 3 12:19:47 2007 @@ -215,16 +215,6 @@ return hBrush; } - case GCL_MENUNAME: - { - PUNICODE_STRING Name; - Name = (PUNICODE_STRING)NtUserGetClassLong(hWnd, nIndex, TRUE); - if (IS_INTRESOURCE(Name)) - return (DWORD)Name; - else - return (DWORD)heap_string_poolA(Name->Buffer, Name->Length); - } - default: return NtUserGetClassLong(hWnd, nIndex, TRUE); } @@ -246,16 +236,6 @@ if (hBrush != 0 && hBrush < 0x4000) hBrush = (DWORD)GetSysColorBrush((ULONG)hBrush - 1); return hBrush; - } - - case GCL_MENUNAME: - { - PUNICODE_STRING Name; - Name = (PUNICODE_STRING)NtUserGetClassLong(hWnd, nIndex, FALSE); - if (IS_INTRESOURCE(Name)) - return (DWORD)Name; - else - return (DWORD)heap_string_poolW(Name->Buffer, Name->Length); } default:

1 0

[weiden] 28114: Patch by Carlo Bramix <carlo.bramix@libero.it> - Get rid of some code duplication See issue #2517 for more details.
by weiden＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: weiden Date: Fri Aug 3 11:35:39 2007 New Revision: 28114 URL: http://svn.reactos.org/svn/reactos?rev=28114&view=rev Log: Patch by Carlo Bramix <carlo.bramix(a)libero.it> - Get rid of some code duplication See issue #2517 for more details. Modified: trunk/reactos/base/applications/taskmgr/column.c trunk/reactos/base/applications/taskmgr/column.h trunk/reactos/base/applications/taskmgr/precomp.h trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/applications/taskmgr/taskmgr.h Modified: trunk/reactos/base/applications/taskmgr/column.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/column.c (original) +++ trunk/reactos/base/applications/taskmgr/column.c Fri Aug 3 11:35:39 2007 @@ -23,8 +23,39 @@ #include <precomp.h> -UINT ColumnDataHints[25]; +UINT ColumnDataHints[COLUMN_NMAX]; TCHAR szTemp[256]; + +#define DECLARE_COLUMN_PRESET(_name, _size, _state) \ + { IDS_TAB_##_name, IDC_##_name, _size, _state }, + +const PresetColumnEntry ColumnPresets[COLUMN_NMAX] = { + DECLARE_COLUMN_PRESET(IMAGENAME, 105, TRUE) + DECLARE_COLUMN_PRESET(PID, 50, TRUE) + DECLARE_COLUMN_PRESET(USERNAME, 107, FALSE) + DECLARE_COLUMN_PRESET(SESSIONID, 70, FALSE) + DECLARE_COLUMN_PRESET(CPUUSAGE, 35, TRUE) + DECLARE_COLUMN_PRESET(CPUTIME, 70, TRUE) + DECLARE_COLUMN_PRESET(MEMORYUSAGE, 70, TRUE) + DECLARE_COLUMN_PRESET(PEAKMEMORYUSAGE, 100, FALSE) + DECLARE_COLUMN_PRESET(MEMORYUSAGEDELTA, 70, FALSE) + DECLARE_COLUMN_PRESET(PAGEFAULTS, 70, FALSE) + DECLARE_COLUMN_PRESET(PAGEFAULTSDELTA, 70, FALSE) + DECLARE_COLUMN_PRESET(VIRTUALMEMORYSIZE, 70, FALSE) + DECLARE_COLUMN_PRESET(PAGEDPOOL, 70, FALSE) + DECLARE_COLUMN_PRESET(NONPAGEDPOOL, 70, FALSE) + DECLARE_COLUMN_PRESET(BASEPRIORITY, 60, FALSE) + DECLARE_COLUMN_PRESET(HANDLECOUNT, 60, FALSE) + DECLARE_COLUMN_PRESET(THREADCOUNT, 60, FALSE) + DECLARE_COLUMN_PRESET(USEROBJECTS, 60, FALSE) + DECLARE_COLUMN_PRESET(GDIOBJECTS, 60, FALSE) + DECLARE_COLUMN_PRESET(IOREADS, 70, FALSE) + DECLARE_COLUMN_PRESET(IOWRITES, 70, FALSE) + DECLARE_COLUMN_PRESET(IOOTHER, 70, FALSE) + DECLARE_COLUMN_PRESET(IOREADBYTES, 70, FALSE) + DECLARE_COLUMN_PRESET(IOWRITEBYTES, 70, FALSE) + DECLARE_COLUMN_PRESET(IOOTHERBYTES, 70, FALSE) +}; int InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); INT_PTR CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); @@ -32,126 +63,14 @@ void AddColumns(void) { LRESULT size; - - if (TaskManagerSettings.Column_ImageName) { - LoadString(hInst, IDS_TAB_IMAGENAME, szTemp, 256); - InsertColumn(0, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[0], -1); - } - if (TaskManagerSettings.Column_PID) { - LoadString(hInst, IDS_TAB_PID, szTemp, 256); - InsertColumn(1, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[1], -1); - } - if (TaskManagerSettings.Column_UserName) { - LoadString(hInst, IDS_TAB_USERNAME, szTemp, 256); - InsertColumn(2, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[2], -1); - } - if (TaskManagerSettings.Column_SessionID) { - LoadString(hInst, IDS_TAB_SESSIONID, szTemp, 256); - InsertColumn(3, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[3], -1); - } - if (TaskManagerSettings.Column_CPUUsage) { - LoadString(hInst, IDS_TAB_CPU, szTemp, 256); - InsertColumn(4, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[4], -1); - } - - if (TaskManagerSettings.Column_CPUTime) { - LoadString(hInst, IDS_TAB_CPUTIME, szTemp, 256); - InsertColumn(5, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[5], -1); - } - - if (TaskManagerSettings.Column_MemoryUsage) { - LoadString(hInst, IDS_TAB_MEMUSAGE, szTemp, 256); - InsertColumn(6, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[6], -1); - } - - if (TaskManagerSettings.Column_PeakMemoryUsage) { - LoadString(hInst, IDS_TAB_PEAKMEMUSAGE, szTemp, 256); - InsertColumn(7, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[7], -1); - } - - if (TaskManagerSettings.Column_MemoryUsageDelta) { - LoadString(hInst, IDS_TAB_MEMDELTA, szTemp, 256); - InsertColumn(8, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[8], -1); - } - - if (TaskManagerSettings.Column_PageFaults) { - LoadString(hInst, IDS_TAB_PAGEFAULT, szTemp, 256); - InsertColumn(9, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[9], -1); - } - - if (TaskManagerSettings.Column_PageFaultsDelta) { - LoadString(hInst, IDS_TAB_PFDELTA, szTemp, 256); - InsertColumn(10, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[10], -1); - } - - if (TaskManagerSettings.Column_VirtualMemorySize) { - LoadString(hInst, IDS_TAB_VMSIZE, szTemp, 256); - InsertColumn(11, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[11], -1); - } - - if (TaskManagerSettings.Column_PagedPool) { - LoadString(hInst, IDS_TAB_PAGEDPOOL, szTemp, 256); - InsertColumn(12, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[12], -1); - } - - if (TaskManagerSettings.Column_NonPagedPool) { - LoadString(hInst, IDS_TAB_NPPOOL, szTemp, 256); - InsertColumn(13, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[13], -1); - } - - if (TaskManagerSettings.Column_BasePriority) { - LoadString(hInst, IDS_TAB_BASEPRI, szTemp, 256); - InsertColumn(14, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[14], -1); - } - - if (TaskManagerSettings.Column_HandleCount) { - LoadString(hInst, IDS_TAB_HANDLES, szTemp, 256); - InsertColumn(15, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[15], -1); - } - - if (TaskManagerSettings.Column_ThreadCount) { - LoadString(hInst, IDS_TAB_THREADS, szTemp, 256); - InsertColumn(16, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[16], -1); - } - - if (TaskManagerSettings.Column_USERObjects) { - LoadString(hInst, IDS_TAB_USERPBJECTS, szTemp, 256); - InsertColumn(17, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[17], -1); - } - - if (TaskManagerSettings.Column_GDIObjects) { - LoadString(hInst, IDS_TAB_GDIOBJECTS, szTemp, 256); - InsertColumn(18, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[18], -1); - } - - if (TaskManagerSettings.Column_IOReads) { - LoadString(hInst, IDS_TAB_IOREADS, szTemp, 256); - InsertColumn(19, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[19], -1); - } - - if (TaskManagerSettings.Column_IOWrites) { - LoadString(hInst, IDS_TAB_IOWRITES, szTemp, 256); - InsertColumn(20, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[20], -1); - } - - if (TaskManagerSettings.Column_IOOther) { - LoadString(hInst, IDS_TAB_IOOTHER, szTemp, 256); - InsertColumn(21, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[21], -1); - } - - if (TaskManagerSettings.Column_IOReadBytes) { - LoadString(hInst, IDS_TAB_IOREADBYTES, szTemp, 256); - InsertColumn(22, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[22], -1); - } - - if (TaskManagerSettings.Column_IOWriteBytes) { - LoadString(hInst, IDS_TAB_IOWRITESBYTES, szTemp, 256); - InsertColumn(23, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[23], -1); - } - - if (TaskManagerSettings.Column_IOOtherBytes) { - LoadString(hInst, IDS_TAB_IOOTHERBYTES, szTemp, 256); - InsertColumn(24, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[24], -1); + TCHAR szTemp[256]; + unsigned int n; + + for (n=0; n<COLUMN_NMAX; n++) { + if (TaskManagerSettings.Columns[n]) { + LoadString(hInst, ColumnPresets[n].dwIdsName, szTemp, sizeof(szTemp)/sizeof(TCHAR)); + InsertColumn(n, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[n], -1); + } } size = SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); @@ -186,64 +105,16 @@ void SaveColumnSettings(void) { HDITEM hditem; - int i; + unsigned int i, n; TCHAR text[260]; LRESULT size; /* Reset column data */ - for (i=0; i<25; i++) + for (i=0; i<COLUMN_NMAX; i++) { TaskManagerSettings.ColumnOrderArray[i] = i; - - TaskManagerSettings.Column_ImageName = FALSE; - TaskManagerSettings.Column_PID = FALSE; - TaskManagerSettings.Column_CPUUsage = FALSE; - TaskManagerSettings.Column_CPUTime = FALSE; - TaskManagerSettings.Column_MemoryUsage = FALSE; - TaskManagerSettings.Column_MemoryUsageDelta = FALSE; - TaskManagerSettings.Column_PeakMemoryUsage = FALSE; - TaskManagerSettings.Column_PageFaults = FALSE; - TaskManagerSettings.Column_USERObjects = FALSE; - TaskManagerSettings.Column_IOReads = FALSE; - TaskManagerSettings.Column_IOReadBytes = FALSE; - TaskManagerSettings.Column_SessionID = FALSE; - TaskManagerSettings.Column_UserName = FALSE; - TaskManagerSettings.Column_PageFaultsDelta = FALSE; - TaskManagerSettings.Column_VirtualMemorySize = FALSE; - TaskManagerSettings.Column_PagedPool = FALSE; - TaskManagerSettings.Column_NonPagedPool = FALSE; - TaskManagerSettings.Column_BasePriority = FALSE; - TaskManagerSettings.Column_HandleCount = FALSE; - TaskManagerSettings.Column_ThreadCount = FALSE; - TaskManagerSettings.Column_GDIObjects = FALSE; - TaskManagerSettings.Column_IOWrites = FALSE; - TaskManagerSettings.Column_IOWriteBytes = FALSE; - TaskManagerSettings.Column_IOOther = FALSE; - TaskManagerSettings.Column_IOOtherBytes = FALSE; - TaskManagerSettings.ColumnSizeArray[0] = 105; - TaskManagerSettings.ColumnSizeArray[1] = 50; - TaskManagerSettings.ColumnSizeArray[2] = 107; - TaskManagerSettings.ColumnSizeArray[3] = 70; - TaskManagerSettings.ColumnSizeArray[4] = 35; - TaskManagerSettings.ColumnSizeArray[5] = 70; - TaskManagerSettings.ColumnSizeArray[6] = 70; - TaskManagerSettings.ColumnSizeArray[7] = 100; - TaskManagerSettings.ColumnSizeArray[8] = 70; - TaskManagerSettings.ColumnSizeArray[9] = 70; - TaskManagerSettings.ColumnSizeArray[10] = 70; - TaskManagerSettings.ColumnSizeArray[11] = 70; - TaskManagerSettings.ColumnSizeArray[12] = 70; - TaskManagerSettings.ColumnSizeArray[13] = 70; - TaskManagerSettings.ColumnSizeArray[14] = 60; - TaskManagerSettings.ColumnSizeArray[15] = 60; - TaskManagerSettings.ColumnSizeArray[16] = 60; - TaskManagerSettings.ColumnSizeArray[17] = 60; - TaskManagerSettings.ColumnSizeArray[18] = 60; - TaskManagerSettings.ColumnSizeArray[19] = 70; - TaskManagerSettings.ColumnSizeArray[20] = 70; - TaskManagerSettings.ColumnSizeArray[21] = 70; - TaskManagerSettings.ColumnSizeArray[22] = 70; - TaskManagerSettings.ColumnSizeArray[23] = 70; - TaskManagerSettings.ColumnSizeArray[24] = 70; + TaskManagerSettings.Columns[i] = FALSE; + TaskManagerSettings.ColumnSizeArray[i] = ColumnPresets[i].size; + } /* Get header order */ size = SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); @@ -259,179 +130,13 @@ SendMessage(hProcessPageHeaderCtrl, HDM_GETITEM, i, (LPARAM) &hditem); - LoadString(hInst, IDS_TAB_IMAGENAME, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_ImageName = TRUE; - TaskManagerSettings.ColumnSizeArray[0] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_PID, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_PID = TRUE; - TaskManagerSettings.ColumnSizeArray[1] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_USERNAME, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_UserName = TRUE; - TaskManagerSettings.ColumnSizeArray[2] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_SESSIONID, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_SessionID = TRUE; - TaskManagerSettings.ColumnSizeArray[3] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_CPU, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_CPUUsage = TRUE; - TaskManagerSettings.ColumnSizeArray[4] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_CPUTIME, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_CPUTime = TRUE; - TaskManagerSettings.ColumnSizeArray[5] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_MEMUSAGE, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_MemoryUsage = TRUE; - TaskManagerSettings.ColumnSizeArray[6] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_PEAKMEMUSAGE, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_PeakMemoryUsage = TRUE; - TaskManagerSettings.ColumnSizeArray[7] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_MEMDELTA, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_MemoryUsageDelta = TRUE; - TaskManagerSettings.ColumnSizeArray[8] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_PAGEFAULT, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_PageFaults = TRUE; - TaskManagerSettings.ColumnSizeArray[9] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_PFDELTA, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_PageFaultsDelta = TRUE; - TaskManagerSettings.ColumnSizeArray[10] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_VMSIZE, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_VirtualMemorySize = TRUE; - TaskManagerSettings.ColumnSizeArray[11] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_PAGEDPOOL, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_PagedPool = TRUE; - TaskManagerSettings.ColumnSizeArray[12] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_NPPOOL, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_NonPagedPool = TRUE; - TaskManagerSettings.ColumnSizeArray[13] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_BASEPRI, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_BasePriority = TRUE; - TaskManagerSettings.ColumnSizeArray[14] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_HANDLES, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_HandleCount = TRUE; - TaskManagerSettings.ColumnSizeArray[15] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_THREADS, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_ThreadCount = TRUE; - TaskManagerSettings.ColumnSizeArray[16] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_USERPBJECTS, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_USERObjects = TRUE; - TaskManagerSettings.ColumnSizeArray[17] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_GDIOBJECTS, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_GDIObjects = TRUE; - TaskManagerSettings.ColumnSizeArray[18] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_IOREADS, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_IOReads = TRUE; - TaskManagerSettings.ColumnSizeArray[19] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_IOWRITES, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_IOWrites = TRUE; - TaskManagerSettings.ColumnSizeArray[20] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_IOOTHER, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_IOOther = TRUE; - TaskManagerSettings.ColumnSizeArray[21] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_IOREADBYTES, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_IOReadBytes = TRUE; - TaskManagerSettings.ColumnSizeArray[22] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_IOWRITESBYTES, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_IOWriteBytes = TRUE; - TaskManagerSettings.ColumnSizeArray[23] = hditem.cxy; - } - - LoadString(hInst, IDS_TAB_IOOTHERBYTES, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - { - TaskManagerSettings.Column_IOOtherBytes = TRUE; - TaskManagerSettings.ColumnSizeArray[24] = hditem.cxy; + for (n=0; n<COLUMN_NMAX; n++) { + LoadString(hInst, ColumnPresets[n].dwIdsName, szTemp, sizeof(szTemp)/sizeof(TCHAR)); + if (_tcsicmp(text, szTemp) == 0) + { + TaskManagerSettings.Columns[n] = TRUE; + TaskManagerSettings.ColumnSizeArray[n] = hditem.cxy; + } } } } @@ -447,34 +152,10 @@ (void)ListView_DeleteColumn(hProcessPageListCtrl, i); } - for (i=0; i<25; i++) + for (i=0; i<COLUMN_NMAX; i++) { TaskManagerSettings.ColumnOrderArray[i] = i; - - TaskManagerSettings.ColumnSizeArray[0] = 105; - TaskManagerSettings.ColumnSizeArray[1] = 50; - TaskManagerSettings.ColumnSizeArray[2] = 107; - TaskManagerSettings.ColumnSizeArray[3] = 70; - TaskManagerSettings.ColumnSizeArray[4] = 35; - TaskManagerSettings.ColumnSizeArray[5] = 70; - TaskManagerSettings.ColumnSizeArray[6] = 70; - TaskManagerSettings.ColumnSizeArray[7] = 100; - TaskManagerSettings.ColumnSizeArray[8] = 70; - TaskManagerSettings.ColumnSizeArray[9] = 70; - TaskManagerSettings.ColumnSizeArray[10] = 70; - TaskManagerSettings.ColumnSizeArray[11] = 70; - TaskManagerSettings.ColumnSizeArray[12] = 70; - TaskManagerSettings.ColumnSizeArray[13] = 70; - TaskManagerSettings.ColumnSizeArray[14] = 60; - TaskManagerSettings.ColumnSizeArray[15] = 60; - TaskManagerSettings.ColumnSizeArray[16] = 60; - TaskManagerSettings.ColumnSizeArray[17] = 60; - TaskManagerSettings.ColumnSizeArray[18] = 60; - TaskManagerSettings.ColumnSizeArray[19] = 70; - TaskManagerSettings.ColumnSizeArray[20] = 70; - TaskManagerSettings.ColumnSizeArray[21] = 70; - TaskManagerSettings.ColumnSizeArray[22] = 70; - TaskManagerSettings.ColumnSizeArray[23] = 70; - TaskManagerSettings.ColumnSizeArray[24] = 70; + TaskManagerSettings.ColumnSizeArray[i] = ColumnPresets[i].size; + } AddColumns(); } @@ -483,62 +164,16 @@ INT_PTR CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + unsigned int i; switch (message) { case WM_INITDIALOG: - if (TaskManagerSettings.Column_ImageName) - SendMessage(GetDlgItem(hDlg, IDC_IMAGENAME), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_PID) - SendMessage(GetDlgItem(hDlg, IDC_PID), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_UserName) - SendMessage(GetDlgItem(hDlg, IDC_USERNAME), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_SessionID) - SendMessage(GetDlgItem(hDlg, IDC_SESSIONID), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_CPUUsage) - SendMessage(GetDlgItem(hDlg, IDC_CPUUSAGE), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_CPUTime) - SendMessage(GetDlgItem(hDlg, IDC_CPUTIME), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_MemoryUsage) - SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGE), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_PeakMemoryUsage) - SendMessage(GetDlgItem(hDlg, IDC_PEAKMEMORYUSAGE), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_MemoryUsageDelta) - SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGEDELTA), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_PageFaults) - SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTS), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_PageFaultsDelta) - SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTSDELTA), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_VirtualMemorySize) - SendMessage(GetDlgItem(hDlg, IDC_VIRTUALMEMORYSIZE), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_PagedPool) - SendMessage(GetDlgItem(hDlg, IDC_PAGEDPOOL), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_NonPagedPool) - SendMessage(GetDlgItem(hDlg, IDC_NONPAGEDPOOL), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_BasePriority) - SendMessage(GetDlgItem(hDlg, IDC_BASEPRIORITY), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_HandleCount) - SendMessage(GetDlgItem(hDlg, IDC_HANDLECOUNT), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_ThreadCount) - SendMessage(GetDlgItem(hDlg, IDC_THREADCOUNT), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_USERObjects) - SendMessage(GetDlgItem(hDlg, IDC_USEROBJECTS), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_GDIObjects) - SendMessage(GetDlgItem(hDlg, IDC_GDIOBJECTS), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOReads) - SendMessage(GetDlgItem(hDlg, IDC_IOREADS), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOWrites) - SendMessage(GetDlgItem(hDlg, IDC_IOWRITES), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOOther) - SendMessage(GetDlgItem(hDlg, IDC_IOOTHER), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOReadBytes) - SendMessage(GetDlgItem(hDlg, IDC_IOREADBYTES), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOWriteBytes) - SendMessage(GetDlgItem(hDlg, IDC_IOWRITEBYTES), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOOtherBytes) - SendMessage(GetDlgItem(hDlg, IDC_IOOTHERBYTES), BM_SETCHECK, BST_CHECKED, 0); - + for (i=0; i<COLUMN_NMAX; i++) { + if (TaskManagerSettings.Columns[i]) + SendMessage(GetDlgItem(hDlg, ColumnPresets[i].dwIdcCtrl), BM_SETCHECK, BST_CHECKED, 0); + } return TRUE; case WM_COMMAND: @@ -551,31 +186,8 @@ if (LOWORD(wParam) == IDOK) { - TaskManagerSettings.Column_ImageName = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_IMAGENAME), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_PID = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_PID), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_UserName = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_USERNAME), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_SessionID = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_SESSIONID), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_CPUUsage = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_CPUUSAGE), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_CPUTime = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_CPUTIME), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_MemoryUsage = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGE), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_PeakMemoryUsage = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_PEAKMEMORYUSAGE), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_MemoryUsageDelta = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGEDELTA), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_PageFaults = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTS), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_PageFaultsDelta = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTSDELTA), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_VirtualMemorySize = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_VIRTUALMEMORYSIZE), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_PagedPool = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_PAGEDPOOL), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_NonPagedPool = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_NONPAGEDPOOL), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_BasePriority = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_BASEPRIORITY), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_HandleCount = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_HANDLECOUNT), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_ThreadCount = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_THREADCOUNT), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_USERObjects = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_USEROBJECTS), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_GDIObjects = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_GDIOBJECTS), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOReads = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_IOREADS), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOWrites = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_IOWRITES), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOOther = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_IOOTHER), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOReadBytes = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_IOREADBYTES), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOWriteBytes = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_IOWRITEBYTES), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOOtherBytes = (BOOL) SendMessage(GetDlgItem(hDlg, IDC_IOOTHERBYTES), BM_GETCHECK, 0, 0); + for (i=0; i<COLUMN_NMAX; i++) + TaskManagerSettings.Columns[i] = (BOOL) SendMessage(GetDlgItem(hDlg, ColumnPresets[i].dwIdcCtrl), BM_GETCHECK, 0, 0); EndDialog(hDlg, LOWORD(wParam)); return TRUE; @@ -589,9 +201,11 @@ void UpdateColumnDataHints(void) { - HDITEM hditem; - TCHAR text[260]; - ULONG Index; + HDITEM hditem; + TCHAR text[260]; + ULONG Index; + TCHAR szTemp[256]; + unsigned int i; for (Index=0; Index<(ULONG)SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); Index++) { @@ -603,104 +217,10 @@ SendMessage(hProcessPageHeaderCtrl, HDM_GETITEM, Index, (LPARAM) &hditem); - LoadString(hInst, IDS_TAB_IMAGENAME, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_IMAGENAME; - - LoadString(hInst, IDS_TAB_PID, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_PID; - - LoadString(hInst, IDS_TAB_USERNAME, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_USERNAME; - - LoadString(hInst, IDS_TAB_SESSIONID, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_SESSIONID; - - LoadString(hInst, IDS_TAB_CPU, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_CPUUSAGE; - - LoadString(hInst, IDS_TAB_CPUTIME, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_CPUTIME; - - LoadString(hInst, IDS_TAB_MEMUSAGE, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_MEMORYUSAGE; - - LoadString(hInst, IDS_TAB_PEAKMEMUSAGE, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_PEAKMEMORYUSAGE; - - LoadString(hInst, IDS_TAB_MEMDELTA, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_MEMORYUSAGEDELTA; - - LoadString(hInst, IDS_TAB_PAGEFAULT, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_PAGEFAULTS; - - LoadString(hInst, IDS_TAB_PFDELTA, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_PAGEFAULTSDELTA; - - LoadString(hInst, IDS_TAB_VMSIZE, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_VIRTUALMEMORYSIZE; - - LoadString(hInst, IDS_TAB_PAGEDPOOL, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_PAGEDPOOL; - - LoadString(hInst, IDS_TAB_NPPOOL, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_NONPAGEDPOOL; - - LoadString(hInst, IDS_TAB_BASEPRI, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_BASEPRIORITY; - - LoadString(hInst, IDS_TAB_HANDLES, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_HANDLECOUNT; - - LoadString(hInst, IDS_TAB_THREADS, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_THREADCOUNT; - - LoadString(hInst, IDS_TAB_USERPBJECTS, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_USEROBJECTS; - - LoadString(hInst, IDS_TAB_GDIOBJECTS, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_GDIOBJECTS; - - LoadString(hInst, IDS_TAB_IOREADS, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_IOREADS; - - LoadString(hInst, IDS_TAB_IOWRITES, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_IOWRITES; - - LoadString(hInst, IDS_TAB_IOOTHER, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_IOOTHER; - - LoadString(hInst, IDS_TAB_IOREADBYTES, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_IOREADBYTES; - - LoadString(hInst, IDS_TAB_IOWRITESBYTES, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_IOWRITEBYTES; - - LoadString(hInst, IDS_TAB_IOOTHERBYTES, szTemp, 256); - if (_tcsicmp(text, szTemp) == 0) - ColumnDataHints[Index] = COLUMN_IOOTHERBYTES; - } -} + for (i=0; i<COLUMN_NMAX; i++) { + LoadString(hInst, ColumnPresets[i].dwIdsName, szTemp, sizeof(szTemp)/sizeof(TCHAR)); + if (_tcsicmp(text, szTemp) == 0) + ColumnDataHints[Index] = i; + } + } +} Modified: trunk/reactos/base/applications/taskmgr/column.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/column.h (original) +++ trunk/reactos/base/applications/taskmgr/column.h Fri Aug 3 11:35:39 2007 @@ -24,32 +24,87 @@ #define __COLUMN_H #define COLUMN_IMAGENAME 0 -#define COLUMN_PID 1 -#define COLUMN_USERNAME 2 +#define COLUMN_PID 1 +#define COLUMN_USERNAME 2 #define COLUMN_SESSIONID 3 -#define COLUMN_CPUUSAGE 4 -#define COLUMN_CPUTIME 5 -#define COLUMN_MEMORYUSAGE 6 -#define COLUMN_PEAKMEMORYUSAGE 7 -#define COLUMN_MEMORYUSAGEDELTA 8 -#define COLUMN_PAGEFAULTS 9 -#define COLUMN_PAGEFAULTSDELTA 10 +#define COLUMN_CPUUSAGE 4 +#define COLUMN_CPUTIME 5 +#define COLUMN_MEMORYUSAGE 6 +#define COLUMN_PEAKMEMORYUSAGE 7 +#define COLUMN_MEMORYUSAGEDELTA 8 +#define COLUMN_PAGEFAULTS 9 +#define COLUMN_PAGEFAULTSDELTA 10 #define COLUMN_VIRTUALMEMORYSIZE 11 #define COLUMN_PAGEDPOOL 12 -#define COLUMN_NONPAGEDPOOL 13 -#define COLUMN_BASEPRIORITY 14 -#define COLUMN_HANDLECOUNT 15 -#define COLUMN_THREADCOUNT 16 -#define COLUMN_USEROBJECTS 17 -#define COLUMN_GDIOBJECTS 18 -#define COLUMN_IOREADS 19 -#define COLUMN_IOWRITES 20 -#define COLUMN_IOOTHER 21 -#define COLUMN_IOREADBYTES 22 -#define COLUMN_IOWRITEBYTES 23 -#define COLUMN_IOOTHERBYTES 24 +#define COLUMN_NONPAGEDPOOL 13 +#define COLUMN_BASEPRIORITY 14 +#define COLUMN_HANDLECOUNT 15 +#define COLUMN_THREADCOUNT 16 +#define COLUMN_USEROBJECTS 17 +#define COLUMN_GDIOBJECTS 18 +#define COLUMN_IOREADS 19 +#define COLUMN_IOWRITES 20 +#define COLUMN_IOOTHER 21 +#define COLUMN_IOREADBYTES 22 +#define COLUMN_IOWRITEBYTES 23 +#define COLUMN_IOOTHERBYTES 24 +#define COLUMN_NMAX 25 -extern UINT ColumnDataHints[25]; +/* + * temporary fix: + * Some macro IDS_* have different name from IDC_* + * It would be better to unify thone name one day + */ +#define IDS_TAB_CPUUSAGE IDS_TAB_CPU +#define IDS_TAB_MEMORYUSAGE IDS_TAB_MEMUSAGE +#define IDS_TAB_PEAKMEMORYUSAGE IDS_TAB_PEAKMEMUSAGE +#define IDS_TAB_MEMORYUSAGEDELTA IDS_TAB_MEMDELTA +#define IDS_TAB_PAGEFAULTS IDS_TAB_PAGEFAULT +#define IDS_TAB_PAGEFAULTSDELTA IDS_TAB_PFDELTA +#define IDS_TAB_VIRTUALMEMORYSIZE IDS_TAB_VMSIZE +#define IDS_TAB_NONPAGEDPOOL IDS_TAB_NPPOOL +#define IDS_TAB_BASEPRIORITY IDS_TAB_BASEPRI +#define IDS_TAB_HANDLECOUNT IDS_TAB_HANDLES +#define IDS_TAB_THREADCOUNT IDS_TAB_THREADS +#define IDS_TAB_USEROBJECTS IDS_TAB_USERPBJECTS +#define IDS_TAB_IOWRITEBYTES IDS_TAB_IOWRITESBYTES + +typedef struct { + DWORD dwIdsName; + DWORD dwIdcCtrl; + int size; + BOOL bDefaults; +} PresetColumnEntry; + + +extern UINT ColumnDataHints[COLUMN_NMAX]; +extern const PresetColumnEntry ColumnPresets[COLUMN_NMAX]; + +#define Column_ImageName Columns[COLUMN_IMAGENAME] +#define Column_PID Columns[COLUMN_PID] +#define Column_CPUUsage Columns[COLUMN_CPUUSAGE] +#define Column_CPUTime Columns[COLUMN_CPUTIME] +#define Column_MemoryUsage Columns[COLUMN_MEMORYUSAGE] +#define Column_MemoryUsageDelta Columns[COLUMN_MEMORYUSAGEDELTA] +#define Column_PeakMemoryUsage Columns[COLUMN_PEAKMEMORYUSAGE] +#define Column_PageFaults Columns[COLUMN_PAGEFAULTS] +#define Column_USERObjects Columns[COLUMN_USEROBJECTS] +#define Column_IOReads Columns[COLUMN_IOREADS] +#define Column_IOReadBytes Columns[COLUMN_IOREADBYTES] +#define Column_SessionID Columns[COLUMN_SESSIONID] +#define Column_UserName Columns[COLUMN_USERNAME] +#define Column_PageFaultsDelta Columns[COLUMN_PAGEFAULTSDELTA] +#define Column_VirtualMemorySize Columns[COLUMN_VIRTUALMEMORYSIZE] +#define Column_PagedPool Columns[COLUMN_PAGEDPOOL] +#define Column_NonPagedPool Columns[COLUMN_NONPAGEDPOOL] +#define Column_BasePriority Columns[COLUMN_BASEPRIORITY] +#define Column_HandleCount Columns[COLUMN_HANDLECOUNT] +#define Column_ThreadCount Columns[COLUMN_THREADCOUNT] +#define Column_GDIObjects Columns[COLUMN_GDIOBJECTS] +#define Column_IOWrites Columns[COLUMN_IOWRITES] +#define Column_IOWriteBytes Columns[COLUMN_IOWRITEBYTES] +#define Column_IOOther Columns[COLUMN_IOOTHER] +#define Column_IOOtherBytes Columns[COLUMN_IOOTHERBYTES] void ProcessPage_OnViewSelectColumns(void); void AddColumns(void); Modified: trunk/reactos/base/applications/taskmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/precomp.h (original) +++ trunk/reactos/base/applications/taskmgr/precomp.h Fri Aug 3 11:35:39 2007 @@ -14,6 +14,7 @@ #include <stdio.h> #include <ctype.h> +#include "column.h" #include "taskmgr.h" #include "perfdata.h" #include "perfpage.h" @@ -22,7 +23,6 @@ #include "proclist.h" #include "affinity.h" #include "applpage.h" -#include "column.h" #include "dbgchnl.h" #include "debug.h" #include "endproc.h" Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c Fri Aug 3 11:35:39 2007 @@ -698,60 +698,12 @@ /* Processes page settings */ TaskManagerSettings.ShowProcessesFromAllUsers = FALSE; /* Server-only? */ - TaskManagerSettings.Column_ImageName = TRUE; - TaskManagerSettings.Column_PID = TRUE; - TaskManagerSettings.Column_CPUUsage = TRUE; - TaskManagerSettings.Column_CPUTime = TRUE; - TaskManagerSettings.Column_MemoryUsage = TRUE; - TaskManagerSettings.Column_MemoryUsageDelta = FALSE; - TaskManagerSettings.Column_PeakMemoryUsage = FALSE; - TaskManagerSettings.Column_PageFaults = FALSE; - TaskManagerSettings.Column_USERObjects = FALSE; - TaskManagerSettings.Column_IOReads = FALSE; - TaskManagerSettings.Column_IOReadBytes = FALSE; - TaskManagerSettings.Column_SessionID = FALSE; /* Server-only? */ - TaskManagerSettings.Column_UserName = FALSE; /* Server-only? */ - TaskManagerSettings.Column_PageFaultsDelta = FALSE; - TaskManagerSettings.Column_VirtualMemorySize = FALSE; - TaskManagerSettings.Column_PagedPool = FALSE; - TaskManagerSettings.Column_NonPagedPool = FALSE; - TaskManagerSettings.Column_BasePriority = FALSE; - TaskManagerSettings.Column_HandleCount = FALSE; - TaskManagerSettings.Column_ThreadCount = FALSE; - TaskManagerSettings.Column_GDIObjects = FALSE; - TaskManagerSettings.Column_IOWrites = FALSE; - TaskManagerSettings.Column_IOWriteBytes = FALSE; - TaskManagerSettings.Column_IOOther = FALSE; - TaskManagerSettings.Column_IOOtherBytes = FALSE; - - for (i = 0; i < 25; i++) { + + for (i = 0; i < COLUMN_NMAX; i++) { + TaskManagerSettings.Columns[i] = ColumnPresets[i].bDefaults; TaskManagerSettings.ColumnOrderArray[i] = i; - } - TaskManagerSettings.ColumnSizeArray[0] = 105; - TaskManagerSettings.ColumnSizeArray[1] = 50; - TaskManagerSettings.ColumnSizeArray[2] = 107; - TaskManagerSettings.ColumnSizeArray[3] = 70; - TaskManagerSettings.ColumnSizeArray[4] = 35; - TaskManagerSettings.ColumnSizeArray[5] = 70; - TaskManagerSettings.ColumnSizeArray[6] = 70; - TaskManagerSettings.ColumnSizeArray[7] = 100; - TaskManagerSettings.ColumnSizeArray[8] = 70; - TaskManagerSettings.ColumnSizeArray[9] = 70; - TaskManagerSettings.ColumnSizeArray[10] = 70; - TaskManagerSettings.ColumnSizeArray[11] = 70; - TaskManagerSettings.ColumnSizeArray[12] = 70; - TaskManagerSettings.ColumnSizeArray[13] = 70; - TaskManagerSettings.ColumnSizeArray[14] = 60; - TaskManagerSettings.ColumnSizeArray[15] = 60; - TaskManagerSettings.ColumnSizeArray[16] = 60; - TaskManagerSettings.ColumnSizeArray[17] = 60; - TaskManagerSettings.ColumnSizeArray[18] = 60; - TaskManagerSettings.ColumnSizeArray[19] = 70; - TaskManagerSettings.ColumnSizeArray[20] = 70; - TaskManagerSettings.ColumnSizeArray[21] = 70; - TaskManagerSettings.ColumnSizeArray[22] = 70; - TaskManagerSettings.ColumnSizeArray[23] = 70; - TaskManagerSettings.ColumnSizeArray[24] = 70; + TaskManagerSettings.ColumnSizeArray[i] = ColumnPresets[i].size; + } TaskManagerSettings.SortColumn = 1; TaskManagerSettings.SortAscending = TRUE; Modified: trunk/reactos/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.h (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.h Fri Aug 3 11:35:39 2007 @@ -77,34 +77,10 @@ /* Processes page settings */ BOOL ShowProcessesFromAllUsers; /* Server-only? */ - BOOL Column_ImageName; - BOOL Column_PID; - BOOL Column_CPUUsage; - BOOL Column_CPUTime; - BOOL Column_MemoryUsage; - BOOL Column_MemoryUsageDelta; - BOOL Column_PeakMemoryUsage; - BOOL Column_PageFaults; - BOOL Column_USERObjects; - BOOL Column_IOReads; - BOOL Column_IOReadBytes; - BOOL Column_SessionID; /* Server-only? */ - BOOL Column_UserName; /* Server-only? */ - BOOL Column_PageFaultsDelta; - BOOL Column_VirtualMemorySize; - BOOL Column_PagedPool; - BOOL Column_NonPagedPool; - BOOL Column_BasePriority; - BOOL Column_HandleCount; - BOOL Column_ThreadCount; - BOOL Column_GDIObjects; - BOOL Column_IOWrites; - BOOL Column_IOWriteBytes; - BOOL Column_IOOther; - BOOL Column_IOOtherBytes; - int ColumnOrderArray[25]; - int ColumnSizeArray[25]; - int SortColumn; + BOOL Columns[COLUMN_NMAX]; + int ColumnOrderArray[COLUMN_NMAX]; + int ColumnSizeArray[COLUMN_NMAX]; + int SortColumn; BOOL SortAscending; /* Performance page settings */

1 0

[gedmurphy] 28113: activate the properties option in the menu, also make it bold See issue #2522 for more details.
by gedmurphy＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: gedmurphy Date: Fri Aug 3 03:31:32 2007 New Revision: 28113 URL: http://svn.reactos.org/svn/reactos?rev=28113&view=rev Log: activate the properties option in the menu, also make it bold See issue #2522 for more details. Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Fri Aug 3 03:31:32 2007 @@ -451,6 +451,12 @@ EnableMenuItem(hMainMenu, ID_PROP, MF_ENABLED); + EnableMenuItem(Info->hShortcutMenu, + ID_PROP, + MF_ENABLED); + SetMenuDefaultItem(Info->hShortcutMenu, + ID_PROP, + MF_BYCOMMAND); } /* activate delete menu item, if not already */ @@ -466,7 +472,6 @@ MF_ENABLED); } - /* set selected service */ Info->SelectedItem = pnmv->iItem; @@ -487,8 +492,6 @@ TB_SETSTATE, ID_PROP, (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - - }

1 0

[tkreuzer] 28112: 0x124a is NtUserValidateTimerCallback, thanks jimtabor for finding this out.
by tkreuzer＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: tkreuzer Date: Fri Aug 3 03:29:43 2007 New Revision: 28112 URL: http://svn.reactos.org/svn/reactos?rev=28112&view=rev Log: 0x124a is NtUserValidateTimerCallback, thanks jimtabor for finding this out. Modified: trunk/rostests/apitests/w32knapi/xp-2600.c Modified: trunk/rostests/apitests/w32knapi/xp-2600.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/xp-2600… ============================================================================== --- trunk/rostests/apitests/w32knapi/xp-2600.c (original) +++ trunk/rostests/apitests/w32knapi/xp-2600.c Fri Aug 3 03:29:43 2007 @@ -591,7 +591,7 @@ {L"NtUserUserHandleGrantAccess", 0x1247,3}, {L"NtUserValidateHandleSecure", 0x1248,1}, {L"NtUserValidateRect", 0x1249,2}, - {L"Nt_Unknown", 0x124a, 3}, + {L"NtUserValidateTimerCallback", 0x124a, 3}, {L"NtUserVkKeyScanEx", 0x124b,3}, {L"NtUserWaitForInputIdle", 0x124c,3}, {L"NtUserWaitForMsgAndEvent", 0x124d,1},

1 0

[tkreuzer] 28111: small bugfix: don't zero terminate the szCSDVersion sting beyond the buffer.
by tkreuzer＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: tkreuzer Date: Fri Aug 3 02:23:27 2007 New Revision: 28111 URL: http://svn.reactos.org/svn/reactos?rev=28111&view=rev Log: small bugfix: don't zero terminate the szCSDVersion sting beyond the buffer. Modified: trunk/rostests/apitests/w32knapi/w32knapi.c Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c Fri Aug 3 02:23:27 2007 @@ -15,7 +15,7 @@ GetVersionExW(&osv); pszRos = osv.szCSDVersion + wcslen(osv.szCSDVersion) + 1; /* make sure the string is zero terminated */ - pszRos[127] = 0; + osv.szCSDVersion[127] = 0; /* Is ReactOS? */ if (wcsstr(pszRos, L"ReactOS") != NULL) {

1 0

[tkreuzer] 28110: NtGdiGetSetBitmapBits: - use SEH and probe the user mode buffers - SetLastWin32Error on invalid handle - move the copying to IntGetSetBitmapBits - only use IntGetSetBitmapBits from inside win32k - move NtGdiGetBitmapBits to bitmap.c - allow copying a number of bytes not matching one entire line, like on windows I think that was all changes.
by tkreuzer＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: tkreuzer Date: Fri Aug 3 02:14:32 2007 New Revision: 28110 URL: http://svn.reactos.org/svn/reactos?rev=28110&view=rev Log: NtGdiGetSetBitmapBits: - use SEH and probe the user mode buffers - SetLastWin32Error on invalid handle - move the copying to IntGetSetBitmapBits - only use IntGetSetBitmapBits from inside win32k - move NtGdiGetBitmapBits to bitmap.c - allow copying a number of bytes not matching one entire line, like on windows I think that was all changes. Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Fri Aug 3 02:14:32 2007 @@ -259,5 +259,9 @@ VOID STDCALL IntGdiSetDCState ( HDC hDC, HDC hDCSave ); +LONG STDCALL IntSetBitmapBits(PBITMAPOBJ bmp, DWORD Bytes, IN PBYTE Bits); + +LONG STDCALL IntGetBitmapBits(PBITMAPOBJ bmp, DWORD Bytes, OUT PBYTE Bits); + #endif /* _WIN32K_INTGDI_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Fri Aug 3 02:14:32 2007 @@ -1552,7 +1552,7 @@ } /* get icon bits */ - NtGdiGetBitmapBits(hbmOff, bm.bmWidthBytes * abs(bm.bmHeight), pBits); + IntGetBitmapBits(Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), pBits); /* premultiply with the alpha channel value */ for (i = 0; i < cyHeight; i++) @@ -1581,7 +1581,7 @@ } /* set icon bits */ - NtGdiSetBitmapBits(hbmOff, bm.bmWidthBytes * abs(bm.bmHeight), pBits); + IntSetBitmapBits(Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), pBits); ExFreePool(pBits); GDIOBJ_UnlockObjByPtr(GdiHandleTable, Bitmap); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Fri Aug 3 02:14:32 2007 @@ -406,7 +406,7 @@ INT Height, UINT Planes, UINT BitsPixel, - IN OPTIONAL LPBYTE Bits) + IN OPTIONAL LPBYTE pUnsafeBits) { PBITMAPOBJ bmp; HBITMAP hBitmap; @@ -432,7 +432,7 @@ hBitmap = IntCreateBitmap(Size, WidthBytes, BitmapFormat(BitsPixel, BI_RGB), (Height < 0 ? BMF_TOPDOWN : 0) | - (NULL == Bits ? 0 : BMF_NOZEROINIT), NULL); + (NULL == pUnsafeBits ? 0 : BMF_NOZEROINIT), NULL); if (!hBitmap) { DPRINT("NtGdiCreateBitmap: returned 0\n"); @@ -450,18 +450,21 @@ } bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; + + if (NULL != pUnsafeBits) + { + _SEH_TRY + { + ProbeForRead(pUnsafeBits, bmp->SurfObj.cjBits, 1); + IntSetBitmapBits(bmp, bmp->SurfObj.cjBits, pUnsafeBits); + } + _SEH_HANDLE + { + } + _SEH_END + } + BITMAPOBJ_UnlockBitmap( bmp ); - - /* - * NOTE: It's ugly practice, but we are using the object even - * after unlocking. Since the handle is currently known only - * to us it should be safe. - */ - - if (NULL != Bits) - { - NtGdiSetBitmapBits(hBitmap, bmp->SurfObj.cjBits, Bits); - } return hBitmap; } @@ -911,64 +914,160 @@ return FALSE; } + +LONG STDCALL +IntGetBitmapBits( + PBITMAPOBJ bmp, + DWORD Bytes, + OUT PBYTE Bits) +{ + LONG ret; + + ASSERT(Bits); + + /* Don't copy more bytes than the buffer has */ + Bytes = min(Bytes, bmp->SurfObj.cjBits); + +#if 0 + /* FIXME: Call DDI CopyBits here if available */ + if(bmp->DDBitmap) + { + DPRINT("Calling device specific BitmapBits\n"); + if(bmp->DDBitmap->funcs->pBitmapBits) + { + ret = bmp->DDBitmap->funcs->pBitmapBits(hbitmap, bits, count, DDB_GET); + } + else + { + ERR_(bitmap)("BitmapBits == NULL??\n"); + ret = 0; + } + } + else +#endif + { + RtlCopyMemory(Bits, bmp->SurfObj.pvBits, Bytes); + ret = Bytes; + } + return ret; +} + +LONG STDCALL +NtGdiGetBitmapBits(HBITMAP hBitmap, + ULONG Bytes, + OUT OPTIONAL PBYTE pUnsafeBits) +{ + PBITMAPOBJ bmp; + LONG ret; + + if (pUnsafeBits != NULL && Bytes == 0) + { + return 0; + } + + bmp = BITMAPOBJ_LockBitmap (hBitmap); + if (!bmp) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + /* If the bits vector is null, the function should return the read size */ + if (pUnsafeBits == NULL) + { + ret = bmp->SurfObj.cjBits; + BITMAPOBJ_UnlockBitmap (bmp); + return ret; + } + + /* Don't copy more bytes than the buffer has */ + Bytes = min(Bytes, bmp->SurfObj.cjBits); + + _SEH_TRY + { + ProbeForWrite(pUnsafeBits, Bytes, 1); + ret = IntGetBitmapBits(bmp, Bytes, pUnsafeBits); + } + _SEH_HANDLE + { + ret = 0; + } + _SEH_END + + BITMAPOBJ_UnlockBitmap (bmp); + + return ret; +} + + +LONG STDCALL +IntSetBitmapBits( + PBITMAPOBJ bmp, + DWORD Bytes, + IN PBYTE Bits) +{ + LONG ret; + + /* Don't copy more bytes than the buffer has */ + Bytes = min(Bytes, bmp->SurfObj.cjBits); + +#if 0 + /* FIXME: call DDI specific function here if available */ + if(bmp->DDBitmap) + { + DPRINT ("Calling device specific BitmapBits\n"); + if (bmp->DDBitmap->funcs->pBitmapBits) + { + ret = bmp->DDBitmap->funcs->pBitmapBits(hBitmap, (void *) Bits, Bytes, DDB_SET); + } + else + { + DPRINT ("BitmapBits == NULL??\n"); + ret = 0; + } + } + else +#endif + { + RtlCopyMemory(bmp->SurfObj.pvBits, Bits, Bytes); + ret = Bytes; + } + + return ret; +} + + LONG STDCALL NtGdiSetBitmapBits( HBITMAP hBitmap, DWORD Bytes, - IN PBYTE Bits) -{ - LONG height, ret; + IN PBYTE pUnsafeBits) +{ + LONG ret; PBITMAPOBJ bmp; + if (pUnsafeBits == NULL || Bytes == 0) + { + return 0; + } + bmp = BITMAPOBJ_LockBitmap(hBitmap); - if (bmp == NULL || Bits == NULL) - { + if (bmp == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } - if (Bytes < 0) - { - DPRINT ("(%ld): Negative number of bytes passed???\n", Bytes ); - Bytes = -Bytes; - } - - /* Only get entire lines */ - height = Bytes / abs(bmp->SurfObj.lDelta); - if (height > bmp->SurfObj.sizlBitmap.cy) - { - height = bmp->SurfObj.sizlBitmap.cy; - } - Bytes = height * abs(bmp->SurfObj.lDelta); - DPRINT ("(%08x, bytes:%ld, bits:%p) %dx%d %d colors fetched height: %ld\n", - hBitmap, - Bytes, - Bits, - bmp->SurfObj.sizlBitmap.cx, - bmp->SurfObj.sizlBitmap.cy, - 1 << BitsPerFormat(bmp->SurfObj.iBitmapFormat), - height); - -#if 0 - /* FIXME: call DDI specific function here if available */ - if(bmp->DDBitmap) - { - DPRINT ("Calling device specific BitmapBits\n"); - if (bmp->DDBitmap->funcs->pBitmapBits) - { - ret = bmp->DDBitmap->funcs->pBitmapBits(hBitmap, (void *) Bits, Bytes, DDB_SET); - } - else - { - DPRINT ("BitmapBits == NULL??\n"); - ret = 0; - } - } - else -#endif - { - memcpy(bmp->SurfObj.pvBits, Bits, Bytes); - ret = Bytes; - } + _SEH_TRY + { + ProbeForRead(pUnsafeBits, Bytes, 1); + ret = IntSetBitmapBits(bmp, Bytes, pUnsafeBits); + } + _SEH_HANDLE + { + ret = 0; + } + _SEH_END BITMAPOBJ_UnlockBitmap(bmp); @@ -1464,7 +1563,7 @@ { HBITMAP res; BITMAP bm; - BITMAPOBJ *Bitmap; + BITMAPOBJ *Bitmap, *resBitmap; if (hBitmap == NULL) { @@ -1491,10 +1590,15 @@ { PBYTE buf; - buf = ExAllocatePoolWithTag (PagedPool, bm.bmWidthBytes * abs(bm.bmHeight), TAG_BITMAP); - NtGdiGetBitmapBits (hBitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); - NtGdiSetBitmapBits (res, bm.bmWidthBytes * abs(bm.bmHeight), buf); - ExFreePool (buf); + resBitmap = GDIOBJ_LockObj(GdiHandleTable, res, GDI_OBJECT_TYPE_BITMAP); + if (resBitmap) + { + buf = ExAllocatePoolWithTag (PagedPool, bm.bmWidthBytes * abs(bm.bmHeight), TAG_BITMAP); + IntGetBitmapBits (Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); + IntSetBitmapBits (resBitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); + ExFreePool (buf); + GDIOBJ_UnlockObjByPtr(GdiHandleTable, resBitmap); + } } GDIOBJ_UnlockObjByPtr(GdiHandleTable, Bitmap); Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Fri Aug 3 02:14:32 2007 @@ -631,78 +631,6 @@ return SrcHeight; } -LONG STDCALL NtGdiGetBitmapBits(HBITMAP hBitmap, - ULONG Count, - OUT OPTIONAL PBYTE Bits) -{ - PBITMAPOBJ bmp; - LONG height, ret; - - bmp = BITMAPOBJ_LockBitmap (hBitmap); - if (!bmp) - { - return 0; - } - - /* If the bits vector is null, the function should return the read size */ - if (Bits == NULL) - { - ret = bmp->SurfObj.cjBits; - BITMAPOBJ_UnlockBitmap (bmp); - return ret; - } - - if (Count < 0) - { - DPRINT ("(%ld): Negative number of bytes passed???\n", Count); - Count = -Count; - } - - /* Only get entire lines */ - height = Count / abs(bmp->SurfObj.lDelta); - if (height > bmp->SurfObj.sizlBitmap.cy) - { - height = bmp->SurfObj.sizlBitmap.cy; - } - Count = height * abs(bmp->SurfObj.lDelta); - if (Count == 0) - { - DPRINT("Less then one entire line requested\n"); - BITMAPOBJ_UnlockBitmap (bmp); - return 0; - } - - DPRINT("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n", - hBitmap, Count, Bits, bmp->SurfObj.sizlBitmap.cx, - bmp->SurfObj.sizlBitmap.cy, - 1 << BitsPerFormat(bmp->SurfObj.iBitmapFormat), height ); -#if 0 - /* FIXME: Call DDI CopyBits here if available */ - if(bmp->DDBitmap) - { - DPRINT("Calling device specific BitmapBits\n"); - if(bmp->DDBitmap->funcs->pBitmapBits) - { - ret = bmp->DDBitmap->funcs->pBitmapBits(hbitmap, bits, count, - DDB_GET); - } - else - { - ERR_(bitmap)("BitmapBits == NULL??\n"); - ret = 0; - } - } - else -#endif - { - memcpy(Bits, bmp->SurfObj.pvBits, Count); - ret = Count; - } - - BITMAPOBJ_UnlockBitmap (bmp); - - return ret; -} HBITMAP FASTCALL IntCreateDIBitmap(PDC Dc, const BITMAPINFOHEADER *header,

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