Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 28039: - Update comments. - Update changelog. - Add new option called update to config.cmd an add it into help.cmd. - Update build-shared the way that you get a message to use "config update" instead of a nonsens sentence.
by dreimer＠svn.reactos.org 30 Jul '07

30 Jul '07

Author: dreimer Date: Mon Jul 30 14:08:05 2007 New Revision: 28039 URL: http://svn.reactos.org/svn/reactos?rev=28039&view=rev Log: - Update comments. - Update changelog. - Add new option called update to config.cmd an add it into help.cmd. - Update build-shared the way that you get a message to use "config update" instead of a nonsens sentence. Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Mon Jul 30 14:08:05 2007 @@ -11,7 +11,7 @@ @echo off :: -:: Take over the 2nd parameter of Build.cmd, which enables/disables stripping +:: Take over the 2nd parameter of Build.cmd, which enables/disables stripping. :: if "%1" == "strip" ( set ROS_LEAN_AND_MEAN = yes @@ -25,7 +25,9 @@ :Build :: -:: Check if our log directory exists, if it doesn't, create it. +:: Check if our log directory exists, if it doesn't, create it. Also check +:: if the default Path was editied by Config Tool. If so, update the +:: path. :: if %logdiff% == 0 ( if not exist "RosBE-Logs\." ( @@ -43,10 +45,10 @@ if %logdiff% == 1 ( if not exist "%ROSBE_LOGPATH%\." ( echo LogFolder does not exist. - ) else ( + ) else ( set _ROSBELOGDIR=%ROSBE_LOGPATH% - ) -) + ) + ) ) :: @@ -58,8 +60,8 @@ if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** - echo *** aborting build. Please check for changes and *** - echo *** update your config.rbuild. *** + echo *** aborting build. Please update your config.rbuild *** + echo *** by typeing "config update". *** echo. goto :EOB ) 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 Mon Jul 30 14:08:05 2007 @@ -10,6 +10,7 @@ - Updated Tools. (Daniel Reimer) - sSVN asks you if you wanna update if Offline Source Tree is old. (Daniel Reimer) - Fixed DOZENS of bugs/stupid coded parts/things you could get easier... (Daniel Reimer) +- Add a new option called update to Config.cmd and add some security stuff. (Daniel Reimer) *** July 26th, 2007 - RosBE 0.3.7.1 Released Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Mon Jul 30 14:08:05 2007 @@ -6,11 +6,22 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: -@echo off +::@echo off title ReactOS Build Configurator +:: +:: Receive the first Parameter and decide what to do. +:: if "%1" == "delete" ( + echo config.rbuild will be permanently deleted. All your settings will be gone. + echo Continue? +:: SET /P XY=(yes), (no) +:: if /I "%XY%"=="yes" goto :CONT +:: if /I "%XY%"=="no" goto :NOK +:: goto :NOK + + :CONT if exist "config.rbuild" ( del "config.rbuild" echo Main Configuration File was found and deleted. @@ -25,15 +36,35 @@ ) goto :NOK ) +if "%1" == "update" ( + echo old config.rbuild will be deleted and will be updated with a recent, + echo default one. You will need to reconfigure it to your wishes later. + echo Continue? +:: SET /P XY=(yes), (no) +:: if /I "%XY%"=="yes" goto :CONT2 +:: if /I "%XY%"=="no" goto :NOK + :CONT2 + del "%ROSBEBASEDIR%\*.rbuild" + del "config.rbuild" + copy "config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild" + echo Updated. + goto :NOK +) if not "%1" == "" ( echo Unknown parameter specified. Try 'help [COMMAND]'. goto :NOK ) +:: +:: Check if config.rbuild already exists. If not, get a working copy. +:: if not exist "%ROSBEBASEDIR%\config.rbuild" ( copy "config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild" ) +:: +:: N00b Blocker :-P +:: echo WARNING: echo Non-Default-Configurations are not useable for pasteing Bugs to echo Bugzilla or asking quesions about in Forum/Chat! @@ -47,6 +78,30 @@ goto :NOK :OK + +:: +:: Check if config.template.rbuild is newer than config.rbuild, if it is then +:: inform the user and offer an update. +:: +if exist "%ROSBEBASEDIR%\config.rbuild" ( + test "config.template.rbuild" -nt "%ROSBEBASEDIR%\config.rbuild" + if not errorlevel 1 ( + echo. + echo *** config.template.rbuild is newer than working config.rbuild *** + echo *** The Editor cannot continue with this file. Do you wanna *** + echo *** update to the most recent one? You need to reset all your *** + cho *** previously made settings. *** + echo. + SET /P XY=(yes), (no) + if /I "%XY%"=="yes" del "%ROSBEBASEDIR%\*.rbuild" | del "config.rbuild" | copy "config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild" | goto :OK + if /I "%XY%"=="no" goto :NOK + goto :NOK + ) +) + +:: +:: Start with reading settings from config.rbuild and let the user edit them. +:: echo Architecture to build for. Not Editable. echo. echo Right now @@ -160,6 +215,9 @@ SET /P F= (0), (1) sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%ROSBEBASEDIR%\config9.rbuild" > "%ROSBEBASEDIR%\config10.rbuild" +:: +:: Generate a config.rbuild, copy it to the Source Tree and delete temp files. +:: copy "%ROSBEBASEDIR%\config10.rbuild" "%ROSBEBASEDIR%\config.tmp" del "%ROSBEBASEDIR%\*.rbuild" copy "%ROSBEBASEDIR%\config.tmp" "%ROSBEBASEDIR%\config.rbuild" 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 Mon Jul 30 14:08:05 2007 @@ -11,6 +11,9 @@ title ReactOS Build Environment %_VER% +:: +:: Receive the first Parameter and decide what to do. +:: if "%1" == "" ( echo. echo Available Commands: @@ -85,6 +88,8 @@ echo. echo delete - Deletes the created configuration File and so sets back echo to default settings. + echo update - Deletes the old created configuration File and updats + echo with a new, default one. goto :EOF ) if "%1" == "raddr2line" ( 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 Mon Jul 30 14:08:05 2007 @@ -11,7 +11,8 @@ @echo off :: -:: Set Defaults to work with and override if needed. +:: Set Defaults to work with and override them if edited by +:: Config Tool. :: color 0A set _VER=0.3.7.2 @@ -21,7 +22,7 @@ del "C:\aaa.tmp" set ROSBE_SHOWTIME=1 set ROSBE_WRITELOG=1 -set _LOGDIR=RosBE-Logs +set _LOGDIR=%CD%\RosBE-Logs if exist %ROSBEBASEDIR%\options.cmd ( goto :PREV @@ -41,6 +42,9 @@ :NEXT title ReactOS Build Environment %_VER% +:: +:: Make sure RosBE was initialized right. +:: if "%1" == "" ( cls call :RosBE4 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 Mon Jul 30 14:08:05 2007 @@ -11,12 +11,12 @@ title relAddr2Line... +:: +:: Receive the Parameters and decide what to do. +:: set _1=%1 set _2=%2 -:: -:: Receive the Parameters and decide what to do. -:: if "%_1%" == "" ( goto :MAN ) @@ -46,6 +46,12 @@ goto :EOC :EOC +:: +:: First get the ImageBase of the File. If its smaller than the given +:: Parameter, everything is ok, because it was already added onto the +:: adress and can be given directly to raddr2line. If not, add it and +:: give the result to raddr2line. +:: for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i if %%i LSS %_2% ( raddr2line "%_1%" "%_2%" 2>NUL 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 Mon Jul 30 14:08:05 2007 @@ -15,6 +15,9 @@ echo No parameter specified. Try 'help [COMMAND]'. goto :ExitSVN ) +:: +:: These two are directly parsed to svn. +:: if "%1" == "update" ( title Updating... if not "%2" == "" ( @@ -47,6 +50,10 @@ ) goto :ExitSVN ) +:: +:: Output the rev of your and the Online Tree and tell the User if +:: its Up to Date or not. +:: if "%1" == "status" ( title Status for /f "usebackq" %%i IN (`svnversion .`) DO @set OFFSVN=%%i

1 0

[cfinck] 28038: Add a Logon screensaver similar to the one of Windows developed by Marc Piulachs (marc DOT piulachs AT codexchange DOT net) I modified the code, so the screensaver is listed as "Logon ScreenSaver" instead of "Default ScreenSaver" I also added the other screensavers we have to the Boot-CD. Some of them highlight some bugs in ReactOS, when you try to use them. See issue #2505 for more details.
by cfinck＠svn.reactos.org 30 Jul '07

30 Jul '07

Author: cfinck Date: Mon Jul 30 13:36:32 2007 New Revision: 28038 URL: http://svn.reactos.org/svn/reactos?rev=28038&view=rev Log: Add a Logon screensaver similar to the one of Windows developed by Marc Piulachs (marc DOT piulachs AT codexchange DOT net) I modified the code, so the screensaver is listed as "Logon ScreenSaver" instead of "Default ScreenSaver" I also added the other screensavers we have to the Boot-CD. Some of them highlight some bugs in ReactOS, when you try to use them. See issue #2505 for more details. Added: trunk/reactos/base/applications/screensavers/logon/ trunk/reactos/base/applications/screensavers/logon/logon.c trunk/reactos/base/applications/screensavers/logon/logon.rbuild trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/screensavers/logon/res/ trunk/reactos/base/applications/screensavers/logon/res/0.bmp (with props) trunk/reactos/base/applications/screensavers/logon/res/1.bmp (with props) trunk/reactos/base/applications/screensavers/logon/resource.h Modified: trunk/reactos/base/applications/screensavers/screensavers.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Added: trunk/reactos/base/applications/screensavers/logon/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.c (added) +++ trunk/reactos/base/applications/screensavers/logon/logon.c Mon Jul 30 13:36:32 2007 @@ -1,0 +1,307 @@ +/* + * Copyright 2003 J Brown + * Copyright 2006 Eric Kohl + * Copyright 2007 Marc Piulachs (marc.piulachs(a)codexchange.net) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include <windows.h> +#include <tchar.h> +#include "resource.h" + +#define RANDOM( min, max ) ((rand() % (int)(((max)+1) - (min))) + (min)) + +#define APPNAME _T("Logon") +#define APP_TIMER 1 +#define APP_TIMER_INTERVAL 2000 + +#define BITMAP_HEIGHT 240; +#define BITMAP_WIDTH 340 + +HINSTANCE hInstance; + +BOOL fullscreen = FALSE; + +void DrawScreen (HDC hdc, HDC hMemDC , RECT rect) +{ + int x; + int y; + int width = BITMAP_WIDTH; + int height = BITMAP_HEIGHT; + + if (!fullscreen) + { + width = width / 20; + height = height / 20; + } + + x = RANDOM (0, rect.right - width); + y = RANDOM (0, rect.bottom - height); + + BitBlt( + hdc, + x, + y, + width, + height, + hMemDC, + 0, + 0, + SRCCOPY); +} + +HBITMAP GetScreenSaverBitmap (void) +{ + OSVERSIONINFOEX osvi; + + ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); + GetVersionEx ((OSVERSIONINFO *) &osvi); + + switch(osvi.wProductType) + { + case VER_NT_WORKSTATION: + return LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_WORKSTATION)); + break; + default: + return LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_SERVER)); + break; + } +} + +LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static POINT ptLast; + static POINT ptCursor; + static BOOL fFirstTime = TRUE; + + static PAINTSTRUCT ps; + static RECT rect; + static HDC hDC; + static HDC hMemDC; + static HBRUSH hBlkBrush; + static HBITMAP bitmap; + + switch (msg) + { + case WM_CREATE: + { + hDC = GetDC(hwnd); + hBlkBrush = (HBRUSH) GetStockObject(BLACK_BRUSH); + hMemDC = CreateCompatibleDC(hDC); + GetClientRect(hwnd, &rect); + + bitmap = GetScreenSaverBitmap (); + + if(bitmap == NULL) + { + MessageBox( + hwnd, + _T("Fatal Error: Could not load bitmap"), + _T("Error"), + MB_OK | MB_ICONEXCLAMATION); + } + + SetTimer ( + hwnd, + APP_TIMER, + APP_TIMER_INTERVAL, + NULL); + + break; + } + case WM_PAINT: + { + hDC = BeginPaint(hwnd, &ps); + SelectObject(hMemDC, bitmap); + DrawScreen (hDC , hMemDC , rect); + EndPaint(hwnd, &ps); + break; + } + case WM_TIMER : + { + if (wParam == APP_TIMER) + { + InvalidateRect(hwnd, NULL, 1); + } + } + case WM_ERASEBKGND: + { + SelectObject(hDC, hBlkBrush); + + PatBlt( + hDC, + 0, + 0, + rect.right, + rect.bottom, + PATCOPY); + break; + } + case WM_DESTROY: + { + KillTimer (hwnd, APP_TIMER); + DeleteObject(bitmap); + PostQuitMessage(0); + break; + } + + // break out of screen-saver if any keyboard activity + case WM_NOTIFY: + case WM_SYSKEYDOWN: + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; + + // break out of screen-saver if any mouse activity + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MOUSEMOVE: + // If we've got a parent then we must be a preview + if(GetParent(hwnd) != 0) + return 0; + + if(fFirstTime) + { + GetCursorPos(&ptLast); + fFirstTime = FALSE; + } + + GetCursorPos(&ptCursor); + + // if the mouse has moved more than 3 pixels then exit + if(abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3) + PostMessage(hwnd, WM_CLOSE, 0, 0); + + ptLast = ptCursor; + + return 0; + } + + return DefWindowProc(hwnd, msg, wParam, lParam); +} + +void InitSaver(HWND hwndParent) +{ + WNDCLASS wc; + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WndProc; + wc.lpszClassName = APPNAME; + wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); + RegisterClass(&wc); + + if (hwndParent != 0) + { + RECT rect; + GetClientRect(hwndParent, &rect); + CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_CHILD, + 0, 0, + rect.right, + rect.bottom, + hwndParent, 0, + hInstance, NULL); + fullscreen = FALSE; + } + else + { + HWND hwnd; + hwnd = CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, 0, + hInstance, NULL); + ShowWindow(hwnd, SW_SHOWMAXIMIZED); + ShowCursor(FALSE); + fullscreen = TRUE; + } +} + +void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) +{ + int ch = *szCmdLine++; + + if(ch == '-' || ch == '/') + ch = *szCmdLine++; + + if(ch >= 'A' && ch <= 'Z') + ch += 'a' - 'A'; + + *chOption = ch; + ch = *szCmdLine++; + + if(ch == ':') + ch = *szCmdLine++; + + while(ch == ' ' || ch == '\t') + ch = *szCmdLine++; + + if(isdigit(ch)) + { + unsigned int i = atoi(szCmdLine - 1); + *hwndParent = (HWND)i; + } + else + *hwndParent = 0; +} + +int WINAPI WinMain (HINSTANCE hInst, + HINSTANCE hPrev, + LPSTR lpCmdLine, + int iCmdShow) +{ + HWND hwndParent; + UINT nPreviousState; + int chOption; + MSG Message; + + hInstance = hInst; + + ParseCommandLine(lpCmdLine, &chOption, &hwndParent); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + + switch (chOption) + { + case 's': + InitSaver(0); + break; + + case 'p': + InitSaver(hwndParent); + break; + + case 'c': + default: + MessageBox(0, + _T("No options need to be set."), + _T("About"), + MB_OK | MB_ICONWARNING); + return 0; + } + + while (GetMessage(&Message, 0, 0, 0)) + DispatchMessage(&Message); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); + + return Message.wParam; +} Added: trunk/reactos/base/applications/screensavers/logon/logon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rbuild (added) +++ trunk/reactos/base/applications/screensavers/logon/logon.rbuild Mon Jul 30 13:36:32 2007 @@ -1,0 +1,17 @@ +<module name="logon" type="win32scr" installbase="system32" installname="logon.scr"> + <include base="logon">.</include> + <define name="__USE_W32API" /> + <define name="__REACTOS__" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>opengl32</library> + <library>glu32</library> + <library>winmm</library> + + <file>logon.c</file> + <file>logon.rc</file> +</module> Added: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc Mon Jul 30 13:36:32 2007 @@ -1,0 +1,21 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logon ScreenSaver\0" +#define REACTOS_STR_INTERNAL_NAME "logon\0" +#define REACTOS_STR_ORIGINAL_FILENAME "logon.scr\0" + +#include <reactos/version.rc> + +IDB_WORKSTATION BITMAP DISCARDABLE "res/0.bmp" +IDB_SERVER BITMAP DISCARDABLE "res/1.bmp" + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Logon ScreenSaver" +END Added: trunk/reactos/base/applications/screensavers/logon/res/0.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/screensavers/logon/res/0.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/screensavers/logon/res/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/screensavers/logon/res/1.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/screensavers/logon/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/resource.h (added) +++ trunk/reactos/base/applications/screensavers/logon/resource.h Mon Jul 30 13:36:32 2007 @@ -1,0 +1,4 @@ + +#define IDS_DESCRIPTION 1 +#define IDB_WORKSTATION 0x100 +#define IDB_SERVER 0x200 Modified: trunk/reactos/base/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/screensavers.rbuild (original) +++ trunk/reactos/base/applications/screensavers/screensavers.rbuild Mon Jul 30 13:36:32 2007 @@ -1,13 +1,21 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <group> + +<directory name="cylfrac"> + <xi:include href="cylfrac/cylfrac.rbuild" /> +</directory> + +<directory name="logon"> + <xi:include href="logon/logon.rbuild" /> +</directory> + <directory name="matrix"> <xi:include href="matrix/matrix.rbuild" /> </directory> -<directory name="cylfrac"> - <xi:include href="cylfrac/cylfrac.rbuild" /> -</directory> + <directory name="scrnsave"> <xi:include href="scrnsave/scrnsave.rbuild" /> </directory> + </group> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Jul 30 13:36:32 2007 @@ -30,38 +30,41 @@ ; Base files -base\applications\cacls\cacls.exe 1 -base\applications\calc\calc.exe 1 -base\applications\charmap\charmap.exe 1 -base\applications\cmdutils\find\find.exe 1 -base\applications\cmdutils\more\more.exe 1 -base\applications\control\control.exe 1 -base\applications\mscutils\devmgmt\devmgmt.exe 1 -base\applications\games\solitaire\sol.exe 1 -base\applications\games\winemine\winemine.exe 1 -base\applications\hh\hh.exe 1 -base\applications\hostname\hostname.exe 1 -base\applications\msconfig\msconfig.exe 1 -base\applications\network\arp\arp.exe 1 -base\applications\network\route\route.exe 1 -base\applications\network\finger\finger.exe 1 -base\applications\network\ftp\ftp.exe 1 -base\applications\network\ipconfig\ipconfig.exe 1 -base\applications\network\netstat\netstat.exe 1 -base\applications\network\ping\ping.exe 1 -base\applications\network\telnet\telnet.exe 1 -base\applications\network\tracert\tracert.exe 1 -base\applications\network\whois\whois.exe 1 -base\applications\notepad\notepad.exe 1 -base\applications\regedit\regedit.exe 4 -base\applications\regedit\clb\clb.dll 1 -base\applications\sc\sc.exe 1 -base\applications\screensavers\matrix\matrix.scr 1 -base\applications\mscutils\servman\servman.exe 1 -base\applications\shutdown\shutdown.exe 1 -base\applications\sndvol32\sndvol32.exe 1 -base\applications\taskmgr\taskmgr.exe 1 -base\applications\wordpad\wordpad.exe 1 +base\applications\cacls\cacls.exe 1 +base\applications\calc\calc.exe 1 +base\applications\charmap\charmap.exe 1 +base\applications\cmdutils\find\find.exe 1 +base\applications\cmdutils\more\more.exe 1 +base\applications\control\control.exe 1 +base\applications\mscutils\devmgmt\devmgmt.exe 1 +base\applications\games\solitaire\sol.exe 1 +base\applications\games\winemine\winemine.exe 1 +base\applications\hh\hh.exe 1 +base\applications\hostname\hostname.exe 1 +base\applications\msconfig\msconfig.exe 1 +base\applications\network\arp\arp.exe 1 +base\applications\network\route\route.exe 1 +base\applications\network\finger\finger.exe 1 +base\applications\network\ftp\ftp.exe 1 +base\applications\network\ipconfig\ipconfig.exe 1 +base\applications\network\netstat\netstat.exe 1 +base\applications\network\ping\ping.exe 1 +base\applications\network\telnet\telnet.exe 1 +base\applications\network\tracert\tracert.exe 1 +base\applications\network\whois\whois.exe 1 +base\applications\notepad\notepad.exe 1 +base\applications\regedit\regedit.exe 4 +base\applications\regedit\clb\clb.dll 1 +base\applications\sc\sc.exe 1 +base\applications\screensavers\cylfrac\cylfrac.scr 1 +base\applications\screensavers\logon\logon.scr 1 +base\applications\screensavers\matrix\matrix.scr 1 +base\applications\screensavers\scrnsave\scrnsave.scr 1 +base\applications\mscutils\servman\servman.exe 1 +base\applications\shutdown\shutdown.exe 1 +base\applications\sndvol32\sndvol32.exe 1 +base\applications\taskmgr\taskmgr.exe 1 +base\applications\wordpad\wordpad.exe 1 base\services\dhcp\dhcp.exe 1 base\services\eventlog\eventlog.exe 1

1 0

[cwittich] 28037: fix broken condition in CallWindowProc
by cwittich＠svn.reactos.org 30 Jul '07

30 Jul '07

Author: cwittich Date: Mon Jul 30 12:44:52 2007 New Revision: 28037 URL: http://svn.reactos.org/svn/reactos?rev=28037&view=rev Log: fix broken condition in CallWindowProc Modified: trunk/reactos/dll/win32/user32/windows/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Mon Jul 30 12:44:52 2007 @@ -1239,16 +1239,19 @@ if (lpPrevWndFunc == NULL) lpPrevWndFunc = (WNDPROC)NtUserGetWindowLong(hWnd, GWLP_WNDPROC, TRUE); - if (!IsCallProcHandle(lpPrevWndFunc) || - !NtUserDereferenceWndProcHandle((HANDLE)lpPrevWndFunc, + if (!IsCallProcHandle(lpPrevWndFunc)) + return IntCallWindowProcA(TRUE, lpPrevWndFunc, hWnd, Msg, wParam, lParam); + else + { + if (NtUserDereferenceWndProcHandle((HANDLE)lpPrevWndFunc, &wpInfo)) - { - return IntCallWindowProcA(TRUE, lpPrevWndFunc, hWnd, Msg, wParam, lParam); - } - else - { - return IntCallWindowProcA(!wpInfo.IsUnicode, wpInfo.WindowProc, - hWnd, Msg, wParam, lParam); + return IntCallWindowProcA(!wpInfo.IsUnicode, wpInfo.WindowProc, + hWnd, Msg, wParam, lParam); + else + { + DPRINT("CallWindowProcA: can not dereference WndProcHandle\n"); + return 0; + } } } @@ -1269,17 +1272,20 @@ if (lpPrevWndFunc == NULL) lpPrevWndFunc = (WNDPROC)NtUserGetWindowLong(hWnd, GWLP_WNDPROC, FALSE); - if (!IsCallProcHandle(lpPrevWndFunc) || - !NtUserDereferenceWndProcHandle((HANDLE)lpPrevWndFunc, + if (!IsCallProcHandle(lpPrevWndFunc)) + return IntCallWindowProcW(FALSE, lpPrevWndFunc, hWnd, Msg, wParam, lParam); + else + { + if (NtUserDereferenceWndProcHandle((HANDLE)lpPrevWndFunc, &wpInfo)) - { - return IntCallWindowProcW(FALSE, lpPrevWndFunc, hWnd, Msg, wParam, lParam); - } - else - { return IntCallWindowProcW(!wpInfo.IsUnicode, wpInfo.WindowProc, hWnd, Msg, wParam, lParam); - } + else + { + DPRINT("CallWindowProcW: can not dereference WndProcHandle\n"); + return 0; + } + } }

1 0

[tkreuzer] 28036: use NtUserInvalidateRect and NtUserInvalidateRgn in user32. Should be redirected directly in.def file, but it breaks a lot of references, so currently only calling it.
by tkreuzer＠svn.reactos.org 30 Jul '07

30 Jul '07

Author: tkreuzer Date: Mon Jul 30 08:03:00 2007 New Revision: 28036 URL: http://svn.reactos.org/svn/reactos?rev=28036&view=rev Log: use NtUserInvalidateRect and NtUserInvalidateRgn in user32. Should be redirected directly in.def file, but it breaks a lot of references, so currently only calling it. Modified: trunk/reactos/dll/win32/user32/windows/paint.c Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c Mon Jul 30 08:03:00 2007 @@ -157,7 +157,7 @@ CONST RECT *lpRect, BOOL bErase) { - return RedrawWindow( hWnd, lpRect, 0, RDW_INVALIDATE | (bErase ? RDW_ERASE : 0) ); + return NtUserInvalidateRect(hWnd, lpRect, bErase); } @@ -171,7 +171,7 @@ HRGN hRgn, BOOL bErase) { - return RedrawWindow(hWnd, NULL, hRgn, RDW_INVALIDATE | (bErase ? RDW_ERASE : 0) ); + return NtUserInvalidateRgn(hWnd, hRgn, bErase); }

1 0

[tkreuzer] 28035: add NtUserInvalidateRect and NtUserInvalidateRgn to w32ksvc.db
by tkreuzer＠svn.reactos.org 30 Jul '07

30 Jul '07

Author: tkreuzer Date: Mon Jul 30 07:42:40 2007 New Revision: 28035 URL: http://svn.reactos.org/svn/reactos?rev=28035&view=rev Log: add NtUserInvalidateRect and NtUserInvalidateRgn to w32ksvc.db Modified: trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Mon Jul 30 07:42:40 2007 @@ -417,6 +417,8 @@ NtUserInitTask 11 NtUserInsertMenuItem 4 NtUserInternalGetWindowText 3 +NtUserInvalidateRect 3 +NtUserInvalidateRgn 3 NtUserIsClipboardFormatAvailable 1 NtUserKillSystemTimer 2 NtUserKillTimer 2

1 0

[tkreuzer] 28034: add NtUserInvalidateRect and NtUserInvalidateRgn
by tkreuzer＠svn.reactos.org 30 Jul '07

30 Jul '07

Author: tkreuzer Date: Mon Jul 30 07:41:48 2007 New Revision: 28034 URL: http://svn.reactos.org/svn/reactos?rev=28034&view=rev Log: add NtUserInvalidateRect and NtUserInvalidateRgn Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Mon Jul 30 07:41:48 2007 @@ -1437,6 +1437,20 @@ UINT flags ); +BOOL +NTAPI +NtUserInvalidateRect( + HWND hWnd, + CONST RECT *lpRect, + BOOL bErase); + +BOOL +NTAPI +NtUserInvalidateRgn( + HWND hWnd, + HRGN hRgn, + BOOL bErase); + /* FIXME: These flag constans aren't what Windows uses. */ #define REGISTERCLASS_ANSI 2 #define REGISTERCLASS_SYSTEM 4

1 0

[tkreuzer] 28033: implement NtUserInvalidateRect and NtUserInvalidateRgn
by tkreuzer＠svn.reactos.org 30 Jul '07

30 Jul '07

Author: tkreuzer Date: Mon Jul 30 07:30:55 2007 New Revision: 28033 URL: http://svn.reactos.org/svn/reactos?rev=28033&view=rev Log: implement NtUserInvalidateRect and NtUserInvalidateRgn Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Mon Jul 30 07:30:55 2007 @@ -1910,4 +1910,24 @@ return NtUserDrawCaptionTemp(hWnd, hDC, lpRc, 0, 0, NULL, uFlags); } +BOOL +NTAPI +NtUserInvalidateRect( + HWND hWnd, + CONST RECT *lpUnsafeRect, + BOOL bErase) +{ + return NtUserRedrawWindow(hWnd, lpUnsafeRect, NULL, RDW_INVALIDATE | (bErase? RDW_ERASE : 0)); +} + +BOOL +NTAPI +NtUserInvalidateRgn( + HWND hWnd, + HRGN hRgn, + BOOL bErase) +{ + return NtUserRedrawWindow(hWnd, NULL, hRgn, RDW_INVALIDATE | (bErase? RDW_ERASE : 0)); +} + /* EOF */

1 0

[tkreuzer] 28032: simplify VIS_ComputeVisibleRegion
by tkreuzer＠svn.reactos.org 30 Jul '07

30 Jul '07

Author: tkreuzer Date: Mon Jul 30 06:49:11 2007 New Revision: 28032 URL: http://svn.reactos.org/svn/reactos?rev=28032&view=rev Log: simplify VIS_ComputeVisibleRegion Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c Mon Jul 30 06:49:11 2007 @@ -47,21 +47,12 @@ if (ClientArea) { - if (!(ClipRgn = VIS_ComputeVisibleRegion(Window, FALSE, ClipChildren, ClipSiblings))) - { - return NULL; - } - if (!(VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect))) - { - NtGdiDeleteObject(VisRgn); - return NULL; - } - NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_AND); - NtGdiDeleteObject(ClipRgn); - return VisRgn; + VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->ClientRect); } - - VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); + else + { + VisRgn = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); + } /* * Walk through all parent windows and for each clip the visble region

1 0

[tkreuzer] 28031: fix a DPRINT
by tkreuzer＠svn.reactos.org 30 Jul '07

30 Jul '07

Author: tkreuzer Date: Mon Jul 30 06:29:52 2007 New Revision: 28031 URL: http://svn.reactos.org/svn/reactos?rev=28031&view=rev Log: fix a DPRINT Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Mon Jul 30 06:29:52 2007 @@ -4376,7 +4376,7 @@ RETURN( (INT)hRgn); CLEANUP: - DPRINT("Leave NtUserSystemParametersInfo, ret=%i\n",_ret_); + DPRINT("Leave NtUserSetWindowRgn, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; }

1 0

[tkreuzer] 28030: update ntgdibad.h
by tkreuzer＠svn.reactos.org 30 Jul '07

30 Jul '07

Author: tkreuzer Date: Mon Jul 30 06:24:48 2007 New Revision: 28030 URL: http://svn.reactos.org/svn/reactos?rev=28030&view=rev Log: update ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Mon Jul 30 06:24:48 2007 @@ -1062,10 +1062,6 @@ /* These shouldn't even be called NtGdi */ HDC STDCALL NtGdiGetDCState(HDC hDC); WORD STDCALL NtGdiSetHookFlags(HDC hDC, WORD Flags); -INT -STDCALL -NtGdiSelectVisRgn(HDC hdc, - HRGN hrgn); VOID STDCALL NtGdiSetDCState ( HDC hDC, HDC hDCSave ); /* All this Should be in user-mode, not NtUser calls. Especially not in GDI! */

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