Ros-diffs

ros-diffs@reactos.org

81390 discussions

[zguo] 65656: [DESK.CPL] Check for the correct registry value for the wallpaper. Patch by Ricardo Hanke. CORE-8796
by zguo＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: zguo Date: Sun Dec 14 22:38:45 2014 New Revision: 65656 URL: http://svn.reactos.org/svn/reactos?rev=65656&view=rev Log: [DESK.CPL] Check for the correct registry value for the wallpaper. Patch by Ricardo Hanke. CORE-8796 Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Sun Dec 14 22:38:45 2014 @@ -78,6 +78,7 @@ SHFILEINFO sfi; HIMAGELIST himl; TCHAR wallpaperFilename[MAX_PATH]; + TCHAR originalWallpaper[MAX_PATH]; DWORD bufferSize = sizeof(wallpaperFilename); TCHAR buffer[MAX_PATH]; DWORD varType = REG_SZ; @@ -132,6 +133,27 @@ result = RegQueryValueEx(regKey, TEXT("Wallpaper"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize); if ((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0)) { + bufferSize = sizeof(originalWallpaper); + result = RegQueryValueEx(regKey, TEXT("OriginalWallpaper"), 0, &varType, (LPBYTE)originalWallpaper, &bufferSize); + + /* If Wallpaper and OriginalWallpaper are the same, try to retrieve ConvertedWallpaper and use it instead of Wallpaper */ + if ((result == ERROR_SUCCESS) && (_tcslen(originalWallpaper) > 0) && (_tcsicmp(wallpaperFilename, originalWallpaper) == 0)) + { + bufferSize = sizeof(originalWallpaper); + result = RegQueryValueEx(regKey, TEXT("ConvertedWallpaper"), 0, &varType, (LPBYTE)originalWallpaper, &bufferSize); + + if ((result == ERROR_SUCCESS) && (_tcslen(originalWallpaper) > 0)) + { + hr = StringCbCopy(wallpaperFilename, sizeof(wallpaperFilename), originalWallpaper); + } + + if (FAILED(hr)) + { + RegCloseKey(regKey); + return; + } + } + /* Allow environment variables in file name */ if (ExpandEnvironmentStrings(wallpaperFilename, buffer, MAX_PATH)) {

1 0

[hbelusca] 65655: [CONSRV] - Fix info header. - Add a VDMBuffer check.
by hbelusca＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: hbelusca Date: Sun Dec 14 22:19:05 2014 New Revision: 65655 URL: http://svn.reactos.org/svn/reactos?rev=65655&view=rev Log: [CONSRV] - Fix info header. - Add a VDMBuffer check. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.h branches/condrv_restructure/win32ss/user/winsrv/consrv/api.h branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/graphics.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/console.h branches/condrv_restructure/win32ss/user/winsrv/consrv/consrv.h branches/condrv_restructure/win32ss/user/winsrv/consrv/frontendctl.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/resource.h branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.h branches/condrv_restructure/win32ss/user/winsrv/consrv/heap.h branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c branches/condrv_restructure/win32ss/user/winsrv/consrv/history.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/console.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.h branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h branches/condrv_restructure/win32ss/user/winsrv/consrv/procinit.h branches/condrv_restructure/win32ss/user/winsrv/consrv/resource.h branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c branches/condrv_restructure/win32ss/user/winsrv/consrv/shutdown.c branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * LICENSE: GPL - See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/alias.c + * FILE: consrv/alias.c * PURPOSE: Alias support functions * PROGRAMMERS: Christoph Wittich * Johannes Anderwald Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * LICENSE: GPL - See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/alias.h + * FILE: consrv/alias.h * PURPOSE: Alias support functions * PROGRAMMERS: Christoph Wittich * Johannes Anderwald Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/api.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/api.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/api.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/api.h + * FILE: consrv/api.h * PURPOSE: Public server APIs definitions * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Driver DLL - * FILE: win32ss/user/winsrv/consrv/condrv/coninput.c + * FILE: consrv/condrv/coninput.c * PURPOSE: Console Input functions * PROGRAMMERS: Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Driver DLL - * FILE: win32ss/user/winsrv/consrv/condrv/conoutput.c + * FILE: consrv/condrv/conoutput.c * PURPOSE: General Console Output Functions * PROGRAMMERS: Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Driver DLL - * FILE: win32ss/user/winsrv/consrv/condrv/console.c + * FILE: consrv/condrv/console.c * PURPOSE: Console Management Functions * PROGRAMMERS: Gé van Geldorp * Jeffrey Morlan Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Driver DLL - * FILE: win32ss/user/winsrv/consrv/condrv/graphics.c + * FILE: consrv/condrv/graphics.c * PURPOSE: Console Output Functions for graphics-mode screen-buffers * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) * Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Driver DLL - * FILE: win32ss/user/winsrv/consrv/condrv/text.c + * FILE: consrv/condrv/text.c * PURPOSE: Console Output Functions for text-mode screen-buffers * PROGRAMMERS: Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/coninput.c + * FILE: consrv/coninput.c * PURPOSE: Console Input functions * PROGRAMMERS: Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/coninput.h + * FILE: consrv/coninput.h * PURPOSE: Console Input functions * PROGRAMMERS: Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/conoutput.c + * FILE: consrv/conoutput.c * PURPOSE: General Console Output Functions * PROGRAMMERS: Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) @@ -44,7 +44,7 @@ if (!NT_SUCCESS(Status)) return Status; /* In text-mode only, draw the VDM buffer if present */ - if (GetType(Buffer) == TEXTMODE_BUFFER) + if (GetType(Buffer) == TEXTMODE_BUFFER && Buffer->Header.Console->VDMBuffer) { PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/conoutput.h + * FILE: consrv/conoutput.h * PURPOSE: Console Output functions * PROGRAMMERS: Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/console.c + * FILE: consrv/console.c * PURPOSE: Console Management Functions * PROGRAMMERS: Gé van Geldorp * Jeffrey Morlan Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/console.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/console.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/console.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/console.h + * FILE: consrv/console.h * PURPOSE: Console Initialization Functions * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/consrv.h + * FILE: consrv/consrv.h * PURPOSE: Main header - Definitions * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/frontendctl.c + * FILE: consrv/frontendctl.c * PURPOSE: Terminal Front-Ends Control * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/consolecpl.h + * FILE: consrv/consolecpl.h * PURPOSE: GUI front-end settings management - Header for console.dll * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c + * FILE: consrv/frontends/gui/fullscreen.c * PURPOSE: GUI Terminal Full-screen Mode * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/frontends/gui/graphics.c + * FILE: consrv/frontends/gui/graphics.c * PURPOSE: GUI Terminal Front-End - Support for graphics-mode screen-buffers * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/frontends/gui/guisettings.c + * FILE: consrv/frontends/gui/guisettings.c * PURPOSE: GUI Terminal Front-End Settings Management * PROGRAMMERS: Johannes Anderwald * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/guisettings.h + * FILE: consrv/guisettings.h * PURPOSE: GUI front-end settings management * PROGRAMMERS: Johannes Anderwald * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/frontends/gui/guiterm.c + * FILE: consrv/frontends/gui/guiterm.c * PURPOSE: GUI Terminal Front-End * PROGRAMMERS: Gé van Geldorp * Johannes Anderwald Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/frontends/gui/guiterm.h + * FILE: consrv/frontends/gui/guiterm.h * PURPOSE: GUI Terminal Front-End * PROGRAMMERS: Gé van Geldorp * Johannes Anderwald Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/resource.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/resource.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/resource.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,8 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/resource.h - * PURPOSE: Resource #defines + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: consrv/resource.h + * PURPOSE: Resource #defines */ #pragma once Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/frontends/gui/text.c + * FILE: consrv/frontends/gui/text.c * PURPOSE: GUI Terminal Front-End - Support for text-mode screen-buffers * PROGRAMMERS: Gé van Geldorp * Johannes Anderwald Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/frontends/input.c + * FILE: consrv/frontends/input.c * PURPOSE: Common Front-Ends Input functions * PROGRAMMERS: Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c + * FILE: consrv/frontends/tui/tuiterm.c * PURPOSE: TUI Terminal Front-End - Virtual Consoles... * PROGRAMMERS: David Welch * Gé van Geldorp Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h + * FILE: consrv/frontends/tui/tuiterm.h * PURPOSE: TUI Terminal Front-End * PROGRAMMERS: David Welch * Gé van Geldorp Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * LICENSE: GPL - See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/handle.c + * FILE: consrv/handle.c * PURPOSE: Console I/O Handles functions * PROGRAMMERS: David Welch * Jeffrey Morlan Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * LICENSE: GPL - See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/handle.h + * FILE: consrv/handle.h * PURPOSE: Console I/O Handles functions * PROGRAMMERS: David Welch * Jeffrey Morlan Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/heap.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/heap.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/heap.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/heap.h + * FILE: consrv/heap.h * PURPOSE: Heap Helpers * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * LICENSE: GPL - See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/history.c + * FILE: consrv/history.c * PURPOSE: Console line input functions * PROGRAMMERS: Jeffrey Morlan */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/history.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/history.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/history.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * LICENSE: GPL - See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/history.h + * FILE: consrv/history.h * PURPOSE: Console line input functions * PROGRAMMERS: Jeffrey Morlan */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/console.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/console.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/console.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/include/console.h + * FILE: consrv/include/console.h * PURPOSE: Public Console Management Interface * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/include/settings.h + * FILE: consrv/include/settings.h * PURPOSE: Public Console Settings Management Interface * PROGRAMMERS: Johannes Anderwald * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/include/term.h + * FILE: consrv/include/term.h * PURPOSE: Internal Frontend Interface * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/init.c + * FILE: consrv/init.c * PURPOSE: Initialization * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * LICENSE: GPL - See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/lineinput.c + * FILE: consrv/lineinput.c * PURPOSE: Console line input functions * PROGRAMMERS: Jeffrey Morlan */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * LICENSE: GPL - See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/lineinput.h + * FILE: consrv/lineinput.h * PURPOSE: Console line input functions * PROGRAMMERS: Jeffrey Morlan */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * LICENSE: GPL - See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/popup.c + * FILE: consrv/popup.c * PURPOSE: Console popup windows * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) * Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * LICENSE: GPL - See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/popup.h + * FILE: consrv/popup.h * PURPOSE: Console popup windows * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/procinit.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/procinit.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/procinit.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * LICENSE: GPL - See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/procinit.h + * FILE: consrv/procinit.h * PURPOSE: Functions for console processes initialization * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/resource.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/resource.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/resource.h [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/resource.h + * FILE: consrv/resource.h * PURPOSE: Resource #defines */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/settings.c + * FILE: consrv/settings.c * PURPOSE: Console settings management * PROGRAMMERS: Johannes Anderwald * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/shutdown.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/shutdown.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/shutdown.c + * FILE: consrv/shutdown.c * PURPOSE: Processes Shutdown * PROGRAMMERS: Alex Ionescu */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] Sun Dec 14 22:19:05 2014 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL - * FILE: win32ss/user/winsrv/consrv/subsysreg.c + * FILE: consrv/subsysreg.c * PURPOSE: Registration APIs for VDM, OS2 and IME subsystems * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */

1 0

[hbelusca] 65654: [MSPAINT]: Remove trailing whitespace.
by hbelusca＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: hbelusca Date: Sun Dec 14 21:56:21 2014 New Revision: 65654 URL: http://svn.reactos.org/svn/reactos?rev=65654&view=rev Log: [MSPAINT]: Remove trailing whitespace. Modified: trunk/reactos/base/applications/mspaint/definitions.h trunk/reactos/base/applications/mspaint/drawing.c trunk/reactos/base/applications/mspaint/globalvar.h trunk/reactos/base/applications/mspaint/lang/pl-PL.rc trunk/reactos/base/applications/mspaint/main.c trunk/reactos/base/applications/mspaint/rsrc.rc trunk/reactos/base/applications/mspaint/selection.c trunk/reactos/base/applications/mspaint/textedit.c trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/definitions.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/definitions.h [iso-8859-1] Sun Dec 14 21:56:21 2014 @@ -5,7 +5,7 @@ * PURPOSE: Defines the resource ids and other stuff * PROGRAMMERS: Benedikt Freisen */ - + /* DEFINES **********************************************************/ #define HISTORYSIZE 11 Modified: trunk/reactos/base/applications/mspaint/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/drawing.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/drawing.c [iso-8859-1] Sun Dec 14 21:56:21 2014 @@ -128,7 +128,7 @@ { LONG a, b, x, y; b = max(1, max(abs(x2 - x1), abs(y2 - y1))); - + for(a = 0; a <= b; a++) for(y = (y1 * (b - a) + y2 * a) / b - radius + 1; y < (y1 * (b - a) + y2 * a) / b + radius + 1; y++) @@ -142,7 +142,7 @@ Airbrush(HDC hdc, LONG x, LONG y, COLORREF color, LONG r) { LONG a, b; - + for(b = -r; b <= r; b++) for(a = -r; a <= r; a++) if ((a * a + b * b <= r * r) && (rand() % 4 == 0)) @@ -195,7 +195,7 @@ case 10: case 11: { - POINT offsTop[] = {{4, -3}, {2, -2}, {0, 0}, + POINT offsTop[] = {{4, -3}, {2, -2}, {0, 0}, {-3, -3}, {-2, -2}, {-1, 0}}; POINT offsBtm[] = {{-3, 4}, {-2, 2}, {-1, 1}, {4, 4}, {2, 2}, {0, 1}}; Modified: trunk/reactos/base/applications/mspaint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/globalvar.h [iso-8859-1] Sun Dec 14 21:56:21 2014 @@ -5,7 +5,7 @@ * PURPOSE: Declaring global variables for later initialization * PROGRAMMERS: Benedikt Freisen */ - + /* INCLUDES *********************************************************/ //#include <windows.h> @@ -93,7 +93,7 @@ extern HWND hToolBtn[16]; extern HINSTANCE hProgInstance; - + extern TCHAR filename[256]; extern TCHAR filepathname[1000]; extern BOOL isAFile; Modified: trunk/reactos/base/applications/mspaint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/pl-PL.rc [iso-8859-1] Sun Dec 14 21:56:21 2014 @@ -4,7 +4,7 @@ * FILE: base/applications/mspaint/lang/pl-PL.rc * PURPOSE: Polish Language resource file * TRANSLATOR: Caemyr - Olaf Siejka (May, 2009), Use ReactOS forum PM or IRC to contact me - * UTF-8 conversion by Caemyr (May, 2011) + * UTF-8 conversion by Caemyr (May, 2011) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/mspaint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] Sun Dec 14 21:56:21 2014 @@ -139,7 +139,7 @@ { HWND hwnd; /* This is the handle for our window */ MSG messages; /* Here messages to the application are saved */ - + TCHAR progtitle[1000]; TCHAR resstr[100]; HMENU menu; @@ -150,7 +150,7 @@ int i; TCHAR tooltips[16][30]; HDC hDC; - + TCHAR *c; TCHAR sfnFilename[1000]; TCHAR sfnFiletitle[256]; @@ -202,7 +202,7 @@ LoadString(hThisInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(progtitle, resstr, filename); LoadString(hThisInstance, IDS_MINIATURETITLE, miniaturetitle, SIZEOF(miniaturetitle)); - + /* create main window */ hwnd = CreateWindowEx(0, _T("MainWindow"), progtitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 544, @@ -240,8 +240,8 @@ /* creating the 16 bitmap radio buttons and setting the bitmap */ - /* - * FIXME: Unintentionally there is a line above the tool bar (hidden by y-offset). + /* + * FIXME: Unintentionally there is a line above the tool bar (hidden by y-offset). * To prevent cropping of the buttons height has been increased from 200 to 205 */ hToolbar = @@ -254,7 +254,7 @@ ImageList_AddMasked(hImageList, tempBm, 0xff00ff); DeleteObject(tempBm); SendMessage(hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - + for(i = 0; i < 16; i++) { TBBUTTON tbbutton; @@ -272,7 +272,7 @@ tbbutton.iBitmap = i; SendMessage(hToolbar, TB_ADDBUTTONS, 1, (LPARAM) &tbbutton); } - + SendMessage(hToolbar, TB_CHECKBUTTON, ID_PEN, MAKELONG(TRUE, 0)); SendMessage(hToolbar, TB_SETMAXTEXTROWS, 0, 0); SendMessage(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(25, 25)); Modified: trunk/reactos/base/applications/mspaint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/rsrc.rc [iso-8859-1] Sun Dec 14 21:56:21 2014 @@ -5,7 +5,7 @@ * PURPOSE: Managing the resources * PROGRAMMERS: Benedikt Freisen */ - + /* INCLUDES *********************************************************/ #include <windef.h> Modified: trunk/reactos/base/applications/mspaint/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/selection.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/selection.c [iso-8859-1] Sun Dec 14 21:56:21 2014 @@ -25,8 +25,8 @@ /* FUNCTIONS ********************************************************/ LPCTSTR cursors[9] = { /* action to mouse cursor lookup table */ - IDC_SIZEALL, - + IDC_SIZEALL, + IDC_SIZENWSE, IDC_SIZENS, IDC_SIZENESW, IDC_SIZEWE, IDC_SIZEWE, IDC_SIZENESW, IDC_SIZENS, IDC_SIZENWSE @@ -66,7 +66,7 @@ HBITMAP hTempBm; HBRUSH hTempBrush; HBITMAP hTempMask; - + hTempDC = CreateCompatibleDC(hdcSrc); hTempDC2 = CreateCompatibleDC(hdcSrc); hTempBm = CreateCompatibleBitmap(hTempDC, nWidth, nHeight); @@ -280,7 +280,7 @@ { if (activeTool == TOOL_TEXT) { - + // FIXME: What to do? } else { Modified: trunk/reactos/base/applications/mspaint/textedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/textedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/textedit.c [iso-8859-1] Sun Dec 14 21:56:21 2014 @@ -65,6 +65,6 @@ default: return DefWindowProc(hwnd, message, wParam, lParam); } - + return 0; } Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Sun Dec 14 21:56:21 2014 @@ -440,7 +440,7 @@ } break; - // mouse events used for drawing + // mouse events used for drawing case WM_SETCURSOR: if (hwnd == hImageArea)

1 0

[hbelusca] 65653: [CONSRV]: Rename context members with a more explicit name (code "style" only).
by hbelusca＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: hbelusca Date: Sun Dec 14 21:51:32 2014 New Revision: 65653 URL: http://svn.reactos.org/svn/reactos?rev=65653&view=rev Log: [CONSRV]: Rename context members with a more explicit name (code "style" only). Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -64,8 +64,6 @@ } else if (Buffer->Header.Type == SCREEN_BUFFER) { - // TODO: Free Buffer->Data - /* Free the palette handle */ if (Buffer->PaletteHandle != NULL) DeleteObject(Buffer->PaletteHandle); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -138,9 +138,9 @@ CreateSysMenu(HWND hWnd); static DWORD NTAPI -GuiConsoleInputThread(PVOID Data) -{ - PHANDLE GraphicsStartupEvent = (PHANDLE)Data; +GuiConsoleInputThread(PVOID Param) +{ + PHANDLE GraphicsStartupEvent = (PHANDLE)Param; LONG WindowCount = 0; MSG msg; @@ -348,12 +348,12 @@ PGUI_CONSOLE_DATA GuiData; GUI_CONSOLE_INFO TermInfo; - if (This == NULL || Console == NULL || This->OldData == NULL) + if (This == NULL || Console == NULL || This->Context2 == NULL) return STATUS_INVALID_PARAMETER; ASSERT(This->Console == Console); - GuiInitInfo = This->OldData; + GuiInitInfo = This->Context2; if (GuiInitInfo->ConsoleInfo == NULL || GuiInitInfo->ConsoleStartInfo == NULL) return STATUS_INVALID_PARAMETER; @@ -368,7 +368,7 @@ DPRINT1("CONSRV: Failed to create GUI_CONSOLE_DATA\n"); return STATUS_UNSUCCESSFUL; } - ///// /* HACK */ Console->FrontEndIFace.Data = (PVOID)GuiData; /* HACK */ + ///// /* HACK */ Console->FrontEndIFace.Context = (PVOID)GuiData; /* HACK */ GuiData->Console = Console; GuiData->ActiveBuffer = Console->ActiveBuffer; GuiData->hWindow = NULL; @@ -472,9 +472,9 @@ // TODO: Retrieve the selection mode via the registry. /* Finally, finish to initialize the frontend structure */ - This->Data = GuiData; - if (This->OldData) ConsoleFreeHeap(This->OldData); - This->OldData = NULL; + This->Context = GuiData; + if (This->Context2) ConsoleFreeHeap(This->Context2); + This->Context2 = NULL; /* * We need to wait until the GUI has been fully initialized @@ -512,7 +512,7 @@ static VOID NTAPI GuiDeinitFrontEnd(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; DPRINT("Send PM_DESTROY_CONSOLE message and wait on hGuiTermEvent...\n"); PostThreadMessageW(dwInputThreadId, PM_DESTROY_CONSOLE, 0, (LPARAM)GuiData); @@ -534,7 +534,7 @@ DestroyIcon(GuiData->hIconSm); } - This->Data = NULL; + This->Context = NULL; DeleteCriticalSection(&GuiData->Lock); ConsoleFreeHeap(GuiData); @@ -545,7 +545,7 @@ GuiDrawRegion(IN OUT PFRONTEND This, SMALL_RECT* Region) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; /* Do nothing if the window is hidden */ if (!GuiData->IsWindowVisible) return; @@ -562,7 +562,7 @@ PWCHAR Buffer, UINT Length) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; PCONSOLE_SCREEN_BUFFER Buff; SHORT CursorEndX, CursorEndY; RECT ScrollRect; @@ -619,7 +619,7 @@ /* static */ VOID NTAPI GuiRingBell(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; /* Emit an error beep sound */ SendNotifyMessage(GuiData->hWindow, PM_CONSOLE_BEEP, 0, 0); @@ -629,7 +629,7 @@ GuiSetCursorInfo(IN OUT PFRONTEND This, PCONSOLE_SCREEN_BUFFER Buff) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; /* Do nothing if the window is hidden */ if (!GuiData->IsWindowVisible) return TRUE; @@ -648,7 +648,7 @@ SHORT OldCursorX, SHORT OldCursorY) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; /* Do nothing if the window is hidden */ if (!GuiData->IsWindowVisible) return TRUE; @@ -667,7 +667,7 @@ static VOID NTAPI GuiResizeTerminal(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; /* Resize the window to the user's values */ PostMessageW(GuiData->hWindow, PM_RESIZE_TERMINAL, 0, 0); @@ -676,7 +676,7 @@ static VOID NTAPI GuiSetActiveScreenBuffer(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; PCONSOLE_SCREEN_BUFFER ActiveBuffer; HPALETTE hPalette; @@ -720,7 +720,7 @@ GuiReleaseScreenBuffer(IN OUT PFRONTEND This, IN PCONSOLE_SCREEN_BUFFER ScreenBuffer) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; /* * If we were notified to release a screen buffer that is not actually @@ -767,7 +767,7 @@ static VOID NTAPI GuiRefreshInternalInfo(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; /* Update the console leader information held by the window */ SetConWndConsoleLeaderCID(GuiData); @@ -789,7 +789,7 @@ static VOID NTAPI GuiChangeTitle(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; // PostMessageW(GuiData->hWindow, PM_CONSOLE_SET_TITLE, 0, 0); SetWindowText(GuiData->hWindow, GuiData->Console->Title.Buffer); } @@ -798,7 +798,7 @@ GuiChangeIcon(IN OUT PFRONTEND This, HICON IconHandle) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; HICON hIcon, hIconSm; if (IconHandle == NULL) @@ -842,7 +842,7 @@ static HWND NTAPI GuiGetConsoleWindowHandle(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; return GuiData->hWindow; } @@ -850,7 +850,7 @@ GuiGetLargestConsoleWindowSize(IN OUT PFRONTEND This, PCOORD pSize) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; PCONSOLE_SCREEN_BUFFER ActiveBuffer; RECT WorkArea; LONG width, height; @@ -893,7 +893,7 @@ GuiGetSelectionInfo(IN OUT PFRONTEND This, PCONSOLE_SELECTION_INFO pSelectionInfo) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; if (pSelectionInfo == NULL) return FALSE; @@ -909,7 +909,7 @@ HPALETTE PaletteHandle, UINT PaletteUsage) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; HPALETTE OldPalette; // if (GetType(GuiData->ActiveBuffer) != GRAPHICS_BUFFER) return FALSE; @@ -934,7 +934,7 @@ static ULONG NTAPI GuiGetDisplayMode(IN OUT PFRONTEND This) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; ULONG DisplayMode = 0; if (GuiData->GuiInfo.FullScreen) @@ -949,7 +949,7 @@ GuiSetDisplayMode(IN OUT PFRONTEND This, ULONG NewMode) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; BOOL FullScreen; if (NewMode & ~(CONSOLE_FULLSCREEN_MODE | CONSOLE_WINDOWED_MODE)) @@ -972,7 +972,7 @@ GuiShowMouseCursor(IN OUT PFRONTEND This, BOOL Show) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; if (GuiData->IsWindowVisible) { @@ -991,7 +991,7 @@ GuiSetMouseCursor(IN OUT PFRONTEND This, HCURSOR CursorHandle) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; /* Do nothing if the window is hidden */ if (!GuiData->IsWindowVisible) return TRUE; @@ -1013,7 +1013,7 @@ UINT CmdIdLow, UINT CmdIdHigh) { - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; GuiData->CmdIdLow = CmdIdLow ; GuiData->CmdIdHigh = CmdIdHigh; @@ -1031,7 +1031,7 @@ * for more information. */ - PGUI_CONSOLE_DATA GuiData = This->Data; + PGUI_CONSOLE_DATA GuiData = This->Context; HMENU hSysMenu = GetSystemMenu(GuiData->hWindow, FALSE); if (hSysMenu == NULL) return FALSE; @@ -1100,9 +1100,9 @@ GuiInitInfo->IsWindowVisible = ConsoleInitInfo->IsWindowVisible; /* Finally, initialize the frontend structure */ - FrontEnd->Vtbl = &GuiVtbl; - FrontEnd->Data = NULL; - FrontEnd->OldData = GuiInitInfo; + FrontEnd->Vtbl = &GuiVtbl; + FrontEnd->Context = NULL; + FrontEnd->Context2 = GuiInitInfo; return STATUS_SUCCESS; } @@ -1112,8 +1112,8 @@ { if (FrontEnd == NULL) return STATUS_INVALID_PARAMETER; - if (FrontEnd->Data) GuiDeinitFrontEnd(FrontEnd); - if (FrontEnd->OldData) ConsoleFreeHeap(FrontEnd->OldData); + if (FrontEnd->Context ) GuiDeinitFrontEnd(FrontEnd); + if (FrontEnd->Context2) ConsoleFreeHeap(FrontEnd->Context2); return STATUS_SUCCESS; } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -230,7 +230,7 @@ /* Initialize the ConSrv terminal */ Terminal->Vtbl = &ConSrvTermVtbl; // Terminal->Console will be initialized by ConDrvRegisterTerminal - Terminal->Data = FrontEnd; /* We store the frontend pointer in the terminal private data */ + Terminal->Context = FrontEnd; /* We store the frontend pointer in the terminal private context */ return STATUS_SUCCESS; } @@ -239,10 +239,10 @@ ConSrvDeinitTerminal(IN OUT PTERMINAL Terminal) { NTSTATUS Status = STATUS_SUCCESS; - PFRONTEND FrontEnd = Terminal->Data; + PFRONTEND FrontEnd = Terminal->Context; /* Reset the ConSrv terminal */ - Terminal->Data = NULL; + Terminal->Context = NULL; Terminal->Vtbl = NULL; /* Unload the frontend */ @@ -263,7 +263,7 @@ IN PCONSOLE Console) { NTSTATUS Status; - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; /* Initialize the console pointer for our frontend */ FrontEnd->Console = Console; @@ -286,7 +286,7 @@ static VOID NTAPI ConSrvTermDeinitTerminal(IN OUT PTERMINAL This) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->DeinitFrontEnd(FrontEnd); } @@ -304,7 +304,7 @@ IN ULONG NumCharsToRead, OUT PULONG NumCharsRead OPTIONAL) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; PCONSRV_CONSOLE Console = FrontEnd->Console; PCONSOLE_INPUT_BUFFER InputBuffer = &Console->InputBuffer; PUNICODE_STRING ExeName = Parameter; @@ -637,7 +637,7 @@ DWORD Length, BOOL Attrib) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; return ConioWriteConsole(FrontEnd, Buff, Buffer, @@ -668,7 +668,7 @@ ConSrvTermDrawRegion(IN OUT PTERMINAL This, SMALL_RECT* Region) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->DrawRegion(FrontEnd, Region); } @@ -676,7 +676,7 @@ ConSrvTermSetCursorInfo(IN OUT PTERMINAL This, PCONSOLE_SCREEN_BUFFER ScreenBuffer) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; return FrontEnd->Vtbl->SetCursorInfo(FrontEnd, ScreenBuffer); } @@ -686,7 +686,7 @@ SHORT OldCursorX, SHORT OldCursorY) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; return FrontEnd->Vtbl->SetScreenInfo(FrontEnd, ScreenBuffer, OldCursorX, @@ -696,14 +696,14 @@ static VOID NTAPI ConSrvTermResizeTerminal(IN OUT PTERMINAL This) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->ResizeTerminal(FrontEnd); } static VOID NTAPI ConSrvTermSetActiveScreenBuffer(IN OUT PTERMINAL This) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->SetActiveScreenBuffer(FrontEnd); } @@ -711,7 +711,7 @@ ConSrvTermReleaseScreenBuffer(IN OUT PTERMINAL This, IN PCONSOLE_SCREEN_BUFFER ScreenBuffer) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->ReleaseScreenBuffer(FrontEnd, ScreenBuffer); } @@ -719,7 +719,7 @@ ConSrvTermGetLargestConsoleWindowSize(IN OUT PTERMINAL This, PCOORD pSize) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; FrontEnd->Vtbl->GetLargestConsoleWindowSize(FrontEnd, pSize); } @@ -728,7 +728,7 @@ HPALETTE PaletteHandle, UINT PaletteUsage) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; return FrontEnd->Vtbl->SetPalette(FrontEnd, PaletteHandle, PaletteUsage); } @@ -736,7 +736,7 @@ ConSrvTermShowMouseCursor(IN OUT PTERMINAL This, BOOL Show) { - PFRONTEND FrontEnd = This->Data; + PFRONTEND FrontEnd = This->Context; return FrontEnd->Vtbl->ShowMouseCursor(FrontEnd, Show); } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -327,9 +327,9 @@ } static DWORD NTAPI -TuiConsoleThread(PVOID Data) -{ - PTUI_CONSOLE_DATA TuiData = (PTUI_CONSOLE_DATA)Data; +TuiConsoleThread(PVOID Param) +{ + PTUI_CONSOLE_DATA TuiData = (PTUI_CONSOLE_DATA)Param; PCONSRV_CONSOLE Console = TuiData->Console; HWND NewWindow; MSG msg; @@ -482,7 +482,7 @@ DPRINT1("CONSRV: Failed to create TUI_CONSOLE_DATA\n"); return STATUS_UNSUCCESSFUL; } - // Console->FrontEndIFace.Data = (PVOID)TuiData; + // Console->FrontEndIFace.Context = (PVOID)TuiData; TuiData->Console = Console; TuiData->hWindow = NULL; @@ -530,8 +530,8 @@ LeaveCriticalSection(&ActiveVirtConsLock); /* Finally, initialize the frontend structure */ - This->Data = TuiData; - This->OldData = NULL; + This->Context = TuiData; + This->Context2 = NULL; return STATUS_SUCCESS; } @@ -540,7 +540,7 @@ TuiDeinitFrontEnd(IN OUT PFRONTEND This) { // PCONSRV_CONSOLE Console = This->Console; - PTUI_CONSOLE_DATA TuiData = This->Data; // Console->FrontEndIFace.Data; + PTUI_CONSOLE_DATA TuiData = This->Context; // Console->FrontEndIFace.Context; /* Close the notification window */ DestroyWindow(TuiData->hWindow); @@ -571,8 +571,8 @@ /* Switch to the next console */ if (NULL != ActiveConsole) ConioDrawConsole(ActiveConsole->Console); - // Console->FrontEndIFace.Data = NULL; - This->Data = NULL; + // Console->FrontEndIFace.Context = NULL; + This->Context = NULL; DeleteCriticalSection(&TuiData->Lock); ConsoleFreeHeap(TuiData); } @@ -723,7 +723,7 @@ static HWND NTAPI TuiGetConsoleWindowHandle(IN OUT PFRONTEND This) { - PTUI_CONSOLE_DATA TuiData = This->Data; + PTUI_CONSOLE_DATA TuiData = This->Context; return TuiData->hWindow; } @@ -845,9 +845,9 @@ if (!TuiInit(ConsoleInfo->CodePage)) return STATUS_UNSUCCESSFUL; /* Finally, initialize the frontend structure */ - FrontEnd->Vtbl = &TuiVtbl; - FrontEnd->Data = NULL; - FrontEnd->OldData = NULL; + FrontEnd->Vtbl = &TuiVtbl; + FrontEnd->Context = NULL; + FrontEnd->Context2 = NULL; return STATUS_SUCCESS; } @@ -856,7 +856,7 @@ TuiUnloadFrontEnd(IN OUT PFRONTEND FrontEnd) { if (FrontEnd == NULL) return STATUS_INVALID_PARAMETER; - if (FrontEnd->Data) TuiDeinitFrontEnd(FrontEnd); + if (FrontEnd->Context) TuiDeinitFrontEnd(FrontEnd); return STATUS_SUCCESS; } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -273,7 +273,7 @@ { PTERMINAL_VTBL Vtbl; /* Virtual table */ struct _CONSOLE* Console; /* Console to which the terminal is attached to */ - PVOID Data; /* Private data */ + PVOID Context; /* Private context */ }; /* Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Sun Dec 14 21:51:32 2014 @@ -117,8 +117,8 @@ NTSTATUS (NTAPI *UnloadFrontEnd)(IN OUT PFRONTEND This); struct _CONSRV_CONSOLE* Console; /* Console to which the frontend is attached to */ - PVOID Data; /* Private data */ - PVOID OldData; /* Reserved */ + PVOID Context; /* Private context */ + PVOID Context2; /* Private context */ }; /* PauseFlags values (internal only) */

1 0

[pschweitzer] 65652: [NTFS] - Implement NtfsGrabFCBFromTableById() and NtfsGetFCBForFileById(). These two are responsible for opening and retrieving a file open by ID. - Modified NtfsMakeFCBFromDir...
by pschweitzer＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: pschweitzer Date: Sun Dec 14 21:18:47 2014 New Revision: 65652 URL: http://svn.reactos.org/svn/reactos?rev=65652&view=rev Log: [NTFS] - Implement NtfsGrabFCBFromTableById() and NtfsGetFCBForFileById(). These two are responsible for opening and retrieving a file open by ID. - Modified NtfsMakeFCBFromDirEntry() so that it supports openings by ID which come with less information than normal openings. - Modified NtfsGrabFCBFromTable() so that it doesn't return a FCB which would have been opened by ID. - Modified NtfsOpenFile() so that it allows opening a file by ID using the two FCB helpers functions defined upper. - Modified NtfsCreateFile() so that it can validate input in case of opening by ID. To make it short, all this implements file opening by ID in NTFS driver. I made the choice to separate FCB which are coming from "normal" opening and these from ID opening. The reason is that a file opening with ID has less information than a normal opening, and may fail on these information retreival. This is due to the fact that if opening by ID can virtual open all the files, because it ignores authorizations, traverses checks, in the end for retrieving the information, such checks can be done and fail. I also left all this disabled so far, because it appears to regress NFI. I will investigate this. CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun Dec 14 21:18:47 2014 @@ -80,6 +80,7 @@ NtfsOpenFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, PWSTR FileName, + BOOLEAN OpenById, PNTFS_FCB * FoundFCB) { PNTFS_FCB ParentFcb; @@ -87,55 +88,81 @@ NTSTATUS Status; PWSTR AbsFileName = NULL; - DPRINT1("NtfsOpenFile(%p, %p, %S, %p)\n", DeviceExt, FileObject, FileName, FoundFCB); + DPRINT1("NtfsOpenFile(%p, %p, %S, %u, %p)\n", DeviceExt, FileObject, (!OpenById ? FileName : NULL), OpenById, FoundFCB); *FoundFCB = NULL; - if (FileObject->RelatedFileObject) - { - DPRINT("Converting relative filename to absolute filename\n"); - - Status = NtfsMakeAbsoluteFilename(FileObject->RelatedFileObject, - FileName, - &AbsFileName); - FileName = AbsFileName; - if (!NT_SUCCESS(Status)) - { - return Status; - } - - return STATUS_UNSUCCESSFUL; - } - - //FIXME: Get cannonical path name (remove .'s, ..'s and extra separators) - - DPRINT("PathName to open: %S\n", FileName); - - /* try first to find an existing FCB in memory */ - DPRINT("Checking for existing FCB in memory\n"); - Fcb = NtfsGrabFCBFromTable(DeviceExt, - FileName); - if (Fcb == NULL) - { - DPRINT("No existing FCB found, making a new one if file exists.\n"); - Status = NtfsGetFCBForFile(DeviceExt, - &ParentFcb, - &Fcb, + if (OpenById) + { + ULONGLONG Id = (*(PULONGLONG)FileName) & NTFS_MFT_MASK; + + DPRINT1("Will attempt to open by id: %I64x\n", Id); + + Fcb = NtfsGrabFCBFromTableById(DeviceExt, + Id); + if (Fcb == NULL) + { + Status = NtfsGetFCBForFileById(DeviceExt, + &Fcb, + Id); + if (!NT_SUCCESS (Status)) + { + DPRINT("Could not make a new FCB, status: %x\n", Status); + + return Status; + } + + Fcb->Flags |= FCB_IS_OPEN_BY_ID; + } + } + else + { + if (FileObject->RelatedFileObject) + { + DPRINT("Converting relative filename to absolute filename\n"); + + Status = NtfsMakeAbsoluteFilename(FileObject->RelatedFileObject, + FileName, + &AbsFileName); + FileName = AbsFileName; + if (!NT_SUCCESS(Status)) + { + return Status; + } + + return STATUS_UNSUCCESSFUL; + } + + //FIXME: Get cannonical path name (remove .'s, ..'s and extra separators) + + DPRINT("PathName to open: %S\n", FileName); + + /* try first to find an existing FCB in memory */ + DPRINT("Checking for existing FCB in memory\n"); + Fcb = NtfsGrabFCBFromTable(DeviceExt, FileName); - if (ParentFcb != NULL) - { - NtfsReleaseFCB(DeviceExt, - ParentFcb); - } - - if (!NT_SUCCESS (Status)) - { - DPRINT("Could not make a new FCB, status: %x\n", Status); - - if (AbsFileName) - ExFreePool(AbsFileName); - - return Status; + if (Fcb == NULL) + { + DPRINT("No existing FCB found, making a new one if file exists.\n"); + Status = NtfsGetFCBForFile(DeviceExt, + &ParentFcb, + &Fcb, + FileName); + if (ParentFcb != NULL) + { + NtfsReleaseFCB(DeviceExt, + ParentFcb); + } + + if (!NT_SUCCESS (Status)) + { + DPRINT("Could not make a new FCB, status: %x\n", Status); + + if (AbsFileName) + ExFreePool(AbsFileName); + + return Status; + } } } @@ -201,6 +228,12 @@ return STATUS_ACCESS_DENIED; } + if ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID && + FileObject->FileName.Length != sizeof(ULONGLONG)) + { + return STATUS_INVALID_PARAMETER; + } + /* This a open operation for the volume itself */ if (FileObject->FileName.Length == 0 && (FileObject->RelatedFileObject == NULL || FileObject->RelatedFileObject->FsContext2 != NULL)) @@ -226,6 +259,7 @@ Status = NtfsOpenFile(DeviceExt, FileObject, FileObject->FileName.Buffer, + ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID), &Fcb); if (NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sun Dec 14 21:18:47 2014 @@ -220,7 +220,8 @@ Fcb = CONTAINING_RECORD(current_entry, NTFS_FCB, FcbListEntry); DPRINT("Comparing '%S' and '%S'\n", FileName, Fcb->PathName); - if (_wcsicmp(FileName, Fcb->PathName) == 0) + if ((Fcb->Flags & FCB_IS_OPEN_BY_ID) != FCB_IS_OPEN_BY_ID && + _wcsicmp(FileName, Fcb->PathName) == 0) { Fcb->RefCount++; KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); @@ -228,6 +229,38 @@ } //FIXME: need to compare against short name in FCB here + + current_entry = current_entry->Flink; + } + + KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); + + return NULL; +} + + +PNTFS_FCB +NtfsGrabFCBFromTableById(PNTFS_VCB Vcb, + ULONGLONG Id) +{ + KIRQL oldIrql; + PNTFS_FCB Fcb; + PLIST_ENTRY current_entry; + + KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); + + current_entry = Vcb->FcbListHead.Flink; + while (current_entry != &Vcb->FcbListHead) + { + Fcb = CONTAINING_RECORD(current_entry, NTFS_FCB, FcbListEntry); + + if ((Fcb->Flags & FCB_IS_OPEN_BY_ID) == FCB_IS_OPEN_BY_ID && + Fcb->MFTIndex == Id) + { + Fcb->RefCount++; + KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); + return Fcb; + } current_entry = current_entry->Flink; } @@ -410,18 +443,26 @@ return STATUS_OBJECT_NAME_NOT_FOUND; // Not sure that's the best here } - if (Name->Buffer[0] != 0 && wcslen(DirectoryFCB->PathName) + - sizeof(WCHAR) + Name->Length / sizeof(WCHAR) > MAX_PATH) - { - return STATUS_OBJECT_NAME_INVALID; - } - - wcscpy(pathName, DirectoryFCB->PathName); - if (!NtfsFCBIsRoot(DirectoryFCB)) - { - wcscat(pathName, L"\\"); - } - wcscat(pathName, Name->Buffer); + if (DirectoryFCB && Name) + { + if (Name->Buffer[0] != 0 && wcslen(DirectoryFCB->PathName) + + sizeof(WCHAR) + Name->Length / sizeof(WCHAR) > MAX_PATH) + { + return STATUS_OBJECT_NAME_INVALID; + } + + wcscpy(pathName, DirectoryFCB->PathName); + if (!NtfsFCBIsRoot(DirectoryFCB)) + { + wcscat(pathName, L"\\"); + } + wcscat(pathName, Name->Buffer); + } + else + { + RtlCopyMemory(pathName, FileName->Name, FileName->NameLength * sizeof (WCHAR)); + pathName[FileName->NameLength] = UNICODE_NULL; + } rcFCB = NtfsCreateFCB(pathName, Vcb); if (!rcFCB) @@ -655,6 +696,42 @@ NTSTATUS +NtfsGetFCBForFileById(PNTFS_VCB Vcb, + PNTFS_FCB *pFCB, + ULONGLONG Id) +{ + NTSTATUS Status; + PFILE_RECORD_HEADER FileRecord; + + FileRecord = ExAllocatePoolWithTag(NonPagedPool, + Vcb->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (FileRecord == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = ReadFileRecord(Vcb, Id, FileRecord); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + if ((FileRecord->Flags & FRH_IN_USE) != FRH_IN_USE) + { + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return STATUS_INVALID_PARAMETER; + } + + Status = NtfsMakeFCBFromDirEntry(Vcb, NULL, NULL, FileRecord, Id, pFCB); + + ExFreePoolWithTag(FileRecord, TAG_NTFS); + + return Status; +} + +NTSTATUS NtfsReadFCBAttribute(PNTFS_VCB Vcb, PNTFS_FCB pFCB, ULONG Type, Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Dec 14 21:18:47 2014 @@ -416,6 +416,7 @@ #define FCB_CACHE_INITIALIZED 0x0001 #define FCB_IS_VOLUME_STREAM 0x0002 #define FCB_IS_VOLUME 0x0004 +#define FCB_IS_OPEN_BY_ID 0x0008 #define MAX_PATH 260 typedef struct _FCB @@ -599,6 +600,10 @@ NtfsGrabFCBFromTable(PNTFS_VCB Vcb, PCWSTR FileName); +PNTFS_FCB +NtfsGrabFCBFromTableById(PNTFS_VCB Vcb, + ULONGLONG Id); + NTSTATUS NtfsFCBInitializeCache(PNTFS_VCB Vcb, PNTFS_FCB Fcb); @@ -619,6 +624,11 @@ PNTFS_FCB *pParentFCB, PNTFS_FCB *pFCB, const PWSTR pFileName); + +NTSTATUS +NtfsGetFCBForFileById(PNTFS_VCB Vcb, + PNTFS_FCB *pFCB, + ULONGLONG Id); NTSTATUS NtfsReadFCBAttribute(PNTFS_VCB Vcb,

1 0

[hbelusca] 65651: [CONSRV]: More code cleaning.
by hbelusca＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: hbelusca Date: Sun Dec 14 21:18:40 2014 New Revision: 65651 URL: http://svn.reactos.org/svn/reactos?rev=65651&view=rev Log: [CONSRV]: More code cleaning. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sun Dec 14 21:18:40 2014 @@ -738,7 +738,7 @@ /* Deinit the ConSrv terminal */ // FIXME!! - // ConSrvDeinitTerminal(&Terminal); // &ConSrvConsole->Console->TermIFace + // ConSrvDeinitTerminal(&Terminal); } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Dec 14 21:18:40 2014 @@ -108,8 +108,6 @@ // WORD ScreenDefaultAttrib; /* Default screen char attribute */ // WORD PopupDefaultAttrib; /* Default popup char attribute */ USHORT Mode; /* Output buffer modes */ - - // PVOID Data; /* Private data for the frontend to use */ }; @@ -259,7 +257,7 @@ INT (NTAPI *ShowMouseCursor)(IN OUT PTERMINAL This, BOOL Show); -#if 0 // Possible future front-end interface +#if 0 // Possible future terminal interface BOOL (NTAPI *GetTerminalProperty)(IN OUT PTERMINAL This, ULONG Flag, PVOID Info, @@ -274,7 +272,7 @@ struct _TERMINAL { PTERMINAL_VTBL Vtbl; /* Virtual table */ - struct _CONSOLE* Console; /* Console to which the frontend is attached to */ + struct _CONSOLE* Console; /* Console to which the terminal is attached to */ PVOID Data; /* Private data */ };

1 0

[pschweitzer] 65650: [NTFS] Make the NTFS driver more verbose in file information requests
by pschweitzer＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: pschweitzer Date: Sun Dec 14 21:09:29 2014 New Revision: 65650 URL: http://svn.reactos.org/svn/reactos?rev=65650&view=rev Log: [NTFS] Make the NTFS driver more verbose in file information requests Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Sun Dec 14 21:09:29 2014 @@ -45,7 +45,7 @@ { UNREFERENCED_PARAMETER(DeviceObject); - DPRINT("NtfsGetStandardInformation() called\n"); + DPRINT1("NtfsGetStandardInformation(%p, %p, %p, %p)\n", Fcb, DeviceObject, StandardInfo, BufferLength); if (*BufferLength < sizeof(FILE_STANDARD_INFORMATION)) return STATUS_BUFFER_OVERFLOW; @@ -75,7 +75,7 @@ PFILE_POSITION_INFORMATION PositionInfo, PULONG BufferLength) { - DPRINT("NtfsGetPositionInformation() called\n"); + DPRINT1("NtfsGetPositionInformation(%p, %p, %p)\n", FileObject, PositionInfo, BufferLength); if (*BufferLength < sizeof(FILE_POSITION_INFORMATION)) return STATUS_BUFFER_OVERFLOW; @@ -101,7 +101,7 @@ { PFILENAME_ATTRIBUTE FileName = &Fcb->Entry; - DPRINT("NtfsGetBasicInformation() called\n"); + DPRINT1("NtfsGetBasicInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, BasicInfo, BufferLength); if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) return STATUS_BUFFER_OVERFLOW; @@ -135,7 +135,7 @@ UNREFERENCED_PARAMETER(FileObject); UNREFERENCED_PARAMETER(DeviceObject); - DPRINT("NtfsGetNameInformation() called\n"); + DPRINT1("NtfsGetNameInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, NameInfo, BufferLength); ASSERT(NameInfo != NULL); ASSERT(Fcb != NULL); @@ -175,7 +175,7 @@ PFILE_INTERNAL_INFORMATION InternalInfo, PULONG BufferLength) { - DPRINT("NtfsGetInternalInformation() called\n"); + DPRINT1("NtfsGetInternalInformation(%p, %p, %p)\n", Fcb, InternalInfo, BufferLength); ASSERT(InternalInfo); ASSERT(Fcb); @@ -199,6 +199,8 @@ PULONG BufferLength) { PFILENAME_ATTRIBUTE FileName = &Fcb->Entry; + + DPRINT1("NtfsGetNetworkOpenInformation(%p, %p, %p, %p)\n", Fcb, DeviceExt, NetworkInfo, BufferLength); if (*BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) return(STATUS_BUFFER_OVERFLOW); @@ -233,7 +235,7 @@ ULONG BufferLength; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtfsQueryInformation() called\n"); + DPRINT1("NtfsQueryInformation(%p, %p)\n", DeviceObject, Irp); Stack = IoGetCurrentIrpStackLocation(Irp); FileInformationClass = Stack->Parameters.QueryFile.FileInformationClass; @@ -289,11 +291,12 @@ case FileAlternateNameInformation: case FileAllInformation: + DPRINT1("Unimplemented information class %u\n", FileInformationClass); Status = STATUS_NOT_IMPLEMENTED; break; default: - DPRINT("Unimplemented information class %u\n", FileInformationClass); + DPRINT1("Unimplemented information class %u\n", FileInformationClass); Status = STATUS_INVALID_PARAMETER; }

1 0

[hbelusca] 65649: [CONSRV]: Move ConioDrawConsole to where it should belong.
by hbelusca＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: hbelusca Date: Sun Dec 14 19:01:52 2014 New Revision: 65649 URL: http://svn.reactos.org/svn/reactos?rev=65649&view=rev Log: [CONSRV]: Move ConioDrawConsole to where it should belong. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Sun Dec 14 19:01:52 2014 @@ -159,20 +159,6 @@ CONSOLE_SCREEN_BUFFER_Destroy(Buffer); } -VOID -ConioDrawConsole(PCONSOLE Console) -{ - SMALL_RECT Region; - PCONSOLE_SCREEN_BUFFER ActiveBuffer = Console->ActiveBuffer; - - if (ActiveBuffer) - { - ConioInitRect(&Region, 0, 0, - ActiveBuffer->ViewSize.Y - 1, ActiveBuffer->ViewSize.X - 1); - TermDrawRegion(Console, &Region); - } -} - static VOID ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Sun Dec 14 19:01:52 2014 @@ -297,7 +297,6 @@ /* Copy buffer contents to screen */ // Terminal.Draw(); - // ConioDrawConsole(Console); DPRINT("Terminal initialization done\n"); return STATUS_SUCCESS; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sun Dec 14 19:01:52 2014 @@ -494,7 +494,8 @@ /* Make sure ReadRegion is inside the screen buffer */ ConioInitRect(&ScreenBuffer, 0, 0, - Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X - 1); + Buffer->ScreenBufferSize.Y - 1, + Buffer->ScreenBufferSize.X - 1); if (!ConioGetIntersection(&CapturedReadRegion, &ScreenBuffer, &CapturedReadRegion)) { /* @@ -557,7 +558,8 @@ /* Make sure WriteRegion is inside the screen buffer */ ConioInitRect(&ScreenBuffer, 0, 0, - Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X - 1); + Buffer->ScreenBufferSize.Y - 1, + Buffer->ScreenBufferSize.X - 1); if (!ConioGetIntersection(&CapturedWriteRegion, &ScreenBuffer, &CapturedWriteRegion)) { /* @@ -625,7 +627,8 @@ /* Make sure WriteRegion is inside the screen buffer */ ConioInitRect(&ScreenBuffer, 0, 0, - Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X - 1); + Buffer->ScreenBufferSize.Y - 1, + Buffer->ScreenBufferSize.X - 1); if (!ConioGetIntersection(&CapturedWriteRegion, &ScreenBuffer, &CapturedWriteRegion)) { /* @@ -1154,7 +1157,8 @@ /* Make sure the source rectangle is inside the screen buffer */ ConioInitRect(&ScreenBuffer, 0, 0, - Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X - 1); + Buffer->ScreenBufferSize.Y - 1, + Buffer->ScreenBufferSize.X - 1); if (!ConioGetIntersection(&SrcRegion, &ScreenBuffer, ScrollRectangle)) { return STATUS_SUCCESS; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] Sun Dec 14 19:01:52 2014 @@ -71,7 +71,7 @@ INPUT_RECORD er; - if (NULL == Console) + if (Console == NULL) { DPRINT1("No Active Console!\n"); return; @@ -169,7 +169,7 @@ } } - ConioDrawConsole((PCONSOLE)Console); + ConioDrawConsole(Console); return; } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Sun Dec 14 19:01:52 2014 @@ -649,6 +649,21 @@ +VOID +ConioDrawConsole(PCONSRV_CONSOLE Console) +{ + SMALL_RECT Region; + PCONSOLE_SCREEN_BUFFER ActiveBuffer = Console->ActiveBuffer; + + if (!ActiveBuffer) return; + + ConioInitRect(&Region, 0, 0, + ActiveBuffer->ViewSize.Y - 1, + ActiveBuffer->ViewSize.X - 1); + TermDrawRegion(Console, &Region); + // Console->FrontEndIFace.Vtbl->DrawRegion(&Console->FrontEndIFace, &Region); +} + static VOID NTAPI ConSrvTermDrawRegion(IN OUT PTERMINAL This, SMALL_RECT* Region) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Dec 14 19:01:52 2014 @@ -347,7 +347,6 @@ /* conoutput.c */ PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); -VOID ConioDrawConsole(PCONSOLE /*PCONSRV_CONSOLE*/ Console); NTSTATUS ConioResizeBuffer(PCONSOLE /*PCONSRV_CONSOLE*/ Console, PTEXTMODE_SCREEN_BUFFER ScreenBuffer, COORD Size); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Sun Dec 14 19:01:52 2014 @@ -2,7 +2,8 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL * FILE: consrv/include/conio_winsrv.h - * PURPOSE: Public Console I/O Interface + * PURPOSE: Public Console I/O Interface - Offers wrap-up structures + * over the console objects exposed by the console driver. * PROGRAMMERS: Gé van Geldorp * Jeffrey Morlan * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) @@ -217,9 +218,11 @@ /* conoutput.c */ PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); -VOID ConioDrawConsole(PCONSOLE /*PCONSRV_CONSOLE*/ Console); NTSTATUS ConioResizeBuffer(PCONSOLE /*PCONSRV_CONSOLE*/ Console, PTEXTMODE_SCREEN_BUFFER ScreenBuffer, COORD Size); +/* terminal.c */ +VOID ConioDrawConsole(PCONSRV_CONSOLE Console); + /* EOF */

1 0

[dreimer] 65648: [TREE] German translation for tree utility.
by dreimer＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: dreimer Date: Sun Dec 14 18:58:51 2014 New Revision: 65648 URL: http://svn.reactos.org/svn/reactos?rev=65648&view=rev Log: [TREE] German translation for tree utility. Added: trunk/reactos/base/applications/cmdutils/tree/lang/de-DE.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc Added: trunk/reactos/base/applications/cmdutils/tree/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/cmdutils/tree/lang/de-DE.rc [iso-8859-1] Sun Dec 14 18:58:51 2014 @@ -0,0 +1,12 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Zeigt die Ordnerstruktur eines Laufwerks oder Pfads grafisch an.\n\n\ +TREE [Laufwerk:][Pfad] [/F] [/A]\n\n\ +\t/F Zeigt die Namen der Dateien in jedem Ordner an.\n\ +\t/A Verwendet den ASCII- statt des erweiterten Zeichensatzes.\n" + IDS_NO_SUBDIRECTORIES "Es sind keine Unterordner vorhanden" + IDS_FOLDER_PATH "Auflistung der Ordnerpfade\n" + IDS_VOL_SERIAL "Volumeseriennummer : %x:%x\n" +END Propchange: trunk/reactos/base/applications/cmdutils/tree/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] Sun Dec 14 18:58:51 2014 @@ -12,6 +12,9 @@ /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

1 0

[zguo] 65647: [SETUP] Add registry value for wallpaper directory. Patch by Ricardo Hanke. CORE-8797
by zguo＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: zguo Date: Sun Dec 14 18:39:24 2014 New Revision: 65647 URL: http://svn.reactos.org/svn/reactos?rev=65647&view=rev Log: [SETUP] Add registry value for wallpaper directory. Patch by Ricardo Hanke. CORE-8797 Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Dec 14 18:39:24 2014 @@ -88,6 +88,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion","DevicePath",0x00020002,"%SystemRoot%\inf" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion","MediaPathUnexpanded",0x00020000,"%SystemRoot%\Media" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion","WallPaperDir",0x00020002,"%SystemRoot%\Web\Wallpaper" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Applets",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cpls",,0x00000012

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