Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[dreimer] 47115: - Make sSVN fully multi Source Tree compatible by removing the dependency on the _ROSBE_ROSSOURCEDIR variable. - Update changelog.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu May 6 17:28:59 2010 New Revision: 47115 URL: http://svn.reactos.org/svn/reactos?rev=47115&view=rev Log: - Make sSVN fully multi Source Tree compatible by removing the dependency on the _ROSBE_ROSSOURCEDIR variable. - Update changelog. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Thu May 6 17:28:59 2010 @@ -5,6 +5,8 @@ # PURPOSE: Integrated SVN Client. # COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # + +$_ROSBE_SSVNSOURCEDIR = "$pwd" function UP($arg) { $OFFSVN = IEX "& svn.exe info" | select-string "Revision:" @@ -34,33 +36,33 @@ if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { IEX "& svn.exe update -r $temparg" } - if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.") { - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" + if (Test-Path "modules\rosapps\.") { + Set-Location "modules\rosapps" "Updating RosApps..." IEX "& svn.exe update -r $temparg" - Set-Location "$_ROSBE_ROSSOURCEDIR" - } - if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.") { - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" + Set-Location "$_ROSBE_SSVNSOURCEDIR" + } + if (Test-Path "modules\rostests\.") { + Set-Location "modules\rostests" "Updating RosTests..." IEX "& svn.exe update -r $temparg" - Set-Location "$_ROSBE_ROSSOURCEDIR" + Set-Location "$_ROSBE_SSVNSOURCEDIR" } } else { if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { IEX "& svn.exe update" } - if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.") { - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" + if (Test-Path "modules\rosapps\.") { + Set-Location "modules\rosapps" "Updating RosApps..." IEX "& svn.exe update" - Set-Location "$_ROSBE_ROSSOURCEDIR" - } - if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.") { - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" + Set-Location "$_ROSBE_SSVNSOURCEDIR" + } + if (Test-Path "modules\rostests\.") { + Set-Location "modules\rostests" "Updating RosTests..." IEX "& svn.exe update" - Set-Location "$_ROSBE_ROSSOURCEDIR" + Set-Location "$_ROSBE_SSVNSOURCEDIR" } } "Do you want to see the changelog?" @@ -127,16 +129,16 @@ # Check if the folder is empty. If not, output an error. elseif ("$($args[0])" -eq "rosapps") { if ("$($args[1])" -ne "") { - if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.")) { - new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rosapps -type directory - } - if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.svn\.") { + if (!(Test-Path "modules\rosapps\.")) { + new-item -path "modules" -name rosapps -type directory + } + if (Test-Path "modules\rosapps\.svn\.") { $host.ui.RawUI.WindowTitle = "SVN RosApps Updating..." - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" + Set-Location "modules\rosapps" IEX "& svn.exe update -r $($args[1])" } else { $host.ui.RawUI.WindowTitle = "SVN RosApps Creating..." - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" + Set-Location "modules\rosapps" $dir = get-childitem if ("$dir" -eq "") { if("$ENV:ROS_ARCH" -eq "amd64") { @@ -149,16 +151,16 @@ } } } else { - if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.")) { - new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rosapps -type directory - } - if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.svn\.") { + if (!(Test-Path "modules\rosapps\.")) { + new-item -path "modules" -name rosapps -type directory + } + if (Test-Path "modules\rosapps\.svn\.") { $host.ui.RawUI.WindowTitle = "SVN RosApps Updating..." - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" + Set-Location "modules\rosapps" IEX "& svn.exe update" } else { $host.ui.RawUI.WindowTitle = "SVN RosApps Creating..." - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" + Set-Location "modules\rosapps" $dir = get-childitem if ("$dir" -eq "") { if ("$ENV:ROS_ARCH" -eq "amd64") { @@ -171,22 +173,22 @@ } } } - Set-Location "$_ROSBE_ROSSOURCEDIR" + Set-Location "$_ROSBE_SSVNSOURCEDIR" } # Check if the folder is empty. If not, output an error. elseif ("$($args[0])" -eq "rostests") { if ("$($args[1])" -ne "") { - if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.")) { - new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rostests -type directory - } - if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.svn\.") { + if (!(Test-Path "modules\rostests\.")) { + new-item -path "modules" -name rostests -type directory + } + if (Test-Path "modules\rostests\.svn\.") { $host.ui.RawUI.WindowTitle = "SVN RosTests Updating..." - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" + Set-Location "modules\rostests" IEX "& svn.exe update -r $($args[1])" } else { $host.ui.RawUI.WindowTitle = "SVN RosTests Creating..." - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" + Set-Location "modules\rostests" $dir = get-childitem if ("$dir" -eq "") { if("$ENV:ROS_ARCH" -eq "amd64") { @@ -199,16 +201,16 @@ } } } else { - if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.")) { - new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rostests -type directory - } - if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.svn\.") { + if (!(Test-Path "modules\rostests\.")) { + new-item -path "modules" -name rostests -type directory + } + if (Test-Path "modules\rostests\.svn\.") { $host.ui.RawUI.WindowTitle = "SVN RosTests Updating..." - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" + Set-Location "modules\rostests" IEX "& svn.exe update" } else { $host.ui.RawUI.WindowTitle = "SVN RosTests Creating..." - Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" + Set-Location "modules\rostests" $dir = get-childitem if ("$dir" -eq "") { if ("$ENV:ROS_ARCH" -eq "amd64") { @@ -221,7 +223,7 @@ } } } - Set-Location "$_ROSBE_ROSSOURCEDIR" + Set-Location "$_ROSBE_SSVNSOURCEDIR" } # Output the revision of the local and online trees and tell the user if Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Thu May 6 17:28:59 2010 @@ -4,8 +4,22 @@ To activate it, make a system Variable named "_ROSBE_NOSYSPATH" and set it to 1. (Daniel Reimer) - sSVN: Make use of the http:// protocol instead of the svn:// one. (Daniel Reimer) - Add remakex command to RosBE. (Daniel Reimer) -- Add sound output on finished build. On PS we have one for a successful and one for a failed build. On CMD we have just one for now. (Daniel Reimer) +- Add sound output on finished build. On PS we have one for a successful and one for a failed build. On CMD we have just one for now, if you let it + generate a LOG File. (Daniel Reimer) - Made a small modification to be able to ask for help for ps commands in RosBE, too. (Daniel Reimer) +- Introduce %_BUILDBOT_SVNSKIPMAINTRUNK% as first of maybe more coming BuildBot Vars to skip the updating of the main trunk source when ssvn is used + to do so. If its being set to "1" it only updates rosapps and rostests if existant. This is needed for Olaf Siejka's Windows Buildbot project. + As Default its set to "0" and thus all behaves as before. (Daniel Reimer) +- Fix a access error when you start two builds in the same minute on a PC by adding the seconds to $TIMENAME, too. (Daniel Reimer) +- Clean up $DATENAME which included the year twice. (Daniel Reimer) +- Weaken the ROS Source Dir check in clean a bit so that it does remove the built stuff even if it did not even build any tool yet. (Daniel Reimer) +- Add the correct license to the audio files. (Daniel Reimer) +- If a custom output folder is defined, pass it to log2lines, too. (Mephisto, Daniel Reimer) +- Feature request by Olaf Siejka. The sSVN parameters "rosapps" and "rostests" were originally made for just creating rosapps / rostests repositories + in the modules folder. Now it detects an existant repository and just updates that one. If theres no repository or even no folder for the repository + it first generates it and continues. Additionally you can set the revision you wanna checkout or update to. "create" accepts a revision as second + parameter now, too. (Daniel Reimer) +- Make sSVN fully multi Source Tree compatible by removing the dependency on the _ROSBE_ROSSOURCEDIR variable. (Daniel Reimer) *** Feb 08th, 2010 - RosBE 1.5 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Thu May 6 17:28:59 2010 @@ -14,6 +14,8 @@ setlocal enabledelayedexpansion +set _ROSBE_SSVNSOURCEDIR=%CD% + :: Receive the first parameter and decide what to do. if "%1" == "" ( echo No parameter specified. Try 'help [COMMAND]'. @@ -69,16 +71,16 @@ :: Check if the folder is empty. If not, output an error. if /i "%1" == "rosapps" ( if not "%2" == "" ( - if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." ( - md "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" - ) - if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\.svn\." ( + if not exist "modules\rosapps\." ( + md "modules\rosapps" + ) + if exist "modules\rosapps\.svn\." ( title SVN RosApps Updating... - cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + cd "modules\rosapps" svn.exe update -r %2 ) else ( title SVN RosApps Creating... - cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + cd "modules\rosapps" dir /b 2>nul | findstr "." >nul if errorlevel 1 ( if "%ROS_ARCH%" == "amd64" ( @@ -91,16 +93,16 @@ ) ) ) else ( - if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." ( - md "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" - ) - if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\.svn\." ( + if not exist "modules\rosapps\." ( + md "modules\rosapps" + ) + if exist "modules\rosapps\.svn\." ( title SVN RosApps Updating... - cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + cd "modules\rosapps" svn.exe update ) else ( title SVN RosApps Creating... - cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + cd "modules\rosapps" dir /b 2>nul | findstr "." >nul if errorlevel 1 ( if "%ROS_ARCH%" == "amd64" ( @@ -113,23 +115,23 @@ ) ) ) - cd "%_ROSBE_ROSSOURCEDIR%" + cd "%_ROSBE_SSVNSOURCEDIR%" goto :EOC ) :: Check if the folder is empty. If not, output an error. if /i "%1" == "rostests" ( if not "%2" == "" ( - if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." ( - md "%_ROSBE_ROSSOURCEDIR%\modules\rostests" - ) - if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\.svn\." ( + if not exist "modules\rostests\." ( + md "modules\rostests" + ) + if exist "modules\rostests\.svn\." ( title SVN RosTests Updating... - cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + cd "modules\rostests" svn.exe update -r %2 ) else ( title SVN RosTests Creating... - cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + cd "modules\rostests" dir /b 2>nul | findstr "." >nul if errorlevel 1 ( if "%ROS_ARCH%" == "amd64" ( @@ -142,16 +144,16 @@ ) ) ) else ( - if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." ( - md "%_ROSBE_ROSSOURCEDIR%\modules\rostests" - ) - if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\.svn\." ( + if not exist "modules\rostests\." ( + md "modules\rostests" + ) + if exist "modules\rostests\.svn\." ( title SVN RosTests Updating... - cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + cd "modules\rostests" svn.exe update ) else ( title SVN RosTests Creating... - cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + cd "modules\rostests" dir /b 2>nul | findstr "." >nul if errorlevel 1 ( if "%ROS_ARCH%" == "amd64" ( @@ -164,7 +166,7 @@ ) ) ) - cd "%_ROSBE_ROSSOURCEDIR%" + cd "%_ROSBE_SSVNSOURCEDIR%" goto :EOC ) @@ -205,33 +207,33 @@ if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( svn.exe update -r %2 ) - if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." ( - cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + if exist "modules\rosapps\." ( + cd "modules\rosapps" echo Updating RosApps... svn.exe update -r %2 - cd "%_ROSBE_ROSSOURCEDIR%" - ) - if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." ( - cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + cd "%_ROSBE_SSVNSOURCEDIR%" + ) + if exist "modules\rostests\." ( + cd "modules\rostests" echo Updating RosTests... svn.exe update -r %2 - cd "%_ROSBE_ROSSOURCEDIR%" + cd "%_ROSBE_SSVNSOURCEDIR%" ) ) else ( if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( svn.exe update ) - if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." ( - cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + if exist "modules\rosapps\." ( + cd "modules\rosapps" echo Updating RosApps... svn.exe update - cd "%_ROSBE_ROSSOURCEDIR%" - ) - if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." ( - cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + cd "%_ROSBE_SSVNSOURCEDIR%" + ) + if exist "modules\rostests\." ( + cd "modules\rostests" echo Updating RosTests... svn.exe update - cd "%_ROSBE_ROSSOURCEDIR%" + cd "%_ROSBE_SSVNSOURCEDIR%" ) ) )

14 years, 4 months

[jgardou] 47114: [WIN32K] - Assign a correct pdevmode to the pdevobj when creating it.

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu May 6 13:46:48 2010 New Revision: 47114 URL: http://svn.reactos.org/svn/reactos?rev=47114&view=rev Log: [WIN32K] - Assign a correct pdevmode to the pdevobj when creating it. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Thu May 6 13:46:48 2010 @@ -259,7 +259,8 @@ ppdev->pGraphicsDevice = pGraphicsDevice; ppdev->hsemDevLock = EngCreateSemaphore(); - ppdev->pdmwDev = pGraphicsDevice->pDevModeList[pGraphicsDevice->iCurrentMode].pdm; + // Should we change the ative mode of pGraphicsDevice ? + ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, pdm) ; /* FIXME! */ ppdev->flFlags = PDEV_DISPLAY;

14 years, 4 months

[fireball] 47113: [KERNEL32] - Code committed in revision 846 was lazily initializing command line options with a first call to GetCommandLine. However, this is not really thread-safe. Move initialization to DLL_PROCESS_ATTACH, where it should actually happen. See issue #5347 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 6 12:50:26 2010 New Revision: 47113 URL: http://svn.reactos.org/svn/reactos?rev=47113&view=rev Log: [KERNEL32] - Code committed in revision 846 was lazily initializing command line options with a first call to GetCommandLine. However, this is not really thread-safe. Move initialization to DLL_PROCESS_ATTACH, where it should actually happen. See issue #5347 for more details. Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/misc/dllmain.c trunk/reactos/dll/win32/kernel32/process/cmdline.c Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Thu May 6 12:50:26 2010 @@ -190,3 +190,7 @@ LPWSTR GetDllLoadPath(LPCWSTR lpModule); + +VOID +WINAPI +InitCommandLines(VOID); Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Thu May 6 12:50:26 2010 @@ -330,6 +330,9 @@ wcscpy(SystemDirectory.Buffer, WindowsDirectory.Buffer); wcscat(SystemDirectory.Buffer, L"\\System32"); + /* Initialize command line */ + InitCommandLines(); + /* Open object base directory */ Status = OpenBaseDirectory(&hBaseDir); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/dll/win32/kernel32/process/cmdline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/cmdline.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/cmdline.c [iso-8859-1] Thu May 6 12:50:26 2010 @@ -27,19 +27,17 @@ /* FUNCTIONS ****************************************************************/ -static VOID +WINAPI InitCommandLines(VOID) { PRTL_USER_PROCESS_PARAMETERS Params; - /* FIXME - not thread-safe! */ - - // get command line + /* get command line */ Params = NtCurrentPeb()->ProcessParameters; RtlNormalizeProcessParams (Params); - // initialize command line buffers + /* initialize command line buffers */ CommandLineStringW.Length = Params->CommandLine.Length; CommandLineStringW.MaximumLength = CommandLineStringW.Length + sizeof(WCHAR); CommandLineStringW.Buffer = RtlAllocateHeap(GetProcessHeap(), @@ -80,13 +78,7 @@ WINAPI GetCommandLineA(VOID) { - if (bCommandLineInitialized == FALSE) - { - InitCommandLines(); - } - DPRINT("CommandLine \'%s\'\n", CommandLineStringA.Buffer); - return CommandLineStringA.Buffer; } @@ -98,13 +90,7 @@ WINAPI GetCommandLineW(VOID) { - if (bCommandLineInitialized == FALSE) - { - InitCommandLines(); - } - DPRINT("CommandLine \'%S\'\n", CommandLineStringW.Buffer); - return CommandLineStringW.Buffer; }

14 years, 4 months

[fireball] 47112: [ADVAPI32] - Katayama Hirofumi: Use a real computer name instead of an empty string when reporting events in ReportEventA and W. See issue #5358 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 6 12:09:33 2010 New Revision: 47112 URL: http://svn.reactos.org/svn/reactos?rev=47112&view=rev Log: [ADVAPI32] - Katayama Hirofumi: Use a real computer name instead of an empty string when reporting events in ReportEventA and W. See issue #5358 for more details. Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Thu May 6 12:09:33 2010 @@ -945,6 +945,8 @@ ANSI_STRING *Strings; ANSI_STRING ComputerName; WORD i; + CHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD dwSize; TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, @@ -962,8 +964,9 @@ for (i = 0; i < wNumStrings; i++) RtlInitAnsiString(&Strings[i], lpStrings[i]); - /*FIXME: ComputerName */ - RtlInitAnsiString(&ComputerName, ""); + dwSize = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameA(szComputerName, &dwSize); + RtlInitAnsiString(&ComputerName, szComputerName); RpcTryExcept { @@ -1029,6 +1032,8 @@ UNICODE_STRING *Strings; UNICODE_STRING ComputerName; WORD i; + WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD dwSize; TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, @@ -1046,8 +1051,9 @@ for (i = 0; i < wNumStrings; i++) RtlInitUnicodeString(&Strings[i], lpStrings[i]); - /*FIXME: ComputerName */ - RtlInitUnicodeString(&ComputerName, L""); + dwSize = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameW(szComputerName, &dwSize); + RtlInitUnicodeString(&ComputerName, szComputerName); RpcTryExcept {

14 years, 4 months

[fireball] 47111: [ADVAPI32] - Katayama Hirofumi: Create GUID instead of hardcoding to 0 every time. See issue #5364 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 6 11:44:59 2010 New Revision: 47111 URL: http://svn.reactos.org/svn/reactos?rev=47111&view=rev Log: [ADVAPI32] - Katayama Hirofumi: Create GUID instead of hardcoding to 0 every time. See issue #5364 for more details. Modified: trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c Modified: trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/hw… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c [iso-8859-1] Thu May 6 11:44:59 2010 @@ -1,15 +1,14 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/advapi32/misc/hwprofiles.c + * FILE: dll/win32/advapi32/misc/hwprofiles.c * PURPOSE: advapi32.dll Hardware Functions * PROGRAMMER: Steven Edwards - * UPDATE HISTORY: - * 20042502 + * Eric Kohl */ #include <advapi32.h> +#include <rpc.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(advapi); @@ -91,6 +90,7 @@ HKEY hProfileKey; DWORD dwLength; DWORD dwConfigId; + UUID uuid; TRACE("GetCurrentHwProfileW() called\n"); @@ -158,9 +158,17 @@ (LPBYTE)&lpHwProfileInfo->szHwProfileGuid, &dwLength)) { - /* FIXME: Create a new GUID */ - wcscpy(lpHwProfileInfo->szHwProfileGuid, - L"{00000000-0000-0000-0000-000000000000}"); + /* Create a new GUID */ + UuidCreate(&uuid); + swprintf( + lpHwProfileInfo->szHwProfileGuid, + L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + uuid.Data1, + uuid.Data2, + uuid.Data3, + uuid.Data4[0], uuid.Data4[1], + uuid.Data4[2], uuid.Data4[3], uuid.Data4[4], uuid.Data4[5], + uuid.Data4[6], uuid.Data4[7]); dwLength = (wcslen(lpHwProfileInfo->szHwProfileGuid) + 1) * sizeof(WCHAR); RegSetValueExW(hProfileKey,

14 years, 4 months

[cgutman] 47110: [NTOSKRNL] - Don't enable the kernel debugger if the DEBUG option was not set - Fixes displaying the BSOD when not booting in debug mode (broken in r41534)

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu May 6 03:45:10 2010 New Revision: 47110 URL: http://svn.reactos.org/svn/reactos?rev=47110&view=rev Log: [NTOSKRNL] - Don't enable the kernel debugger if the DEBUG option was not set - Fixes displaying the BSOD when not booting in debug mode (broken in r41534) Modified: trunk/reactos/ntoskrnl/kd/kdinit.c Modified: trunk/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] Thu May 6 03:45:10 2010 @@ -171,15 +171,14 @@ { /* Enable on the serial port */ KdDebuggerEnabled = TRUE; + KdDebuggerNotPresent = FALSE; KdpDebugMode.Serial = TRUE; - } #ifdef KDBG - /* Get the KDBG Settings and enable it */ - KdDebuggerEnabled = TRUE; - KdDebuggerNotPresent = FALSE; - KdbpGetCommandLineSettings(LoaderBlock->LoadOptions); -#endif + /* Get the KDBG Settings */ + KdbpGetCommandLineSettings(LoaderBlock->LoadOptions); +#endif + } /* Get the port and baud rate */ Port = strstr(CommandLine, "DEBUGPORT");

14 years, 4 months

[cgutman] 47109: [VIDEOPRT] - Also check for the BASEVIDEO option set and return true in that case also - Fixes a bug with boot time (F8) options on my WC

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu May 6 01:16:17 2010 New Revision: 47109 URL: http://svn.reactos.org/svn/reactos?rev=47109&view=rev Log: [VIDEOPRT] - Also check for the BASEVIDEO option set and return true in that case also - Fixes a bug with boot time (F8) options on my WC Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Thu May 6 01:16:17 2010 @@ -1523,8 +1523,9 @@ return FALSE; } - /* Check if NOVESA is present in the start options */ - if (wcsstr((PWCHAR)KeyInfo->Data, L"NOVESA")) + /* Check if NOVESA or BASEVIDEO is present in the start options */ + if (wcsstr((PWCHAR)KeyInfo->Data, L"NOVESA") || + wcsstr((PWCHAR)KeyInfo->Data, L"BASEVIDEO")) { VideoPortDebugPrint(Info, "VESA mode disabled\n"); ExFreePool(KeyInfo);

14 years, 4 months

[cgutman] 47108: [NTOSKRNL] - Implement Ke386IoSetAccessProcess, Ke386SetIoAccessMap, and Ke386QueryIoAccessMap [NDK] - Add definition of KIO_ACCESS_MAP - Patch by Samuel Serapion - Fixes bug 2641

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu May 6 01:06:32 2010 New Revision: 47108 URL: http://svn.reactos.org/svn/reactos?rev=47108&view=rev Log: [NTOSKRNL] - Implement Ke386IoSetAccessProcess, Ke386SetIoAccessMap, and Ke386QueryIoAccessMap [NDK] - Add definition of KIO_ACCESS_MAP - Patch by Samuel Serapion - Fixes bug 2641 Modified: trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Thu May 6 01:06:32 2010 @@ -150,6 +150,10 @@ (MapNumber == IO_ACCESS_MAP_NONE) ? \ (USHORT)(sizeof(KTSS)) : \ (USHORT)(FIELD_OFFSET(KTSS, IoMaps[MapNumber-1].IoMap)) + +typedef UCHAR KIO_ACCESS_MAP[IOPM_SIZE]; + +typedef KIO_ACCESS_MAP *PKIO_ACCESS_MAP; // // Size of the XMM register save area in the FXSAVE format Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Thu May 6 01:06:32 2010 @@ -659,37 +659,87 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI Ke386IoSetAccessProcess(IN PKPROCESS Process, - IN ULONG Flag) -{ - UNIMPLEMENTED; - return FALSE; + IN ULONG MapNumber) +{ + USHORT MapOffset; + PKPRCB Prcb; + KAFFINITY TargetProcessors; + + if(MapNumber > IOPM_COUNT) + return FALSE; + + MapOffset = KiComputeIopmOffset(MapNumber); + + Process->IopmOffset = MapOffset; + + TargetProcessors = Process->ActiveProcessors; + Prcb = KeGetCurrentPrcb(); + if (TargetProcessors & Prcb->SetMember) + KeGetPcr()->TSS->IoMapBase = MapOffset; + + return TRUE; } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI -Ke386SetIoAccessMap(IN ULONG Flag, - IN PVOID IopmBuffer) -{ - UNIMPLEMENTED; - return FALSE; +Ke386SetIoAccessMap(IN ULONG MapNumber, + IN PKIO_ACCESS_MAP IopmBuffer) +{ + PKPROCESS CurrentProcess; + PKPRCB Prcb; + PVOID pt; + + if ((MapNumber > IOPM_COUNT) || (MapNumber == IO_ACCESS_MAP_NONE)) + return FALSE; + + Prcb = KeGetCurrentPrcb(); + + // Copy the IOP map and load the map for the current process. + pt = &(KeGetPcr()->TSS->IoMaps[MapNumber-1].IoMap); + RtlMoveMemory(pt, (PVOID)IopmBuffer, IOPM_SIZE); + CurrentProcess = Prcb->CurrentThread->ApcState.Process; + KeGetPcr()->TSS->IoMapBase = CurrentProcess->IopmOffset; + + return TRUE; } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI -Ke386QueryIoAccessMap(IN ULONG Flag, - IN PVOID IopmBuffer) -{ - UNIMPLEMENTED; - return FALSE; -} +Ke386QueryIoAccessMap(IN ULONG MapNumber, + IN PKIO_ACCESS_MAP IopmBuffer) +{ + ULONG i; + PVOID Map; + PUCHAR p; + + if (MapNumber > IOPM_COUNT) + return FALSE; + + if (MapNumber == IO_ACCESS_MAP_NONE) + { + // no access, simply return a map of all 1s + p = (PUCHAR)IopmBuffer; + for (i = 0; i < IOPM_SIZE; i++) { + p[i] = (UCHAR)-1; + } + } + else + { + // copy the bits + Map = (PVOID)&(KeGetPcr()->TSS->IoMaps[MapNumber-1].IoMap); + RtlMoveMemory((PVOID)IopmBuffer, Map, IOPM_SIZE); + } + + return TRUE; +}

14 years, 4 months

[ekohl] 47107: [FORMATTING] No code changes.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu May 6 00:53:01 2010 New Revision: 47107 URL: http://svn.reactos.org/svn/reactos?rev=47107&view=rev Log: [FORMATTING] No code changes. Modified: trunk/reactos/dll/win32/userenv/environment.c Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Thu May 6 00:53:01 2010 @@ -32,394 +32,396 @@ static BOOL -SetUserEnvironmentVariable (LPVOID *Environment, - LPWSTR lpName, - LPWSTR lpValue, - BOOL bExpand) -{ - WCHAR ShortName[MAX_PATH]; - UNICODE_STRING Name; - UNICODE_STRING SrcValue; - UNICODE_STRING DstValue; - ULONG Length; - NTSTATUS Status; - PVOID Buffer=NULL; - - if (bExpand) - { - RtlInitUnicodeString(&SrcValue, - lpValue); - - Length = 2 * MAX_PATH * sizeof(WCHAR); - - DstValue.Length = 0; - DstValue.MaximumLength = Length; - DstValue.Buffer = Buffer = LocalAlloc(LPTR, - Length); - - if (DstValue.Buffer == NULL) - { - DPRINT1("LocalAlloc() failed\n"); - return FALSE; - } - - Status = RtlExpandEnvironmentStrings_U((PWSTR)*Environment, - &SrcValue, - &DstValue, - &Length); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlExpandEnvironmentStrings_U() failed (Status %lx)\n", Status); - DPRINT1("Length %lu\n", Length); - if (Buffer) LocalFree(Buffer); - return FALSE; - } - } - else - { - RtlInitUnicodeString(&DstValue, - lpValue); - } - - if (!_wcsicmp (lpName, L"temp") || !_wcsicmp (lpName, L"tmp")) - { - if (!GetShortPathNameW(DstValue.Buffer, ShortName, MAX_PATH)) - { - DPRINT1("GetShortPathNameW() failed for %S (Error %lu)\n", DstValue.Buffer, GetLastError()); - if (Buffer) LocalFree(Buffer); - return FALSE; - } - - DPRINT("Buffer: %S\n", ShortName); - RtlInitUnicodeString(&DstValue, - ShortName); - } - - RtlInitUnicodeString(&Name, - lpName); - - DPRINT("Value: %wZ\n", &DstValue); - - Status = RtlSetEnvironmentVariable((PWSTR*)Environment, - &Name, - &DstValue); - - if (Buffer) LocalFree(Buffer); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status); - return FALSE; - } - - return TRUE; +SetUserEnvironmentVariable(LPVOID *Environment, + LPWSTR lpName, + LPWSTR lpValue, + BOOL bExpand) +{ + WCHAR ShortName[MAX_PATH]; + UNICODE_STRING Name; + UNICODE_STRING SrcValue; + UNICODE_STRING DstValue; + ULONG Length; + NTSTATUS Status; + PVOID Buffer = NULL; + + if (bExpand) + { + RtlInitUnicodeString(&SrcValue, + lpValue); + + Length = 2 * MAX_PATH * sizeof(WCHAR); + + DstValue.Length = 0; + DstValue.MaximumLength = Length; + DstValue.Buffer = Buffer = LocalAlloc(LPTR, + Length); + if (DstValue.Buffer == NULL) + { + DPRINT1("LocalAlloc() failed\n"); + return FALSE; + } + + Status = RtlExpandEnvironmentStrings_U((PWSTR)*Environment, + &SrcValue, + &DstValue, + &Length); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlExpandEnvironmentStrings_U() failed (Status %lx)\n", Status); + DPRINT1("Length %lu\n", Length); + if (Buffer) + LocalFree(Buffer); + return FALSE; + } + } + else + { + RtlInitUnicodeString(&DstValue, + lpValue); + } + + if (!_wcsicmp(lpName, L"temp") || !_wcsicmp(lpName, L"tmp")) + { + if (!GetShortPathNameW(DstValue.Buffer, ShortName, MAX_PATH)) + { + DPRINT1("GetShortPathNameW() failed for %S (Error %lu)\n", DstValue.Buffer, GetLastError()); + if (Buffer) + LocalFree(Buffer); + return FALSE; + } + + DPRINT("Buffer: %S\n", ShortName); + RtlInitUnicodeString(&DstValue, + ShortName); + } + + RtlInitUnicodeString(&Name, + lpName); + + DPRINT("Value: %wZ\n", &DstValue); + + Status = RtlSetEnvironmentVariable((PWSTR*)Environment, + &Name, + &DstValue); + + if (Buffer) + LocalFree(Buffer); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status); + return FALSE; + } + + return TRUE; } static BOOL -AppendUserEnvironmentVariable (LPVOID *Environment, - LPWSTR lpName, - LPWSTR lpValue) -{ - UNICODE_STRING Name; - UNICODE_STRING Value; - NTSTATUS Status; - - RtlInitUnicodeString (&Name, - lpName); - - Value.Length = 0; - Value.MaximumLength = 1024 * sizeof(WCHAR); - Value.Buffer = LocalAlloc (LPTR, - 1024 * sizeof(WCHAR)); - if (Value.Buffer == NULL) - { - return FALSE; - } - Value.Buffer[0] = UNICODE_NULL; - - Status = RtlQueryEnvironmentVariable_U ((PWSTR)*Environment, - &Name, - &Value); - if (NT_SUCCESS(Status)) - { - RtlAppendUnicodeToString (&Value, - L";"); - } - - RtlAppendUnicodeToString (&Value, - lpValue); - - Status = RtlSetEnvironmentVariable ((PWSTR*)Environment, - &Name, - &Value); - LocalFree (Value.Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status); - return FALSE; - } - - return TRUE; +AppendUserEnvironmentVariable(LPVOID *Environment, + LPWSTR lpName, + LPWSTR lpValue) +{ + UNICODE_STRING Name; + UNICODE_STRING Value; + NTSTATUS Status; + + RtlInitUnicodeString(&Name, + lpName); + + Value.Length = 0; + Value.MaximumLength = 1024 * sizeof(WCHAR); + Value.Buffer = LocalAlloc(LPTR, + 1024 * sizeof(WCHAR)); + if (Value.Buffer == NULL) + { + return FALSE; + } + Value.Buffer[0] = UNICODE_NULL; + + Status = RtlQueryEnvironmentVariable_U((PWSTR)*Environment, + &Name, + &Value); + if (NT_SUCCESS(Status)) + { + RtlAppendUnicodeToString(&Value, + L";"); + } + + RtlAppendUnicodeToString(&Value, + lpValue); + + Status = RtlSetEnvironmentVariable((PWSTR*)Environment, + &Name, + &Value); + LocalFree(Value.Buffer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status); + return FALSE; + } + + return TRUE; } static HKEY -GetCurrentUserKey (HANDLE hToken) -{ - UNICODE_STRING SidString; - HKEY hKey; - LONG Error; - - if (!GetUserSidFromToken (hToken, - &SidString)) - { - DPRINT1 ("GetUserSidFromToken() failed\n"); - return NULL; - } - - Error = RegOpenKeyExW (HKEY_USERS, - SidString.Buffer, - 0, - MAXIMUM_ALLOWED, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); - RtlFreeUnicodeString (&SidString); - SetLastError((DWORD)Error); - return NULL; - } - - RtlFreeUnicodeString (&SidString); - - return hKey; +GetCurrentUserKey(HANDLE hToken) +{ + UNICODE_STRING SidString; + HKEY hKey; + LONG Error; + + if (!GetUserSidFromToken(hToken, + &SidString)) + { + DPRINT1("GetUserSidFromToken() failed\n"); + return NULL; + } + + Error = RegOpenKeyExW(HKEY_USERS, + SidString.Buffer, + 0, + MAXIMUM_ALLOWED, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW() failed (Error %ld)\n", Error); + RtlFreeUnicodeString(&SidString); + SetLastError((DWORD)Error); + return NULL; + } + + RtlFreeUnicodeString(&SidString); + + return hKey; } static BOOL -SetUserEnvironment (LPVOID *lpEnvironment, - HKEY hKey, - LPWSTR lpSubKeyName) -{ - HKEY hEnvKey; - DWORD dwValues; - DWORD dwMaxValueNameLength; - DWORD dwMaxValueDataLength; - DWORD dwValueNameLength; - DWORD dwValueDataLength; - DWORD dwType; - DWORD i; - LPWSTR lpValueName; - LPWSTR lpValueData; - LONG Error; - - Error = RegOpenKeyExW (hKey, - lpSubKeyName, - 0, - KEY_QUERY_VALUE, - &hEnvKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - Error = RegQueryInfoKey (hEnvKey, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - &dwValues, - &dwMaxValueNameLength, - &dwMaxValueDataLength, - NULL, - NULL); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegQueryInforKey() failed (Error %ld)\n", Error); - RegCloseKey (hEnvKey); - SetLastError((DWORD)Error); - return FALSE; - } - - if (dwValues == 0) - { - RegCloseKey (hEnvKey); - return TRUE; - } - - /* Allocate buffers */ - lpValueName = LocalAlloc (LPTR, - dwMaxValueNameLength * sizeof(WCHAR)); - if (lpValueName == NULL) - { - RegCloseKey (hEnvKey); - return FALSE; - } - - lpValueData = LocalAlloc (LPTR, - dwMaxValueDataLength); - if (lpValueData == NULL) - { - LocalFree (lpValueName); - RegCloseKey (hEnvKey); - return FALSE; - } - - /* Enumerate values */ - for (i = 0; i < dwValues; i++) - { - dwValueNameLength = dwMaxValueNameLength; - dwValueDataLength = dwMaxValueDataLength; - RegEnumValueW (hEnvKey, - i, - lpValueName, - &dwValueNameLength, - NULL, - &dwType, - (LPBYTE)lpValueData, - &dwValueDataLength); - - if (!_wcsicmp (lpValueName, L"path")) - { - /* Append 'Path' environment variable */ - AppendUserEnvironmentVariable (lpEnvironment, - lpValueName, - lpValueData); - } - else - { - /* Set environment variable */ - SetUserEnvironmentVariable (lpEnvironment, - lpValueName, - lpValueData, - (dwType == REG_EXPAND_SZ)); - } - } - - LocalFree (lpValueData); - LocalFree (lpValueName); - RegCloseKey (hEnvKey); - - return TRUE; +SetUserEnvironment(LPVOID *lpEnvironment, + HKEY hKey, + LPWSTR lpSubKeyName) +{ + HKEY hEnvKey; + DWORD dwValues; + DWORD dwMaxValueNameLength; + DWORD dwMaxValueDataLength; + DWORD dwValueNameLength; + DWORD dwValueDataLength; + DWORD dwType; + DWORD i; + LPWSTR lpValueName; + LPWSTR lpValueData; + LONG Error; + + Error = RegOpenKeyExW(hKey, + lpSubKeyName, + 0, + KEY_QUERY_VALUE, + &hEnvKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW() failed (Error %ld)\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + Error = RegQueryInfoKey(hEnvKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &dwValues, + &dwMaxValueNameLength, + &dwMaxValueDataLength, + NULL, + NULL); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegQueryInforKey() failed (Error %ld)\n", Error); + RegCloseKey(hEnvKey); + SetLastError((DWORD)Error); + return FALSE; + } + + if (dwValues == 0) + { + RegCloseKey(hEnvKey); + return TRUE; + } + + /* Allocate buffers */ + lpValueName = LocalAlloc(LPTR, + dwMaxValueNameLength * sizeof(WCHAR)); + if (lpValueName == NULL) + { + RegCloseKey(hEnvKey); + return FALSE; + } + + lpValueData = LocalAlloc(LPTR, + dwMaxValueDataLength); + if (lpValueData == NULL) + { + LocalFree(lpValueName); + RegCloseKey(hEnvKey); + return FALSE; + } + + /* Enumerate values */ + for (i = 0; i < dwValues; i++) + { + dwValueNameLength = dwMaxValueNameLength; + dwValueDataLength = dwMaxValueDataLength; + RegEnumValueW(hEnvKey, + i, + lpValueName, + &dwValueNameLength, + NULL, + &dwType, + (LPBYTE)lpValueData, + &dwValueDataLength); + + if (!_wcsicmp (lpValueName, L"path")) + { + /* Append 'Path' environment variable */ + AppendUserEnvironmentVariable(lpEnvironment, + lpValueName, + lpValueData); + } + else + { + /* Set environment variable */ + SetUserEnvironmentVariable(lpEnvironment, + lpValueName, + lpValueData, + (dwType == REG_EXPAND_SZ)); + } + } + + LocalFree(lpValueData); + LocalFree(lpValueName); + RegCloseKey(hEnvKey); + + return TRUE; } BOOL WINAPI -CreateEnvironmentBlock (LPVOID *lpEnvironment, - HANDLE hToken, - BOOL bInherit) -{ - WCHAR Buffer[MAX_PATH]; - DWORD Length; - HKEY hKeyUser; - NTSTATUS Status; - - DPRINT("CreateEnvironmentBlock() called\n"); - - if (lpEnvironment == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Status = RtlCreateEnvironment ((BOOLEAN)bInherit, - (PWSTR*)lpEnvironment); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("RtlCreateEnvironment() failed (Status %lx)\n", Status); - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - /* Set 'COMPUTERNAME' variable */ - Length = MAX_PATH; - if (GetComputerNameW (Buffer, - &Length)) - { - SetUserEnvironmentVariable(lpEnvironment, - L"COMPUTERNAME", - Buffer, - FALSE); - } - - if (hToken == NULL) +CreateEnvironmentBlock(LPVOID *lpEnvironment, + HANDLE hToken, + BOOL bInherit) +{ + WCHAR Buffer[MAX_PATH]; + DWORD Length; + HKEY hKeyUser; + NTSTATUS Status; + + DPRINT("CreateEnvironmentBlock() called\n"); + + if (lpEnvironment == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Status = RtlCreateEnvironment((BOOLEAN)bInherit, + (PWSTR*)lpEnvironment); + if (!NT_SUCCESS (Status)) + { + DPRINT1("RtlCreateEnvironment() failed (Status %lx)\n", Status); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + /* Set 'COMPUTERNAME' variable */ + Length = MAX_PATH; + if (GetComputerNameW(Buffer, + &Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"COMPUTERNAME", + Buffer, + FALSE); + } + + if (hToken == NULL) + return TRUE; + + hKeyUser = GetCurrentUserKey(hToken); + if (hKeyUser == NULL) + { + DPRINT1("GetCurrentUserKey() failed\n"); + RtlDestroyEnvironment(*lpEnvironment); + return FALSE; + } + + /* Set 'ALLUSERSPROFILE' variable */ + Length = MAX_PATH; + if (GetAllUsersProfileDirectoryW(Buffer, + &Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"ALLUSERSPROFILE", + Buffer, + FALSE); + } + + /* Set 'USERPROFILE' variable */ + Length = MAX_PATH; + if (GetUserProfileDirectoryW(hToken, + Buffer, + &Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"USERPROFILE", + Buffer, + FALSE); + } + + /* FIXME: Set 'USERDOMAIN' variable */ + + Length = MAX_PATH; + if (GetUserNameW(Buffer, + &Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"USERNAME", + Buffer, + FALSE); + } + + + + /* Set user environment variables */ + SetUserEnvironment(lpEnvironment, + hKeyUser, + L"Environment"); + + RegCloseKey(hKeyUser); + return TRUE; - - hKeyUser = GetCurrentUserKey (hToken); - if (hKeyUser == NULL) - { - DPRINT1 ("GetCurrentUserKey() failed\n"); - RtlDestroyEnvironment (*lpEnvironment); - return FALSE; - } - - /* Set 'ALLUSERSPROFILE' variable */ - Length = MAX_PATH; - if (GetAllUsersProfileDirectoryW (Buffer, - &Length)) - { - SetUserEnvironmentVariable(lpEnvironment, - L"ALLUSERSPROFILE", - Buffer, - FALSE); - } - - /* Set 'USERPROFILE' variable */ - Length = MAX_PATH; - if (GetUserProfileDirectoryW (hToken, - Buffer, - &Length)) - { - SetUserEnvironmentVariable(lpEnvironment, - L"USERPROFILE", - Buffer, - FALSE); - } - - /* FIXME: Set 'USERDOMAIN' variable */ - - Length = MAX_PATH; - if (GetUserNameW(Buffer, - &Length)) - { - SetUserEnvironmentVariable(lpEnvironment, - L"USERNAME", - Buffer, - FALSE); - } - - - - /* Set user environment variables */ - SetUserEnvironment (lpEnvironment, - hKeyUser, - L"Environment"); - - RegCloseKey (hKeyUser); - - return TRUE; } BOOL WINAPI -DestroyEnvironmentBlock (LPVOID lpEnvironment) -{ - DPRINT ("DestroyEnvironmentBlock() called\n"); - - if (lpEnvironment == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - RtlDestroyEnvironment (lpEnvironment); - - return TRUE; +DestroyEnvironmentBlock(LPVOID lpEnvironment) +{ + DPRINT("DestroyEnvironmentBlock() called\n"); + + if (lpEnvironment == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + RtlDestroyEnvironment(lpEnvironment); + + return TRUE; }

14 years, 4 months

[ekohl] 47106: [USERENV] - Create 'Default User' and 'All Users' directories without postfix and append a postfix only if they already exist. - Create the user account directory without a prefix and append a prefix if the directory already exists. - Acquire the restore privilege before unloading a hive and remove it after unloading the hive. Patch is based on Gabriel Ilardi's patch. Fixes bug #2972.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu May 6 00:30:14 2010 New Revision: 47106 URL: http://svn.reactos.org/svn/reactos?rev=47106&view=rev Log: [USERENV] - Create 'Default User' and 'All Users' directories without postfix and append a postfix only if they already exist. - Create the user account directory without a prefix and append a prefix if the directory already exists. - Acquire the restore privilege before unloading a hive and remove it after unloading the hive. Patch is based on Gabriel Ilardi's patch. Fixes bug #2972. Modified: trunk/reactos/dll/win32/userenv/profile.c trunk/reactos/dll/win32/userenv/setup.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Thu May 6 00:30:14 2010 @@ -170,10 +170,12 @@ WCHAR szProfilesPath[MAX_PATH]; WCHAR szUserProfilePath[MAX_PATH]; WCHAR szDefaultUserPath[MAX_PATH]; + WCHAR szUserProfileName[MAX_PATH]; WCHAR szBuffer[MAX_PATH]; LPWSTR SidString; DWORD dwLength; DWORD dwDisposition; + UINT i; HKEY hKey; LONG Error; @@ -245,14 +247,11 @@ RegCloseKey (hKey); + wcscpy(szUserProfileName, lpUserName); + wcscpy(szUserProfilePath, szProfilesPath); wcscat(szUserProfilePath, L"\\"); - wcscat(szUserProfilePath, lpUserName); - if (!AppendSystemPostfix(szUserProfilePath, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - return FALSE; - } + wcscat(szUserProfilePath, szUserProfileName); wcscpy(szDefaultUserPath, szProfilesPath); wcscat(szDefaultUserPath, L"\\"); @@ -265,6 +264,24 @@ { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; + } + + for (i = 0; i < 1000; i++) + { + swprintf(szUserProfileName, L"%s.%03u", lpUserName, i); + + wcscpy(szUserProfilePath, szProfilesPath); + wcscat(szUserProfilePath, L"\\"); + wcscat(szUserProfilePath, szUserProfileName); + + if (CreateDirectoryW(szUserProfilePath, NULL)) + break; + + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } } } @@ -308,14 +325,7 @@ /* Create non-expanded user profile path */ wcscpy(szBuffer, szRawProfilesPath); wcscat(szBuffer, L"\\"); - wcscat(szBuffer, lpUserName); - if (!AppendSystemPostfix(szBuffer, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - LocalFree((HLOCAL)SidString); - RegCloseKey (hKey); - return FALSE; - } + wcscat(szBuffer, szUserProfileName); /* Set 'ProfileImagePath' value (non-expanded) */ Error = RegSetValueExW(hKey, @@ -958,16 +968,9 @@ } } + /* Create user hive name */ wcscat(szUserHivePath, L"\\"); wcscat(szUserHivePath, lpProfileInfo->lpUserName); - dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); - if (!AppendSystemPostfix(szUserHivePath, dwLength)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - return FALSE; - } - - /* Create user hive name */ wcscat(szUserHivePath, L"\\ntuser.dat"); DPRINT("szUserHivePath: %S\n", szUserHivePath); @@ -1129,8 +1132,21 @@ DPRINT("SidString: '%wZ'\n", &SidString); + /* Acquire restore privilege */ + if (!AcquireRemoveRestorePrivilege(TRUE)) + { + DPRINT1("AcquireRemoveRestorePrivilege() failed (Error %ld)\n", GetLastError()); + RtlFreeUnicodeString(&SidString); + return FALSE; + } + + /* Unload the hive */ Error = RegUnLoadKeyW(HKEY_USERS, SidString.Buffer); + + /* Remove restore privilege */ + AcquireRemoveRestorePrivilege(FALSE); + if (Error != ERROR_SUCCESS) { DPRINT1("RegUnLoadKeyW() failed (Error %ld)\n", Error); Modified: trunk/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/setup.c?… ============================================================================== --- trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] Thu May 6 00:30:14 2010 @@ -140,7 +140,28 @@ return FALSE; } - /* Store profiles directory path */ + /* Expand it */ + if (!ExpandEnvironmentStringsW(szBuffer, + szProfilesPath, + MAX_PATH)) + { + DPRINT1("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return FALSE; + } + + /* Create profiles directory */ + if (!CreateDirectoryW(szProfilesPath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return FALSE; + } + } + + /* Store the profiles directory path in the registry */ dwLength = (wcslen (szBuffer) + 1) * sizeof(WCHAR); Error = RegSetValueExW(hKey, L"ProfilesDirectory", @@ -156,18 +177,16 @@ return FALSE; } - /* Expand it */ - if (!ExpandEnvironmentStringsW(szBuffer, - szProfilesPath, - MAX_PATH)) - { - DPRINT1("Error: %lu\n", GetLastError()); - RegCloseKey(hKey); - return FALSE; - } - - /* Create profiles directory */ - if (!CreateDirectoryW(szProfilesPath, NULL)) + /* Set 'DefaultUserProfile' value */ + wcscpy(szBuffer, L"Default User"); + + /* Create Default User profile directory path */ + wcscpy(szProfilePath, szProfilesPath); + wcscat(szProfilePath, L"\\"); + wcscat(szProfilePath, szBuffer); + + /* Attempt default user directory creation */ + if (!CreateDirectoryW (szProfilePath, NULL)) { if (GetLastError() != ERROR_ALREADY_EXISTS) { @@ -175,17 +194,33 @@ RegCloseKey(hKey); return FALSE; } - } - - /* Set 'DefaultUserProfile' value */ - wcscpy(szBuffer, L"Default User"); - if (!AppendSystemPostfix(szBuffer, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - RegCloseKey(hKey); - return FALSE; - } - + + /* Directory existed, let's try to append the postfix */ + if (!AppendSystemPostfix(szBuffer, MAX_PATH)) + { + DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); + RegCloseKey(hKey); + return FALSE; + } + + /* Create Default User profile directory path again */ + wcscpy(szProfilePath, szProfilesPath); + wcscat(szProfilePath, L"\\"); + wcscat(szProfilePath, szBuffer); + + /* Attempt creation again with appended postfix */ + if (!CreateDirectoryW(szProfilePath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return FALSE; + } + } + } + + /* Store the default user profile path in the registry */ dwLength = (wcslen (szBuffer) + 1) * sizeof(WCHAR); Error = RegSetValueExW(hKey, L"DefaultUserProfile", @@ -202,19 +237,6 @@ } RegCloseKey(hKey); - - /* Create 'Default User' profile directory */ - wcscpy(szProfilePath, szProfilesPath); - wcscat(szProfilePath, L"\\"); - wcscat(szProfilePath, szBuffer); - if (!CreateDirectoryW (szProfilePath, NULL)) - { - if (GetLastError() != ERROR_ALREADY_EXISTS) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - } /* Set current user profile */ SetEnvironmentVariableW(L"USERPROFILE", szProfilePath); @@ -382,10 +404,41 @@ /* Set 'AllUsersProfile' value */ wcscpy(szBuffer, L"All Users"); - if (!AppendSystemPostfix(szBuffer, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - return FALSE; + + /* Create 'All Users' profile directory path */ + wcscpy(szProfilePath, szProfilesPath); + wcscat(szProfilePath, L"\\"); + wcscat(szProfilePath, szBuffer); + + /* Attempt 'All Users' directory creation */ + if (!CreateDirectoryW (szProfilePath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + + /* Directory existed, let's try to append the postfix */ + if (!AppendSystemPostfix(szBuffer, MAX_PATH)) + { + DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); + return FALSE; + } + + /* Attempt again creation with appended postfix */ + wcscpy(szProfilePath, szProfilesPath); + wcscat(szProfilePath, L"\\"); + wcscat(szProfilePath, szBuffer); + + if (!CreateDirectoryW(szProfilePath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + } } Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -407,27 +460,14 @@ REG_SZ, (LPBYTE)szBuffer, dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey(hKey); - SetLastError((DWORD)Error); - return FALSE; - } RegCloseKey(hKey); - /* Create 'All Users' profile directory */ - wcscpy(szProfilePath, szProfilesPath); - wcscat(szProfilePath, L"\\"); - wcscat(szProfilePath, szBuffer); - if (!CreateDirectoryW(szProfilePath, NULL)) - { - if (GetLastError() != ERROR_ALREADY_EXISTS) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; } /* Set 'All Users' profile */

14 years, 4 months

← Newer
1
...
37
38
39
40
41
42
43
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2010