Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[fireball] 23537: Dmitriy Philippov (shedon@mail.ru): - The MOVEFILE_DELAY_UNTIL_REBOOT flag is incorrect processed in the MoveFileWithProgressW function. - The add_boot_rename_entry function contains too many bugs, it crashes when deleting operation is performed, it does not save old entry in registry, etc... Fixes are based on the testing application located in reactos/base/application/testsets/smss/movefile

by fireball＠svn.reactos.org

Author: fireball Date: Wed Aug 9 23:46:07 2006 New Revision: 23537 URL: http://svn.reactos.org/svn/reactos?rev=23537&view=rev Log: Dmitriy Philippov (shedon(a)mail.ru): - The MOVEFILE_DELAY_UNTIL_REBOOT flag is incorrect processed in the MoveFileWithProgressW function. - The add_boot_rename_entry function contains too many bugs, it crashes when deleting operation is performed, it does not save old entry in registry, etc... Fixes are based on the testing application located in reactos/base/application/testsets/smss/movefile Modified: trunk/reactos/dll/win32/kernel32/file/move.c Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/move.c (original) +++ trunk/reactos/dll/win32/kernel32/file/move.c Wed Aug 9 23:46:07 2006 @@ -6,8 +6,11 @@ * PURPOSE: Directory functions * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) * Gerhard W. Gruber (sparhawk_at_gmx.at) + * Dmitry Philippov (shedon(a)mail.ru) * UPDATE HISTORY: * Created 01/11/98 + * DP (29/07/2006) + * Fix some bugs in the add_boot_rename_entry function */ /* INCLUDES *****************************************************************/ @@ -83,12 +86,16 @@ BOOL rc = FALSE; HANDLE Reboot = NULL; DWORD len1, len2; + DWORD DestLen = 0; DWORD DataSize = 0; BYTE *Buffer = NULL; WCHAR *p; NTSTATUS Status; - DPRINT("Add support to smss for keys created by MOVEFILE_DELAY_UNTIL_REBOOT\n"); + DPRINT("add_boot_rename_entry( %S, %S, %d ) \n", source, dest, flags); + + if(dest) + DestLen = wcslen(dest); if (!RtlDosPathNameToNtPathName_U( source, &source_name, NULL, NULL )) { @@ -96,7 +103,7 @@ return FALSE; } dest_name.Buffer = NULL; - if (dest && !RtlDosPathNameToNtPathName_U( dest, &dest_name, NULL, NULL )) + if (DestLen && !RtlDosPathNameToNtPathName_U( dest, &dest_name, NULL, NULL )) { RtlFreeHeap( RtlGetProcessHeap(), 0, source_name.Buffer ); SetLastError( ERROR_PATH_NOT_FOUND ); @@ -105,7 +112,7 @@ InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, + OBJ_OPENIF | OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -114,36 +121,62 @@ &ObjectAttributes, 0, NULL, - REG_OPTION_NON_VOLATILE, + 0, NULL); + if (Status == STATUS_ACCESS_DENIED) + { + Status = NtCreateKey( + &Reboot, + KEY_QUERY_VALUE | KEY_SET_VALUE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_BACKUP_RESTORE, + NULL); + } + if (!NT_SUCCESS(Status)) { - DPRINT1("NtCreateKey() failed (Status 0x%lx)\n", Status); - RtlFreeHeap( RtlGetProcessHeap(), 0, source_name.Buffer ); - RtlFreeHeap( RtlGetProcessHeap(), 0, dest_name.Buffer ); + DPRINT("NtCreateKey() failed (Status 0x%lx)\n", Status); + if (source_name.Buffer) + RtlFreeHeap(RtlGetProcessHeap(), 0, source_name.Buffer); + if (dest_name.Buffer) + RtlFreeHeap(RtlGetProcessHeap(), 0, dest_name.Buffer); return FALSE; } len1 = source_name.Length + sizeof(WCHAR); - if (dest) + if (DestLen) { len2 = dest_name.Length + sizeof(WCHAR); if (flags & MOVEFILE_REPLACE_EXISTING) len2 += sizeof(WCHAR); /* Plus 1 because of the leading '!' */ } - else len2 = sizeof(WCHAR); /* minimum is the 0 characters for the empty second string */ + else + { + len2 = sizeof(WCHAR); /* minimum is the 0 characters for the empty second string */ + } RtlInitUnicodeString( &nameW, ValueName ); /* First we check if the key exists and if so how many bytes it already contains. */ - if (NtQueryValueKey( Reboot, &nameW, KeyValuePartialInformation, - NULL, 0, &DataSize ) == STATUS_BUFFER_OVERFLOW) - { - if (!(Buffer = HeapAlloc( GetProcessHeap(), 0, DataSize + len1 + len2 + sizeof(WCHAR) ))) + Status = NtQueryValueKey( + Reboot, + &nameW, + KeyValuePartialInformation, + NULL, + 0, + &DataSize ); + if ((Status == STATUS_BUFFER_OVERFLOW) || + (Status == STATUS_BUFFER_TOO_SMALL)) + { + if (!(Buffer = HeapAlloc(GetProcessHeap(), 0, DataSize + len1 + len2 + sizeof(WCHAR)))) goto Quit; - if (NtQueryValueKey( Reboot, &nameW, KeyValuePartialInformation, - Buffer, DataSize, &DataSize )) goto Quit; + Status = NtQueryValueKey(Reboot, &nameW, KeyValuePartialInformation, + Buffer, DataSize, &DataSize); + if(!NT_SUCCESS(Status)) + goto Quit; info = (KEY_VALUE_PARTIAL_INFORMATION *)Buffer; if (info->Type != REG_MULTI_SZ) goto Quit; if (DataSize > sizeof(info)) DataSize -= sizeof(WCHAR); /* remove terminating null (will be added back later) */ @@ -158,7 +191,7 @@ memcpy( Buffer + DataSize, source_name.Buffer, len1 ); DataSize += len1; p = (WCHAR *)(Buffer + DataSize); - if (dest) + if (DestLen) { if (flags & MOVEFILE_REPLACE_EXISTING) *p++ = '!'; @@ -179,10 +212,12 @@ rc = NT_SUCCESS(NtSetValueKey(Reboot, &nameW, 0, REG_MULTI_SZ, Buffer + info_size, DataSize - info_size)); Quit: - RtlFreeHeap( RtlGetProcessHeap(), 0, source_name.Buffer ); - RtlFreeHeap( RtlGetProcessHeap(), 0, dest_name.Buffer ); - if (Reboot) NtClose(Reboot); - HeapFree( GetProcessHeap(), 0, Buffer ); + RtlFreeHeap(RtlGetProcessHeap(), 0, source_name.Buffer); + if (dest_name.Buffer) + RtlFreeHeap(RtlGetProcessHeap(), 0, dest_name.Buffer); + NtClose(Reboot); + if(Buffer) + HeapFree(GetProcessHeap(), 0, Buffer); return(rc); } @@ -240,10 +275,13 @@ } FileRename = alloca(sizeof(FILE_RENAME_INFORMATION) + DstPathU.Length); - if ((dwFlags & MOVEFILE_REPLACE_EXISTING) == MOVEFILE_REPLACE_EXISTING) + if( dwFlags & MOVEFILE_REPLACE_EXISTING ) { FileRename->ReplaceIfExists = TRUE; - else + } + else { FileRename->ReplaceIfExists = FALSE; + } + memcpy(FileRename->FileName, DstPathU.Buffer, DstPathU.Length); RtlFreeHeap (RtlGetProcessHeap (),

18 years, 2 months

[fireball] 23536: Dmitriy Philippov (shedon@mail.ru): Add test application for move file after reboot function of smss.exe / kernel32.dll

by fireball＠svn.reactos.org

Author: fireball Date: Wed Aug 9 23:42:50 2006 New Revision: 23536 URL: http://svn.reactos.org/svn/reactos?rev=23536&view=rev Log: Dmitriy Philippov (shedon(a)mail.ru): Add test application for move file after reboot function of smss.exe / kernel32.dll Added: trunk/reactos/base/applications/testsets/smss/ trunk/reactos/base/applications/testsets/smss/movefile/ trunk/reactos/base/applications/testsets/smss/movefile/movefile.cpp trunk/reactos/base/applications/testsets/smss/movefile/movefile.rbuild trunk/reactos/base/applications/testsets/smss/movefile/movefile.rc trunk/reactos/base/applications/testsets/smss/smss.rbuild Modified: trunk/reactos/base/applications/testsets/testsets.rbuild Added: trunk/reactos/base/applications/testsets/smss/movefile/movefile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/smss/movefile/movefile.cpp (added) +++ trunk/reactos/base/applications/testsets/smss/movefile/movefile.cpp Wed Aug 9 23:42:50 2006 @@ -1,0 +1,193 @@ +/* + * PROJECT: ReactOS Test applications + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/testsets/smss/movefile.cpp + * PURPOSE: Provides testing for the "move file after reboot" + * function of smss.exe/kernel32.dll + * PROGRAMMERS: Dmitriy Philippov (shedon(a)mail.ru) + */ + + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#include "windows.h" +#include <stdio.h> +#include <tchar.h> +#include "stdlib.h" +#include "string.h" + + +void Usage() +{ + printf(" Usage: smssTest.exe -g|c|s|d \n \ + g - generate test files \n \ + c - check files after reboot \n \ + s - show registry entry \n \ + d - delete registry value \n"); +} + +int ShowRegValue() +{ + BYTE lpBuff[255]; + memset(lpBuff, 0, sizeof(lpBuff)); + + DWORD lSize = sizeof(lpBuff); + HKEY hKey; + LONG retValue; + // test registry entry + retValue = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\Session Manager", 0, KEY_QUERY_VALUE, &hKey); + if( ERROR_SUCCESS != retValue ) { + printf("RegOpenKeyEx err=%ld \n", retValue); + return 1; + } + + retValue = RegQueryValueEx(hKey, "PendingFileRenameOperations", NULL, NULL, lpBuff, &lSize); + if( ERROR_SUCCESS != retValue ) { + printf("RegQueryValueEx err=%ld \n", retValue); + lSize = 0; + } + + printf("reg data: \n"); + for(UINT i=0; i<lSize; i++) { + printf("%c", lpBuff[i]); + } + printf("\n"); + + RegCloseKey(hKey); + + return 0; +} + +int DeleteValue() +{ + HKEY hKey; + LONG retValue; + // test registry entry + retValue = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\Session Manager", 0, KEY_SET_VALUE, &hKey); + if( ERROR_SUCCESS != retValue ) { + printf("RegOpenKeyEx err=%ld \n", retValue); + return 1; + } + + retValue = RegDeleteValue(hKey, "PendingFileRenameOperations"); + if( ERROR_SUCCESS != retValue ) { + printf("RegDeleteValue err=%ld \n", retValue); + } + + RegCloseKey(hKey); + + return 0; +} + +int Generate() +{ + char sBuf[255]; + DWORD dwSize; + HANDLE hFile = NULL; + + char *szxMovedFile = "c:\\testFileShouldBeMoved"; + char *szxNewMovedFile = "c:\\testFileIsMoved"; + + char *szxDeletedFile = "c:\\testFileShouldBeDeleted"; + + memset(sBuf, 0xaa, sizeof(sBuf)); + + // create the first file for moving + hFile = CreateFile( + szxMovedFile, + FILE_ALL_ACCESS, + 0, + NULL, + CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + if(NULL == hFile) { + printf("Can't create the %s file, err=%ld \n", szxMovedFile, GetLastError()); + return 1; + } + WriteFile(hFile, sBuf, sizeof(sBuf), &dwSize, NULL); + CloseHandle(hFile); + + // create the second file for removing + hFile = CreateFile( + szxDeletedFile, + FILE_ALL_ACCESS, + 0, + NULL, + CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + if(NULL == hFile) { + printf("Can't create the %s file, err=%ld \n", szxDeletedFile, GetLastError()); + return 1; + } + WriteFile(hFile, sBuf, sizeof(sBuf), &dwSize, NULL); + CloseHandle(hFile); + + + BOOL fReturnValue; + + fReturnValue = MoveFileEx( + szxDeletedFile, + NULL, + MOVEFILE_DELAY_UNTIL_REBOOT); + if( !fReturnValue ) { + printf("Can't move the %s file, err=%ld \n", szxMovedFile, GetLastError()); + return 1; + } + + ShowRegValue(); + + fReturnValue = MoveFileEx( + szxMovedFile, + szxNewMovedFile, + MOVEFILE_DELAY_UNTIL_REBOOT); + if( !fReturnValue ) { + printf("Can't move the %s file, err=%ld \n", szxMovedFile, GetLastError()); + return 1; + } + + ShowRegValue(); + + return 0; +} + +int Check() +{ + return 0; +} + +int _tmain(int argc, _TCHAR* argv[]) +{ + if( argc<2 ) { + Usage(); + return 1; + } + + if( 0 == strncmp(argv[1], "-g", 2) ) + { + // generate test files and registry values + return Generate(); + } + else if( 0 == strncmp(argv[1], "-c", 2) ) + { + // check generated files + return Check(); + } + else if( 0 == strncmp(argv[1], "-s", 2) ) + { + // + return ShowRegValue(); + } + else if( 0 == strncmp(argv[1], "-d", 2) ) + { + return DeleteValue(); + } + else + { + Usage(); + return 1; + } + + return 0; +} + Added: trunk/reactos/base/applications/testsets/smss/movefile/movefile.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/smss/movefile/movefile.rbuild (added) +++ trunk/reactos/base/applications/testsets/smss/movefile/movefile.rbuild Wed Aug 9 23:42:50 2006 @@ -1,0 +1,11 @@ +<module name="movefile" type="win32cui" installbase="system32" installname="movefiletest.exe"> + <include base="movefile">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>kernel32</library> + <library>user32</library> + <file>movefile.cpp</file> + <file>movefile.rc</file> +</module> Added: trunk/reactos/base/applications/testsets/smss/movefile/movefile.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/smss/movefile/movefile.rc (added) +++ trunk/reactos/base/applications/testsets/smss/movefile/movefile.rc Wed Aug 9 23:42:50 2006 @@ -1,0 +1,9 @@ +#include <windows.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Move File after reboot test\0" +#define REACTOS_STR_INTERNAL_NAME "movefiletest\0" +#define REACTOS_STR_ORIGINAL_FILENAME "movefiletest.exe\0" +#include <reactos/version.rc> + + Added: trunk/reactos/base/applications/testsets/smss/smss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/smss/smss.rbuild (added) +++ trunk/reactos/base/applications/testsets/smss/smss.rbuild Wed Aug 9 23:42:50 2006 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<group> +<directory name="movefile"> + <xi:include href="movefile/movefile.rbuild" /> +</directory> +</group> Modified: trunk/reactos/base/applications/testsets/testsets.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/testsets.rbuild (original) +++ trunk/reactos/base/applications/testsets/testsets.rbuild Wed Aug 9 23:42:50 2006 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <group> +<directory name="smss"> + <xi:include href="smss/smss.rbuild" /> +</directory> <directory name="user32"> <xi:include href="user32/user32.rbuild" /> </directory>

18 years, 2 months

[jimtabor] 23535: Fireball fix for fast interlocks.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 9 21:45:49 2006 New Revision: 23535 URL: http://svn.reactos.org/svn/reactos?rev=23535&view=rev Log: Fireball fix for fast interlocks. Modified: branches/ros-branch-0_3_0/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Modified: branches/ros-branch-0_3_0/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_0/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S (original) +++ branches/ros-branch-0_3_0/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Wed Aug 9 21:45:49 2006 @@ -767,7 +767,7 @@ /* Restore flags and return */ popfd - ret 0 + ret 4 //ret 0 #ifdef CONFIG_SMP .spinb:

18 years, 2 months

[hpoussin] 23534: Check if logoff succeeded before continuing Check if shutdown succeeded before calling kernel

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Aug 9 18:29:12 2006 New Revision: 23534 URL: http://svn.reactos.org/svn/reactos?rev=23534&view=rev Log: Check if logoff succeeded before continuing Check if shutdown succeeded before calling kernel Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Wed Aug 9 18:29:12 2006 @@ -75,6 +75,7 @@ return FALSE; } /* FIXME: use Session->Profile.pszEnvironment */ + /* FIXME: UpdatePerUserSystemParameters(0, TRUE); */ /* Get privilege */ /* FIXME: who should do it? winlogon or gina? */ @@ -124,7 +125,7 @@ { PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA)Parameter; - if (!ImpersonateLoggedOnUser(LSData->Session->UserToken)) + if (LSData->Session->UserToken && !ImpersonateLoggedOnUser(LSData->Session->UserToken)) { ERR("ImpersonateLoggedOnUser failed with error %lu\n", GetLastError()); return 0; @@ -143,7 +144,8 @@ /* FIXME: Call ExitWindowsEx() to terminate COM processes */ - RevertToSelf(); + if (LSData->Session->UserToken) + RevertToSelf(); return 1; } @@ -155,6 +157,7 @@ { PLOGOFF_SHUTDOWN_DATA LSData; HANDLE hThread; + DWORD exitCode; DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); @@ -172,15 +175,30 @@ hThread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); if (!hThread) { - ERR("Unable to create shutdown thread, error %lu\n", GetLastError()); + ERR("Unable to create logoff thread, error %lu\n", GetLastError()); HeapFree(GetProcessHeap(), 0, LSData); return STATUS_UNSUCCESSFUL; } WaitForSingleObject(hThread, INFINITE); + HeapFree(GetProcessHeap(), 0, LSData); + if (!GetExitCodeThread(hThread, &exitCode)) + { + ERR("Unable to get exit code of logoff thread (error %lu)\n", GetLastError()); + CloseHandle(hThread); + return STATUS_UNSUCCESSFUL; + } CloseHandle(hThread); - HeapFree(GetProcessHeap(), 0, LSData); - + if (exitCode == 0) + { + ERR("Logoff thread returned failure\n"); + return STATUS_UNSUCCESSFUL; + } + + //UnloadUserProfile(Session->UserToken, ProfileInfo.hProfile); + //CloseHandle(Session->UserToken); + //UpdatePerUserSystemParameters(0, FALSE); Session->LogonStatus = WKSTA_IS_LOGGED_OFF; + Session->UserToken = NULL; return STATUS_SUCCESS; } @@ -232,6 +250,7 @@ { PLOGOFF_SHUTDOWN_DATA LSData; HANDLE hThread; + DWORD exitCode; DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); @@ -259,8 +278,19 @@ return STATUS_UNSUCCESSFUL; } WaitForSingleObject(hThread, INFINITE); + HeapFree(GetProcessHeap(), 0, LSData); + if (!GetExitCodeThread(hThread, &exitCode)) + { + ERR("Unable to get exit code of shutdown thread (error %lu)\n", GetLastError()); + CloseHandle(hThread); + return STATUS_UNSUCCESSFUL; + } CloseHandle(hThread); - HeapFree(GetProcessHeap(), 0, LSData); + if (exitCode == 0) + { + ERR("Shutdown thread returned failure\n"); + return STATUS_UNSUCCESSFUL; + } /* Destroy SAS window */ UninitializeSAS(Session); @@ -315,12 +345,19 @@ SwitchDesktop(WLSession->WinlogonDesktop); Session->Gina.Functions.WlxLogoff(Session->Gina.Context); if (!NT_SUCCESS(HandleLogoff(Session, EWX_LOGOFF))) + { + RemoveStatusMessage(Session); break; + } } if (WLX_SHUTTINGDOWN(wlxAction)) { Session->Gina.Functions.WlxShutdown(Session->Gina.Context, wlxAction); - HandleShutdown(Session, wlxAction); + if (!NT_SUCCESS(HandleShutdown(Session, wlxAction))) + { + RemoveStatusMessage(Session); + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + } } else { Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Wed Aug 9 18:29:12 2006 @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ #include "winlogon.h" -#define YDEBUG +//#define YDEBUG #include <wine/debug.h> /* GLOBALS ******************************************************************/ @@ -270,128 +270,6 @@ return CommandLine; } -static BOOL -DoBrokenLogonUser( - IN PWLSESSION WLSession, - IN PWLX_MPR_NOTIFY_INFO pMprNotifyInfo) -{ - PROCESS_INFORMATION ProcessInformation; - STARTUPINFO StartupInfo; - WCHAR CommandLine[MAX_PATH]; - WCHAR CurrentDirectory[MAX_PATH]; - PROFILEINFOW ProfileInfo; - BOOL Result; - LPVOID lpEnvironment = NULL; - MSG Msg; - BOOLEAN Old; - - SwitchDesktop(WLSession->ApplicationDesktop); - - /* Load the user profile */ - ProfileInfo.dwSize = sizeof(PROFILEINFOW); - ProfileInfo.dwFlags = 0; - ProfileInfo.lpUserName = pMprNotifyInfo->pszUserName; - ProfileInfo.lpProfilePath = NULL; - ProfileInfo.lpDefaultPath = NULL; - ProfileInfo.lpServerName = NULL; - ProfileInfo.lpPolicyPath = NULL; - ProfileInfo.hProfile = NULL; - - if (!LoadUserProfileW (WLSession->UserToken, - &ProfileInfo)) - { - DPRINT1 ("WL: LoadUserProfileW() failed\n"); - CloseHandle (WLSession->UserToken); - RtlDestroyEnvironment (lpEnvironment); - return FALSE; - } - - if (!CreateEnvironmentBlock (&lpEnvironment, - WLSession->UserToken, - TRUE)) - { - DPRINT1("WL: CreateEnvironmentBlock() failed\n"); - return FALSE; - } - - if (ImpersonateLoggedOnUser(WLSession->UserToken)) - { - UpdatePerUserSystemParameters(0, TRUE); - RevertToSelf(); - } - - GetWindowsDirectoryW (CurrentDirectory, MAX_PATH); - - StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; - StartupInfo.lpTitle = NULL; - StartupInfo.dwFlags = 0; - StartupInfo.cbReserved2 = 0; - StartupInfo.lpReserved2 = 0; - - /* Get privilege */ - RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); - - Result = CreateProcessAsUserW( - WLSession->UserToken, - NULL, - GetUserInit (CommandLine, MAX_PATH), - NULL, - NULL, - FALSE, - CREATE_UNICODE_ENVIRONMENT, - lpEnvironment, - CurrentDirectory, - &StartupInfo, - &ProcessInformation); - if (!Result) - { - DPRINT1("WL: Failed to execute user shell %ws\n", CommandLine); - if (ImpersonateLoggedOnUser(WLSession->UserToken)) - { - UpdatePerUserSystemParameters(0, FALSE); - RevertToSelf(); - } - UnloadUserProfile (WLSession->UserToken, - ProfileInfo.hProfile); - CloseHandle (WLSession->UserToken); - DestroyEnvironmentBlock (lpEnvironment); - return FALSE; - } - /*WLSession->Gina.Functions.WlxActivateUserShell(WLSession->Gina.Context, - L"WinSta0\\Default", - NULL, - NULL);*/ - - while (WaitForSingleObject (ProcessInformation.hProcess, 100) != WAIT_OBJECT_0) - { - if (PeekMessage(&Msg, WLSession->SASWindow, 0, 0, PM_REMOVE)) - { - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } - } - - CloseHandle (ProcessInformation.hProcess); - CloseHandle (ProcessInformation.hThread); - - if (ImpersonateLoggedOnUser(WLSession->UserToken)) - { - UpdatePerUserSystemParameters(0, FALSE); - RevertToSelf(); - } - - /* Unload user profile */ - UnloadUserProfile (WLSession->UserToken, - ProfileInfo.hProfile); - - CloseHandle (WLSession->UserToken); - - RtlDestroyEnvironment (lpEnvironment); - - return TRUE; -} #endif BOOL Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c (original) +++ trunk/reactos/base/system/winlogon/wlx.c Wed Aug 9 18:29:12 2006 @@ -12,7 +12,7 @@ #include "winlogon.h" -#define YDEBUG +//#define YDEBUG #include <wine/debug.h> static DLGPROC PreviousWindowProc; @@ -323,7 +323,7 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI WlxSetOption(

18 years, 2 months

[hpoussin] 23533: A thread may exit with a status code of 0.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Aug 9 16:46:41 2006 New Revision: 23533 URL: http://svn.reactos.org/svn/reactos?rev=23533&view=rev Log: A thread may exit with a status code of 0. Modified: trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Wed Aug 9 16:46:41 2006 @@ -921,9 +921,7 @@ _SEH_TRY { /* Write all the information from the ETHREAD/KTHREAD */ - ThreadBasicInfo->ExitStatus = (Thread->ExitStatus == 0) ? - STATUS_PENDING : - Thread->ExitStatus; + ThreadBasicInfo->ExitStatus = Thread->ExitStatus; ThreadBasicInfo->TebBaseAddress = (PVOID)Thread->Tcb.Teb; ThreadBasicInfo->ClientId = Thread->Cid; ThreadBasicInfo->AffinityMask = Thread->Tcb.Affinity; Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Wed Aug 9 16:46:41 2006 @@ -239,6 +239,9 @@ /* Initialize rundown protection */ ExInitializeRundownProtection(&Thread->RundownProtect); + /* Initialize exit code */ + Thread->ExitStatus = STATUS_PENDING; + /* Set the Process CID */ Thread->ThreadsProcess = Process; Thread->Cid.UniqueProcess = Process->UniqueProcessId;

18 years, 2 months

[hpoussin] 23532: Fix a bug in NtQueryInformationThread, which was leading to its unusability in user mode

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Aug 9 16:15:18 2006 New Revision: 23532 URL: http://svn.reactos.org/svn/reactos?rev=23532&view=rev Log: Fix a bug in NtQueryInformationThread, which was leading to its unusability in user mode Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Wed Aug 9 16:15:18 2006 @@ -890,12 +890,13 @@ PAGED_CODE(); /* Verify Information Class validity */ - Status = DefaultSetInfoBufferCheck(ThreadInformationClass, - PsThreadInfoClass, - RTL_NUMBER_OF(PsThreadInfoClass), - ThreadInformation, - ThreadInformationLength, - PreviousMode); + Status = DefaultQueryInfoBufferCheck(ThreadInformationClass, + PsThreadInfoClass, + RTL_NUMBER_OF(PsThreadInfoClass), + ThreadInformation, + ThreadInformationLength, + ReturnLength, + PreviousMode); if (!NT_SUCCESS(Status)) return Status; /* Check what class this is */

18 years, 2 months

[fireball] 23531: - Add tracing to class.c - Slightly change header to match the new style

by fireball＠svn.reactos.org

Author: fireball Date: Wed Aug 9 14:00:04 2006 New Revision: 23531 URL: http://svn.reactos.org/svn/reactos?rev=23531&view=rev Log: - Add tracing to class.c - Slightly change header to match the new style Modified: trunk/reactos/dll/win32/user32/windows/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c (original) +++ trunk/reactos/dll/win32/user32/windows/class.c Wed Aug 9 14:00:04 2006 @@ -1,8 +1,8 @@ /* $Id$ * - * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/class.c + * COPYRIGHT: GPL - See COPYING in the top level directory + * FILE: dll/win32/user32/windows/class.c * PURPOSE: Window classes * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: @@ -27,6 +27,11 @@ { UNICODE_STRING ClassName = {0}; BOOL Ret; + + TRACE("%p class/atom: %s/%04x %p\n", hinst, + IS_ATOM(lpszClass) ? NULL : lpszClass, + IS_ATOM(lpszClass) ? lpszClass : 0, + lpwcx); if (lpszClass == NULL) { @@ -79,6 +84,11 @@ LPWNDCLASSEXW lpwcx) { UNICODE_STRING ClassName = {0}; + + TRACE("%p class/atom: %S/%04x %p\n", hinst, + IS_ATOM(lpszClass) ? NULL : lpszClass, + IS_ATOM(lpszClass) ? lpszClass : 0, + lpwcx); if (lpszClass == NULL) { @@ -182,6 +192,8 @@ DWORD STDCALL GetClassLongA(HWND hWnd, int nIndex) { + TRACE("%p %d\n", hWnd, nIndex); + switch (nIndex) { case GCL_HBRBACKGROUND: @@ -213,6 +225,8 @@ DWORD STDCALL GetClassLongW ( HWND hWnd, int nIndex ) { + TRACE("%p %d\n", hWnd, nIndex); + switch (nIndex) { case GCL_HBRBACKGROUND: @@ -249,13 +263,21 @@ int nMaxCount) { ANSI_STRING ClassName; + int Result; ClassName.MaximumLength = nMaxCount; ClassName.Buffer = lpClassName; - return NtUserGetClassName(hWnd, - (PUNICODE_STRING)&ClassName, - TRUE); + Result = NtUserGetClassName(hWnd, + (PUNICODE_STRING)&ClassName, + TRUE); + + TRACE("%p class/atom: %s/%04x %x\n", hWnd, + IS_ATOM(lpClassName) ? NULL : lpClassName, + IS_ATOM(lpClassName) ? lpClassName : 0, + nMaxCount); + + return Result; } @@ -270,13 +292,21 @@ int nMaxCount) { UNICODE_STRING ClassName; + int Result; ClassName.MaximumLength = nMaxCount; ClassName.Buffer = lpClassName; - return NtUserGetClassName(hWnd, - &ClassName, - FALSE); + Result = NtUserGetClassName(hWnd, + &ClassName, + FALSE); + + TRACE("%p class/atom: %S/%04x %x\n", hWnd, + IS_ATOM(lpClassName) ? NULL : lpClassName, + IS_ATOM(lpClassName) ? lpClassName : 0, + nMaxCount); + + return Result; } @@ -292,6 +322,8 @@ * NOTE: Obsoleted in 32-bit windows */ { + TRACE("%p %x\n", hWnd, nIndex); + if ((nIndex < 0) && (nIndex != GCW_ATOM)) return 0; @@ -614,6 +646,10 @@ REGISTERCLASS_ANSI, hMenu); + TRACE("atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", + Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground, + lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass); + if (!IS_INTRESOURCE(WndClass.lpszMenuName)) RtlFreeUnicodeString(&MenuName); if (!IS_ATOM(WndClass.lpszClassName)) @@ -628,6 +664,7 @@ ATOM STDCALL RegisterClassExW(CONST WNDCLASSEXW *lpwcx) { + ATOM Atom; WNDCLASSEXW WndClass; UNICODE_STRING ClassName; UNICODE_STRING MenuName = {0}; @@ -695,12 +732,18 @@ RtlInitUnicodeString(&ClassName, WndClass.lpszClassName); } - return (ATOM)NtUserRegisterClassEx(&WndClass, + Atom = (ATOM)NtUserRegisterClassEx(&WndClass, &ClassName, &MenuName, NULL, 0, hMenu); + + TRACE("atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", + Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground, + lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass); + + return Atom; } /* @@ -752,6 +795,8 @@ UNICODE_STRING Value = {0}; BOOL Allocated = FALSE; DWORD Ret; + + TRACE("%p %d %lx\n", hWnd, nIndex, dwNewLong); /* FIXME - portability!!!! */ @@ -818,6 +863,8 @@ PWSTR lpStr = (PWSTR)dwNewLong; UNICODE_STRING Value = {0}; + TRACE("%p %d %lx\n", hWnd, nIndex, dwNewLong); + /* FIXME - portability!!!! */ if (nIndex == GCL_MENUNAME && lpStr != NULL) @@ -913,6 +960,11 @@ NTSTATUS Status; BOOL Ret; + TRACE("class/atom: %s/%04x %p\n", + IS_ATOM(lpClassName) ? NULL : lpClassName, + IS_ATOM(lpClassName) ? lpClassName : 0, + hInstance); + if (!IS_ATOM(lpClassName)) { Status = HEAP_strdupAtoW(&ClassName.Buffer, lpClassName, NULL); @@ -949,6 +1001,11 @@ { UNICODE_STRING ClassName = {0}; + TRACE("class/atom: %S/%04x %p\n", + IS_ATOM(lpClassName) ? NULL : lpClassName, + IS_ATOM(lpClassName) ? lpClassName : 0, + hInstance); + if (!IS_ATOM(lpClassName)) { RtlInitUnicodeString(&ClassName,

18 years, 2 months

[hpoussin] 23530: Remove HandleExitWindows, and move its code to HandleLogoff and HandleShutdown Lots of cleanup

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Aug 9 10:31:02 2006 New Revision: 23530 URL: http://svn.reactos.org/svn/reactos?rev=23530&view=rev Log: Remove HandleExitWindows, and move its code to HandleLogoff and HandleShutdown Lots of cleanup Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Wed Aug 9 10:31:02 2006 @@ -81,32 +81,202 @@ /* FIXME: reverting to lower privileges after creating user shell? */ RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); - return Session->Gina.Functions.WlxActivateUserShell( + //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); + //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); + + if (!Session->Gina.Functions.WlxActivateUserShell( Session->Gina.Context, - L"Default",//NULL, /* FIXME */ + L"Default", NULL, /* FIXME */ - lpEnvironment); + lpEnvironment)) + { + return FALSE; + } + /*if(!GinaInst->Functions->WlxActivateUserShell(GinaInst->Context, + L"WinSta0\\Default", + NULL, + NULL)) + { + LoadString(hAppInstance, IDS_FAILEDACTIVATEUSERSHELL, StatusMsg, 256 * sizeof(WCHAR)); + MessageBox(0, StatusMsg, NULL, MB_ICONERROR); + SetEvent(hShutdownEvent); + } + + WaitForSingleObject(hShutdownEvent, INFINITE); + CloseHandle(hShutdownEvent); + + RemoveStatusMessage(Session); + */ + return TRUE; +} + +#define EWX_ACTION_MASK 0xffffffeb +#define EWX_FLAGS_MASK 0x00000014 + +typedef struct tagLOGOFF_SHUTDOWN_DATA +{ + UINT Flags; + PWLSESSION Session; +} LOGOFF_SHUTDOWN_DATA, *PLOGOFF_SHUTDOWN_DATA; + +static DWORD WINAPI +LogoffShutdownThread(LPVOID Parameter) +{ + PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA)Parameter; + + if (!ImpersonateLoggedOnUser(LSData->Session->UserToken)) + { + ERR("ImpersonateLoggedOnUser failed with error %lu\n", GetLastError()); + return 0; + } + + /* Close processes of the interactive user */ + if (!ExitWindowsEx( + EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) | + (EWX_LOGOFF == (LSData->Flags & EWX_ACTION_MASK) ? EWX_INTERNAL_FLAG_LOGOFF : 0), + 0)) + { + ERR("Unable to kill user apps, error %lu\n", GetLastError()); + RevertToSelf(); + return 0; + } + + /* FIXME: Call ExitWindowsEx() to terminate COM processes */ + + RevertToSelf(); + + return 1; +} + +static NTSTATUS +HandleLogoff( + IN OUT PWLSESSION Session, + IN UINT Flags) +{ + PLOGOFF_SHUTDOWN_DATA LSData; + HANDLE hThread; + + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); + + /* Prepare data for logoff thread */ + LSData = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGOFF_SHUTDOWN_DATA)); + if (!LSData) + { + ERR("Failed to allocate mem for thread data\n"); + return STATUS_NO_MEMORY; + } + LSData->Flags = Flags; + LSData->Session = Session; + + /* Run logoff thread */ + hThread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); + if (!hThread) + { + ERR("Unable to create shutdown thread, error %lu\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, LSData); + return STATUS_UNSUCCESSFUL; + } + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); + HeapFree(GetProcessHeap(), 0, LSData); + + Session->LogonStatus = WKSTA_IS_LOGGED_OFF; + return STATUS_SUCCESS; +} + +static INT_PTR CALLBACK +ShutdownComputerWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + switch (uMsg) + { + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_BTNSHTDOWNCOMPUTER: + EndDialog(hwndDlg, IDC_BTNSHTDOWNCOMPUTER); + return TRUE; + } + break; + } + case WM_INITDIALOG: + { + RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); + SetFocus(GetDlgItem(hwndDlg, IDC_BTNSHTDOWNCOMPUTER)); + return TRUE; + } + } + return FALSE; } static VOID -HandleLogoff( +UninitializeSAS( IN OUT PWLSESSION Session) { - FIXME("FIXME: HandleLogoff() unimplemented\n"); -} - -static BOOL + if (Session->SASWindow) + { + DestroyWindow(Session->SASWindow); + Session->SASWindow = NULL; + } + UnregisterClassW(WINLOGON_SAS_CLASS, hAppInstance); +} + +BOOL HandleShutdown( IN OUT PWLSESSION Session, IN DWORD wlxAction) { - FIXME("FIXME: HandleShutdown() unimplemented\n"); + PLOGOFF_SHUTDOWN_DATA LSData; + HANDLE hThread; + + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); + + /* Prepare data for shutdown thread */ + LSData = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGOFF_SHUTDOWN_DATA)); + if (!LSData) + { + ERR("Failed to allocate mem for thread data\n"); + return STATUS_NO_MEMORY; + } + if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_POWER_OFF) + LSData->Flags = EWX_POWEROFF; + else if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT) + LSData->Flags = EWX_REBOOT; + else + LSData->Flags = EWX_SHUTDOWN; + LSData->Session = Session; + + /* Run shutdown thread */ + hThread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); + if (!hThread) + { + ERR("Unable to create shutdown thread, error %lu\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, LSData); + return STATUS_UNSUCCESSFUL; + } + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); + HeapFree(GetProcessHeap(), 0, LSData); + + /* Destroy SAS window */ + UninitializeSAS(Session); + + FIXME("FIXME: Call SMSS API #1\n"); if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT) NtShutdownSystem(ShutdownReboot); - else if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_POWER_OFF) - NtShutdownSystem(ShutdownPowerOff); else + { + if (FALSE) + { + /* FIXME - only show this dialog if it's a shutdown and the computer doesn't support APM */ + DialogBox(hAppInstance, MAKEINTRESOURCE(IDD_SHUTDOWNCOMPUTER), 0, ShutdownComputerWindowProc); + } NtShutdownSystem(ShutdownNoReboot); + } return TRUE; } @@ -144,14 +314,18 @@ break; SwitchDesktop(WLSession->WinlogonDesktop); Session->Gina.Functions.WlxLogoff(Session->Gina.Context); - HandleLogoff(Session); - Session->LogonStatus = WKSTA_IS_LOGGED_OFF; - Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + if (!NT_SUCCESS(HandleLogoff(Session, EWX_LOGOFF))) + break; } if (WLX_SHUTTINGDOWN(wlxAction)) { Session->Gina.Functions.WlxShutdown(Session->Gina.Context, wlxAction); HandleShutdown(Session, wlxAction); + } + else + { + RemoveStatusMessage(Session); + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); } break; case WLX_SAS_ACTION_TASKLIST: /* 0x07 */ @@ -247,47 +421,8 @@ return TRUE; } -#define EWX_ACTION_MASK 0xffffffeb -#define EWX_FLAGS_MASK 0x00000014 - -typedef struct tagLOGOFF_SHUTDOWN_DATA -{ - UINT Flags; - PWLSESSION Session; -} LOGOFF_SHUTDOWN_DATA, *PLOGOFF_SHUTDOWN_DATA; - -static DWORD WINAPI -LogoffShutdownThread(LPVOID Parameter) -{ - PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA) Parameter; - - if (!ImpersonateLoggedOnUser(LSData->Session->UserToken)) - { - ERR("ImpersonateLoggedOnUser failed with error %lu\n", GetLastError()); - return 0; - } - - /* Close processes of the interactive user */ - if (!ExitWindowsEx( - EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) | - (EWX_LOGOFF == (LSData->Flags & EWX_ACTION_MASK) ? EWX_INTERNAL_FLAG_LOGOFF : 0), - 0)) - { - ERR("Unable to kill user apps, error %lu\n", GetLastError()); - RevertToSelf(); - return 0; - } - - /* FIXME: Call ExitWindowsEx() to terminate COM processes */ - - RevertToSelf(); - - return 1; -} - static NTSTATUS -CheckPrivilegeForRequestedAction( - IN UINT Action, +CheckForShutdownPrivilege( IN DWORD RequestingProcessId) { HANDLE Process; @@ -295,18 +430,7 @@ BOOL CheckResult; PPRIVILEGE_SET PrivSet; - TRACE("CheckPrivilegeForRequestedAction(%u)\n", Action); - - if (Action == EWX_LOGOFF) - /* No privilege needed to log off */ - return STATUS_SUCCESS; - - /* Check for invalid arguments */ - if (Action != EWX_SHUTDOWN && Action != EWX_REBOOT && Action != EWX_POWEROFF) - { - ERR("Invalid exit action %u\n", Action); - return STATUS_INVALID_PARAMETER; - } + TRACE("CheckForShutdownPrivilege()\n"); Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, RequestingProcessId); if (!Process) @@ -352,71 +476,6 @@ WARN("SE_SHUTDOWN privilege not enabled\n"); return STATUS_ACCESS_DENIED; } -} - -static LRESULT -HandleExitWindows( - IN OUT PWLSESSION Session, - IN DWORD RequestingProcessId, - IN UINT Flags) -{ - UINT Action; - PLOGOFF_SHUTDOWN_DATA LSData; - HANDLE hThread; - NTSTATUS Status; - - /* Check parameters */ - Action = Flags & EWX_ACTION_MASK; - if (Action != EWX_LOGOFF && - Action != EWX_SHUTDOWN && - Action != EWX_REBOOT && - Action != EWX_POWEROFF) - { - ERR("Invalid ExitWindows action 0x%x\n", Action); - return STATUS_INVALID_PARAMETER; - } - - /* Check privilege */ - Status = CheckPrivilegeForRequestedAction(Action, RequestingProcessId); - if (!NT_SUCCESS(Status)) - return Status; - - /* Prepare data for logoff/shutdown thread */ - LSData = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGOFF_SHUTDOWN_DATA)); - if (!LSData) - { - ERR("Failed to allocate mem for thread data\n"); - return STATUS_NO_MEMORY; - } - LSData->Flags = Flags; - LSData->Session = Session; - - /* Run logoff/shutdown thread */ - hThread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); - if (!hThread) - { - ERR("Unable to create shutdown thread, error %lu\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, LSData); - return STATUS_UNSUCCESSFUL; - } - WaitForSingleObject(hThread, INFINITE); - CloseHandle(hThread); - HeapFree(GetProcessHeap(), 0, LSData); - - Session->LogonStatus = WKSTA_IS_LOGGED_OFF; - if (Action == EWX_LOGOFF) - { - DispatchSAS(Session, WLX_SAS_TYPE_TIMEOUT); - return 1; - } - - /* Handle shutdown */ - FIXME("FIXME: Call ExitWindowEx in SYSTEM process context\n"); - - FIXME("FIXME: Call SMSS API #1\n"); - NtShutdownSystem(ShutdownNoReboot); /* FIXME: should go in smss */ - - return 1; } static LRESULT CALLBACK @@ -468,22 +527,36 @@ } case PM_WINLOGON_EXITWINDOWS: { - return HandleExitWindows(Session, (DWORD) wParam, (UINT) lParam); + UINT Flags = (UINT)lParam; + UINT Action = Flags & EWX_ACTION_MASK; + DWORD wlxAction; + + /* Check parameters */ + switch (Action) + { + case EWX_LOGOFF: wlxAction = WLX_SAS_ACTION_LOGOFF; break; + case EWX_SHUTDOWN: wlxAction = WLX_SAS_ACTION_SHUTDOWN; break; + case EWX_REBOOT: wlxAction = WLX_SAS_ACTION_SHUTDOWN_REBOOT; break; + case EWX_POWEROFF: wlxAction = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; break; + default: + { + ERR("Invalid ExitWindows action 0x%x\n", Action); + return STATUS_INVALID_PARAMETER; + } + } + + if (WLX_SHUTTINGDOWN(wlxAction)) + { + NTSTATUS Status = CheckForShutdownPrivilege((DWORD)wParam); + if (!NT_SUCCESS(Status)) + return Status; + } + DoGenericAction(Session, wlxAction); + return 1; } } return DefWindowProc(hwndDlg, uMsg, wParam, lParam); -} - -static VOID -UninitializeSAS( - IN OUT PWLSESSION Session) -{ - if (Session->SASWindow) - { - DestroyWindow(Session->SASWindow); - Session->SASWindow = NULL; - } } BOOL @@ -506,10 +579,13 @@ swc.lpszMenuName = NULL; swc.lpszClassName = WINLOGON_SAS_CLASS; swc.hIconSm = NULL; - RegisterClassExW(&swc); /* FIXME: check return code */ + if (RegisterClassExW(&swc) == 0) + { + ERR("WL: Failed to register SAS window class\n"); + return FALSE; + } /* create invisible SAS window */ - DPRINT1("Session %p\n", Session); Session->SASWindow = CreateWindowExW( 0, WINLOGON_SAS_CLASS, @@ -520,6 +596,7 @@ if (!Session->SASWindow) { ERR("WL: Failed to create SAS window\n"); + UninitializeSAS(Session); return FALSE; } Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Wed Aug 9 10:31:02 2006 @@ -21,104 +21,70 @@ /* FUNCTIONS *****************************************************************/ -static INT_PTR CALLBACK -ShutdownComputerWindowProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - switch (uMsg) - { - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_BTNSHTDOWNCOMPUTER: - EndDialog(hwndDlg, IDC_BTNSHTDOWNCOMPUTER); - return TRUE; - } - break; - } - case WM_INITDIALOG: - { - RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); - SetFocus(GetDlgItem(hwndDlg, IDC_BTNSHTDOWNCOMPUTER)); - return TRUE; - } - } - return FALSE; -} - static BOOL StartServicesManager(VOID) { - HANDLE ServicesInitEvent; - BOOLEAN Result; - STARTUPINFOW StartupInfo; - PROCESS_INFORMATION ProcessInformation; - DWORD Count; - WCHAR ServiceString[] = L"services.exe"; - - /* Start the service control manager (services.exe) */ - - StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; - StartupInfo.lpTitle = NULL; - StartupInfo.dwFlags = 0; - StartupInfo.cbReserved2 = 0; - StartupInfo.lpReserved2 = 0; - -#if 0 - DPRINT1(L"WL: Creating new process - \"services.exe\".\n"); -#endif - - Result = CreateProcessW(NULL, - ServiceString, - NULL, - NULL, - FALSE, - DETACHED_PROCESS, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); - if (!Result) - { - DPRINT1("WL: Failed to execute services\n"); - return FALSE; - } - - /* wait for event creation (by SCM) for max. 20 seconds */ - for (Count = 0; Count < 20; Count++) - { - Sleep(1000); - - DPRINT("WL: Attempting to open event \"SvcctrlStartEvent_A3725DX\"\n"); - ServicesInitEvent = OpenEventW(EVENT_ALL_ACCESS, //SYNCHRONIZE, - FALSE, - L"SvcctrlStartEvent_A3725DX"); - if (ServicesInitEvent != NULL) - { - break; - } - } - - if (ServicesInitEvent == NULL) - { - DPRINT1("WL: Failed to open event \"SvcctrlStartEvent_A3725DX\"\n"); - return FALSE; - } - - /* wait for event signalization */ - DPRINT("WL: Waiting forever on event handle: %x\n", ServicesInitEvent); - WaitForSingleObject(ServicesInitEvent, INFINITE); - DPRINT("WL: Closing event object \"SvcctrlStartEvent_A3725DX\"\n"); - CloseHandle(ServicesInitEvent); - DPRINT("WL: StartServicesManager() Done.\n"); - - return TRUE; + HANDLE ServicesInitEvent; + STARTUPINFOW StartupInfo; + PROCESS_INFORMATION ProcessInformation; + DWORD Count; + LPCWSTR ServiceString = L"services.exe"; + BOOL res; + + /* Start the service control manager (services.exe) */ + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.lpReserved = NULL; + StartupInfo.lpDesktop = NULL; + StartupInfo.lpTitle = NULL; + StartupInfo.dwFlags = 0; + StartupInfo.cbReserved2 = 0; + StartupInfo.lpReserved2 = 0; + + TRACE("WL: Creating new process - %S\n", ServiceString); + + res = CreateProcessW( + ServiceString, + NULL, + NULL, + NULL, + FALSE, + DETACHED_PROCESS, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); + if (!res) + { + ERR("WL: Failed to execute services (error %lu)\n", GetLastError()); + return FALSE; + } + + /* Wait for event creation (by SCM) for max. 20 seconds */ + for (Count = 0; Count < 20; Count++) + { + Sleep(1000); + + TRACE("WL: Attempting to open event \"SvcctrlStartEvent_A3725DX\"\n"); + ServicesInitEvent = OpenEventW( + EVENT_ALL_ACCESS, //SYNCHRONIZE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (ServicesInitEvent) + break; + } + + if (!ServicesInitEvent) + { + ERR("WL: Failed to open event \"SvcctrlStartEvent_A3725DX\"\n"); + return FALSE; + } + + /* Wait for event signalization */ + WaitForSingleObject(ServicesInitEvent, INFINITE); + CloseHandle(ServicesInitEvent); + TRACE("WL: StartServicesManager() done.\n"); + + return TRUE; } static BOOL @@ -428,7 +394,7 @@ } #endif -static BOOL +BOOL DisplayStatusMessage( IN PWLSESSION Session, IN HDESK hDesktop, @@ -436,6 +402,9 @@ { WCHAR StatusMsg[MAX_PATH]; + if (Session->Gina.Version < WLX_VERSION_1_3) + return TRUE; + if (Session->SuppressStatus) return TRUE; @@ -445,66 +414,14 @@ return Session->Gina.Functions.WlxDisplayStatusMessage(Session->Gina.Context, hDesktop, 0, NULL, StatusMsg); } -static VOID -SessionLoop( - IN OUT PWLSESSION Session) -{ - //WCHAR StatusMsg[256]; - //HANDLE hShutdownEvent; - MSG Msg; - - Session->LogonStatus = WKSTA_IS_LOGGED_OFF; - RemoveStatusMessage(Session); - DispatchSAS(Session, WLX_SAS_TYPE_TIMEOUT); - - /* Message loop for the SAS window */ - while (GetMessage(&Msg, WLSession->SASWindow, 0, 0)) - { - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } - - /* Don't go there! */ - - /* - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_PREPARENETWORKCONNECTIONS); - Sleep(150); - - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGCOMPUTERSETTINGS); - Sleep(150); - - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS); - Sleep(150); - - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); - Sleep(150); - - RemoveStatusMessage(Session); - - if(!GinaInst->Functions->WlxActivateUserShell(GinaInst->Context, - L"WinSta0\\Default", - NULL, - NULL)) - { - LoadString(hAppInstance, IDS_FAILEDACTIVATEUSERSHELL, StatusMsg, 256 * sizeof(WCHAR)); - MessageBox(0, StatusMsg, NULL, MB_ICONERROR); - SetEvent(hShutdownEvent); - } - - WaitForSingleObject(hShutdownEvent, INFINITE); - CloseHandle(hShutdownEvent); - - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); - - Sleep(150); - - GinaInst->Functions->WlxShutdown(GinaInst->Context, WLX_SAS_ACTION_SHUTDOWN); - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); - - Sleep(250); - - RemoveStatusMessage(Session); - */ +BOOL +RemoveStatusMessage( + IN PWLSESSION Session) +{ + if (Session->Gina.Version < WLX_VERSION_1_3) + return TRUE; + + return Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); } static INT_PTR CALLBACK @@ -565,20 +482,24 @@ ULONG AuthenticationPackage; NTSTATUS Status; #endif + MSG Msg; hAppInstance = hInstance; if (!RegisterLogonProcess(GetCurrentProcessId(), TRUE)) { ERR("WL: Could not register logon process\n"); + HandleShutdown(NULL, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); NtShutdownSystem(ShutdownNoReboot); ExitProcess(0); return 0; } - WLSession = (PWLSESSION)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WLSESSION)); + WLSession = (PWLSESSION)HeapAlloc(GetProcessHeap(), 0, sizeof(WLSESSION)); + ZeroMemory(WLSession, sizeof(WLSESSION)); if (!WLSession) { + ERR("WL: Could not allocate memory for winlogon instance\n"); NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); ExitProcess(1); return 1; @@ -587,6 +508,7 @@ if (!CreateWindowStationAndDesktops(WLSession)) { + ERR("WL: Could not create window station and desktops\n"); NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); ExitProcess(1); return 1; @@ -596,9 +518,9 @@ if (!StartServicesManager()) { ERR("WL: Could not start services.exe\n"); - NtShutdownSystem(ShutdownNoReboot); - ExitProcess(0); - return 0; + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); + ExitProcess(1); + return 1; } /* Check for pending setup */ @@ -610,7 +532,7 @@ SwitchDesktop(WLSession->ApplicationDesktop); RunSetup(); - NtShutdownSystem(ShutdownReboot); + HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); ExitProcess(0); return 0; } @@ -618,6 +540,8 @@ if (!StartLsass()) { DPRINT1("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError()); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); + ExitProcess(1); return 1; } @@ -626,9 +550,9 @@ { ERR("WL: Failed to initialize Gina\n"); DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), 0, GinaLoadFailedWindowProc, (LPARAM)L""); - NtShutdownSystem(ShutdownReboot); - ExitProcess(0); - return 0; + HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); + ExitProcess(1); + return 1; } DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); @@ -673,30 +597,22 @@ return 2; } - /* Main loop */ - SessionLoop(WLSession); - - /* FIXME - Flush disks and registry, ... */ - - if(WLSession->LogonStatus == 0) - { - /* FIXME - only show this dialog if it's a shutdown and the computer doesn't support APM */ - switch(DialogBox(hInstance, MAKEINTRESOURCE(IDD_SHUTDOWNCOMPUTER), 0, ShutdownComputerWindowProc)) - { - case IDC_BTNSHTDOWNCOMPUTER: - NtShutdownSystem(ShutdownReboot); - break; - default: - NtShutdownSystem(ShutdownNoReboot); - break; - } - ExitProcess(0); - } - else - { - DPRINT1("WL: LogonStatus != LOGON_SHUTDOWN!!!\n"); - ExitProcess(0); - } - - return 0; -} + //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_PREPARENETWORKCONNECTIONS); + //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGCOMPUTERSETTINGS); + + /* Display logged out screen */ + WLSession->LogonStatus = WKSTA_IS_LOGGED_OFF; + RemoveStatusMessage(WLSession); + DispatchSAS(WLSession, WLX_SAS_TYPE_TIMEOUT); + + /* Message loop for the SAS window */ + while (GetMessage(&Msg, WLSession->SASWindow, 0, 0)) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } + + /* We never go there */ + + return 0; +} Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h (original) +++ trunk/reactos/base/system/winlogon/winlogon.h Wed Aug 9 10:31:02 2006 @@ -71,7 +71,7 @@ typedef struct _GINAFUNCTIONS { /* Functions always available for a valid GINA */ - PFWLXNEGOTIATE WlxNegotiate; + PFWLXNEGOTIATE WlxNegotiate; /* optional */ PFWLXINITIALIZE WlxInitialize; /* Functions available if WlxVersion >= WLX_VERSION_1_0 (MS Windows 3.5.0) */ @@ -87,15 +87,15 @@ PFWLXSHUTDOWN WlxShutdown; /* Functions available if WlxVersion >= WLX_VERSION_1_1 (MS Windows 3.5.1) */ - PFWLXSCREENSAVERNOTIFY WlxScreenSaverNotify; - PFWLXSTARTAPPLICATION WlxStartApplication; + PFWLXSCREENSAVERNOTIFY WlxScreenSaverNotify; /* optional, not called ATM */ + PFWLXSTARTAPPLICATION WlxStartApplication; /* optional, not called ATM */ /* Functions available if WlxVersion >= WLX_VERSION_1_2 (MS Windows NT 4.0) */ /* Functions available if WlxVersion >= WLX_VERSION_1_3 (MS Windows 2000) */ - PFWLXNETWORKPROVIDERLOAD WlxNetworkProviderLoad; + PFWLXNETWORKPROVIDERLOAD WlxNetworkProviderLoad; /* not called ATM */ PFWLXDISPLAYSTATUSMESSAGE WlxDisplayStatusMessage; - PFWLXGETSTATUSMESSAGE WlxGetStatusMessage; + PFWLXGETSTATUSMESSAGE WlxGetStatusMessage; /* doesn't need to be called */ PFWLXREMOVESTATUSMESSAGE WlxRemoveStatusMessage; /* Functions available if WlxVersion >= WLX_VERSION_1_4 (MS Windows XP) */ @@ -111,6 +111,7 @@ } GINAINSTANCE, *PGINAINSTANCE; /* FIXME: put in an enum */ +/* See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/secauthn/s… */ #define WKSTA_IS_LOGGED_OFF 0 #define WKSTA_IS_LOGGED_ON 1 #define WKSTA_IS_LOCKED 2 @@ -157,11 +158,6 @@ ((Status) == WLX_SAS_ACTION_SHUTDOWN_HIBERNATE) \ ) -#define RemoveStatusMessage(Session) \ - Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); -#define DisplaySASNotice(Session) \ - Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); - /* user32 */ BOOL WINAPI UpdatePerUserSystemParameters(DWORD dwUnknown, @@ -176,6 +172,17 @@ InitializeSAS( IN OUT PWLSESSION Session); +/* winlogon.c */ +BOOL +DisplayStatusMessage( + IN PWLSESSION Session, + IN HDESK hDesktop, + IN UINT ResourceId); + +BOOL +RemoveStatusMessage( + IN PWLSESSION Session); + /* wlx.c */ BOOL GinaInit( @@ -183,6 +190,11 @@ BOOL CreateWindowStationAndDesktops( IN OUT PWLSESSION Session); + +BOOL +HandleShutdown( + IN OUT PWLSESSION Session, + IN DWORD wlxAction); VOID WINAPI WlxUseCtrlAltDel(HANDLE hWlx); VOID WINAPI WlxSetContextPointer(HANDLE hWlx, PVOID pWlxContext);

18 years, 2 months

[amunger] 23529: Update the hardcoded ViewCVS URL. Now packmgr works on the bootcd.

by amunger＠svn.reactos.org

Author: amunger Date: Wed Aug 9 01:19:11 2006 New Revision: 23529 URL: http://svn.reactos.org/svn/reactos?rev=23529&view=rev Log: Update the hardcoded ViewCVS URL. Now packmgr works on the bootcd. Modified: trunk/rosapps/packmgr/lib/options.cpp trunk/rosapps/packmgr/lib/options.xml Modified: trunk/rosapps/packmgr/lib/options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/options.cpp?re… ============================================================================== --- trunk/rosapps/packmgr/lib/options.cpp (original) +++ trunk/rosapps/packmgr/lib/options.cpp Wed Aug 9 01:19:11 2006 @@ -83,7 +83,7 @@ { Log("* Load options.xml from the Internet (Temporary Hack)"); - CopyFileA( PML_Download(tree, "http://svn.reactos.org/viewcvs/*checkout*/trunk/rosapps/packmgr/lib/options…", NULL, "options.xml"), "options.xml", TRUE); + CopyFileA( PML_Download(tree, "http://svn.reactos.org/svn/*checkout*/reactos/trunk/rosapps/packmgr/lib/opt…", NULL, "options.xml"), "options.xml", TRUE); return ERR_OK; } Modified: trunk/rosapps/packmgr/lib/options.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/options.xml?re… ============================================================================== --- trunk/rosapps/packmgr/lib/options.xml (original) +++ trunk/rosapps/packmgr/lib/options.xml Wed Aug 9 01:19:11 2006 @@ -1,3 +1,3 @@ <options> - <source>http://svn.reactos.org/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/</source> -</options> + <source>http://svn.reactos.org/svn/*checkout*/reactos/trunk/rosapps/packmgr/tree/</source> +</options>

18 years, 2 months

[jimtabor] 23528: Fix build, for NDEBUG.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 9 00:51:59 2006 New Revision: 23528 URL: http://svn.reactos.org/svn/reactos?rev=23528&view=rev Log: Fix build, for NDEBUG. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Wed Aug 9 00:51:59 2006 @@ -1430,9 +1430,8 @@ COLORREF OldTextColor; NONCLIENTMETRICS nclm; NTSTATUS Status; + #ifndef NDEBUG INT i; - - #ifndef NDEBUG DPRINT("%s:", __FUNCTION__); for(i = 0; i < Text->Length/sizeof(WCHAR); i++) DbgPrint("%C", Text->Buffer[i]);

18 years, 2 months

← Newer
1
...
29
30
31
32
33
34
35
...
45
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 August 2006