Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 23453: Created folder remotely we store all langues rc file to folder lang
by greatlrd＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: greatlrd Date: Sat Aug 5 12:10:44 2006 New Revision: 23453 URL: http://svn.reactos.org/svn/reactos?rev=23453&view=rev Log: Created folder remotely we store all langues rc file to folder lang Added: trunk/reactos/base/applications/cacls/lang/

1 0

[jimtabor] 23452: Patch by Dan Hipschman, Call SetLastError in CreateWindowEx when WS_CHILD is set with no parent.
by jimtabor＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: jimtabor Date: Sat Aug 5 05:48:20 2006 New Revision: 23452 URL: http://svn.reactos.org/svn/reactos?rev=23452&view=rev Log: Patch by Dan Hipschman, Call SetLastError in CreateWindowEx when WS_CHILD is set with no parent. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Sat Aug 5 05:48:20 2006 @@ -1450,6 +1450,7 @@ } else if ((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD) { + SetLastWin32Error(ERROR_TLW_WITH_WSCHILD); RETURN( (HWND)0); /* WS_CHILD needs a parent, but WS_POPUP doesn't */ }

1 0

[ion] 23451: - Remove the lock on cm.h, it's an entirely new/clean file.
by ion＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: ion Date: Sat Aug 5 04:35:20 2006 New Revision: 23451 URL: http://svn.reactos.org/svn/reactos?rev=23451&view=rev Log: - Remove the lock on cm.h, it's an entirely new/clean file. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (props changed) Propchange: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 23450: - Add a couple dozen types to cm.h, all matching public NT structures for the registry manager. - Also add some flags and other defines. All flags are named/based on information from WinDBG and ASSERTs. - Add cm_x.h with already some macros we'll be using a lot. Some of these come from assertions. - Add some of the current empty files. - Delete old cm files/code. - Update cminfo.txt with current status. - Add trace macros support.
by ion＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: ion Date: Sat Aug 5 04:34:30 2006 New Revision: 23450 URL: http://svn.reactos.org/svn/reactos?rev=23450&view=rev Log: - Add a couple dozen types to cm.h, all matching public NT structures for the registry manager. - Also add some flags and other defines. All flags are named/based on information from WinDBG and ASSERTs. - Add cm_x.h with already some macros we'll be using a lot. Some of these come from assertions. - Add some of the current empty files. - Delete old cm files/code. - Update cminfo.txt with current status. - Add trace macros support. Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmindex.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmobject.c branches/alex-cm-branch/reactos/ntoskrnl/cm/ntapi.c Removed: branches/alex-cm-branch/reactos/ntoskrnl/cm/import.c branches/alex-cm-branch/reactos/ntoskrnl/cm/ntfunc.c branches/alex-cm-branch/reactos/ntoskrnl/cm/regfile.c branches/alex-cm-branch/reactos/ntoskrnl/cm/registry.c branches/alex-cm-branch/reactos/ntoskrnl/cm/regobj.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmindex.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmobject.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Removed: branches/alex-cm-branch/reactos/ntoskrnl/cm/import.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/ntapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Removed: branches/alex-cm-branch/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Removed: branches/alex-cm-branch/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Removed: branches/alex-cm-branch/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Removed: branches/alex-cm-branch/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl…

1 0

[gedmurphy] 23449: change definition to ensure calling of unicode
by gedmurphy＠svn.reactos.org 04 Aug '06

04 Aug '06

Author: gedmurphy Date: Sat Aug 5 03:40:16 2006 New Revision: 23449 URL: http://svn.reactos.org/svn/reactos?rev=23449&view=rev Log: change definition to ensure calling of unicode Modified: trunk/reactos/dll/win32/msi/msi.rbuild Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rbuild (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild Sat Aug 5 03:40:16 2006 @@ -5,8 +5,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> + <define name="__WINESRC__" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define>

1 0

[turner] 23448: update the help for exit to include /b
by turner＠svn.reactos.org 04 Aug '06

04 Aug '06

Author: turner Date: Sat Aug 5 01:24:57 2006 New Revision: 23448 URL: http://svn.reactos.org/svn/reactos?rev=23448&view=rev Log: update the help for exit to include /b Modified: trunk/reactos/base/shell/cmd/En.rc Modified: trunk/reactos/base/shell/cmd/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/En.rc?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/En.rc (original) +++ trunk/reactos/base/shell/cmd/En.rc Sat Aug 5 01:24:57 2006 @@ -239,7 +239,10 @@ STRING_ECHO_HELP5, "ECHO is %s\n" -STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT\n" +STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT [/b] [ExitCode]\n\n\ + /B Exits a batch file only. \n\ + If run outside of a batch file it will exit cmd.exe\n\ + ExitCode This value will be assigned to ERRORLEVEL on exit\n" STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n\ FOR %variable IN (set) DO command [parameters]\n\n\

1 0

[hpoussin] 23447: Implement /CMDCONS switch, which allows the user to start in text mode Autologon should only be done once (when starting the computer, not after the user has logged out) Remove the status message dialog only in GUI
by hpoussin＠svn.reactos.org 04 Aug '06

04 Aug '06

Author: hpoussin Date: Fri Aug 4 23:44:35 2006 New Revision: 23447 URL: http://svn.reactos.org/svn/reactos?rev=23447&view=rev Log: Implement /CMDCONS switch, which allows the user to start in text mode Autologon should only be done once (when starting the computer, not after the user has logged out) Remove the status message dialog only in GUI Modified: trunk/reactos/base/system/userinit/userinit.c trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/tui.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c (original) +++ trunk/reactos/base/system/userinit/userinit.c Fri Aug 4 23:44:35 2006 @@ -21,6 +21,7 @@ * PROJECT: ReactOS Userinit Logon Application * FILE: subsys/system/userinit/userinit.c * PROGRAMMERS: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + * Hervé Poussineau (hpoussin(a)reactos.org) */ #include <windows.h> #include <cfgmgr32.h> @@ -32,6 +33,80 @@ /* FUNCTIONS ****************************************************************/ +static LONG +ReadRegSzKey( + IN HKEY hKey, + IN LPCWSTR pszKey, + OUT LPWSTR* pValue) +{ + LONG rc; + DWORD dwType; + DWORD cbData = 0; + LPWSTR Value; + + rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, NULL, &cbData); + if (rc != ERROR_SUCCESS) + return rc; + if (dwType != REG_SZ) + return ERROR_FILE_NOT_FOUND; + Value = HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR)); + if (!Value) + return ERROR_NOT_ENOUGH_MEMORY; + rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)Value, &cbData); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, Value); + return rc; + } + /* NULL-terminate the string */ + Value[cbData / sizeof(WCHAR)] = '\0'; + + *pValue = Value; + return ERROR_SUCCESS; +} + +static +BOOL IsConsoleShell(void) +{ + HKEY ControlKey = NULL; + LPWSTR SystemStartOptions = NULL; + LPWSTR CurrentOption, NextOption; /* Pointers into SystemStartOptions */ + LONG rc; + BOOL ret = FALSE; + + rc = RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control", + 0, + KEY_QUERY_VALUE, + &ControlKey); + + rc = ReadRegSzKey(ControlKey, L"SystemStartOptions", &SystemStartOptions); + if (rc != ERROR_SUCCESS) + goto cleanup; + + /* Check for CMDCONS in SystemStartOptions */ + CurrentOption = SystemStartOptions; + while (CurrentOption) + { + NextOption = wcschr(CurrentOption, L' '); + if (NextOption) + *NextOption = L'\0'; + if (wcsicmp(CurrentOption, L"CMDCONS") == 0) + { + ret = TRUE; + goto cleanup; + } + CurrentOption = NextOption ? NextOption + 1 : NULL; + } + +cleanup: + if (ControlKey != NULL) + RegCloseKey(ControlKey); + HeapFree(GetProcessHeap(), 0, SystemStartOptions); + return ret; +} + static BOOL GetShell(WCHAR *CommandLine) { @@ -39,6 +114,7 @@ DWORD Type, Size; WCHAR Shell[MAX_PATH]; BOOL Ret = FALSE; + BOOL ConsoleShell = IsConsoleShell(); if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\Winlogon", @@ -46,7 +122,7 @@ { Size = MAX_PATH * sizeof(WCHAR); if(RegQueryValueEx(hKey, - L"Shell", + ConsoleShell ? L"ConsoleShell" : L"Shell", NULL, &Type, (LPBYTE)Shell, @@ -63,10 +139,20 @@ if(!Ret) { - if(GetWindowsDirectory(CommandLine, MAX_PATH - 13)) - wcscat(CommandLine, L"\\explorer.exe"); + if (ConsoleShell) + { + if(GetSystemDirectory(CommandLine, MAX_PATH - 8)) + wcscat(CommandLine, L"\\cmd.exe"); + else + wcscpy(CommandLine, L"cmd.exe"); + } else - wcscpy(CommandLine, L"explorer.exe"); + { + if(GetWindowsDirectory(CommandLine, MAX_PATH - 13)) + wcscat(CommandLine, L"\\explorer.exe"); + else + wcscpy(CommandLine, L"explorer.exe"); + } } return Ret; Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Fri Aug 4 23:44:35 2006 @@ -734,11 +734,10 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -;HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cmd.exe" +HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartGUI",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","AutoAdminLogon",0x00000000,"1" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"Administrator" Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c (original) +++ trunk/reactos/dll/win32/msgina/gui.c Fri Aug 4 23:44:35 2006 @@ -144,6 +144,19 @@ SetWindowText(pgContext->hStatusWindow, pTitle); SetDlgItemText(pgContext->hStatusWindow, IDC_STATUSLABEL, pMessage); + + return TRUE; +} + +static BOOL +GUIRemoveStatusMessage( + IN PGINA_CONTEXT pgContext) +{ + if (pgContext->hStatusWindow) + { + EndDialog(pgContext->hStatusWindow, 0); + pgContext->hStatusWindow = 0; + } return TRUE; } @@ -390,6 +403,7 @@ GINA_UI GinaGraphicalUI = { GUIInitialize, GUIDisplayStatusMessage, + GUIRemoveStatusMessage, GUIDisplaySASNotice, GUILoggedOnSAS, GUILoggedOutSAS, Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c (original) +++ trunk/reactos/dll/win32/msgina/msgina.c Fri Aug 4 23:44:35 2006 @@ -26,13 +26,14 @@ #include "msgina.h" +//#define YDEBUG #include <wine/debug.h> extern HINSTANCE hDllInstance; extern GINA_UI GinaGraphicalUI; extern GINA_UI GinaTextUI; -static PGINA_UI pGinaUI = &GinaGraphicalUI; /* Default value */ +static PGINA_UI pGinaUI; /* * @implemented @@ -52,41 +53,83 @@ return TRUE; } +static LONG +ReadRegSzKey( + IN HKEY hKey, + IN LPCWSTR pszKey, + OUT LPWSTR* pValue) +{ + LONG rc; + DWORD dwType; + DWORD cbData = 0; + LPWSTR Value; + + rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, NULL, &cbData); + if (rc != ERROR_SUCCESS) + return rc; + if (dwType != REG_SZ) + return ERROR_FILE_NOT_FOUND; + Value = HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR)); + if (!Value) + return ERROR_NOT_ENOUGH_MEMORY; + rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)Value, &cbData); + if (rc != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, Value); + return rc; + } + /* NULL-terminate the string */ + Value[cbData / sizeof(WCHAR)] = '\0'; + + *pValue = Value; + return ERROR_SUCCESS; +} + static VOID ChooseGinaUI(VOID) { - HKEY WinLogonKey = NULL; - DWORD Type, Size, Value; + HKEY ControlKey = NULL; + LPWSTR SystemStartOptions = NULL; + LPWSTR CurrentOption, NextOption; /* Pointers into SystemStartOptions */ + BOOL ConsoleBoot = FALSE; LONG rc; rc = RegOpenKeyEx( HKEY_LOCAL_MACHINE, - L"SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\WinLogon", + L"SYSTEM\\CurrentControlSet\\Control", 0, KEY_QUERY_VALUE, - &WinLogonKey); + &ControlKey); + + rc = ReadRegSzKey(ControlKey, L"SystemStartOptions", &SystemStartOptions); if (rc != ERROR_SUCCESS) goto cleanup; - Size = sizeof(DWORD); - rc = RegQueryValueEx( - WinLogonKey, - L"StartGUI", - NULL, - &Type, - (LPBYTE)&Value, - &Size); - if (rc != ERROR_SUCCESS || Type != REG_DWORD || Size != sizeof(DWORD)) - goto cleanup; - - if (Value != 0) + /* Check for CMDCONS in SystemStartOptions */ + CurrentOption = SystemStartOptions; + while (CurrentOption) + { + NextOption = wcschr(CurrentOption, L' '); + if (NextOption) + *NextOption = L'\0'; + if (wcsicmp(CurrentOption, L"CMDCONS") == 0) + { + TRACE("Found %S. Switching to console boot\n", CurrentOption); + ConsoleBoot = TRUE; + goto cleanup; + } + CurrentOption = NextOption ? NextOption + 1 : NULL; + } + +cleanup: + if (ConsoleBoot) + pGinaUI = &GinaTextUI; + else pGinaUI = &GinaGraphicalUI; - else - pGinaUI = &GinaTextUI; - -cleanup: - if (WinLogonKey != NULL) - RegCloseKey(WinLogonKey); + + if (ControlKey != NULL) + RegCloseKey(ControlKey); + HeapFree(GetProcessHeap(), 0, SystemStartOptions); } /* @@ -129,7 +172,7 @@ /* Locates the authentification package */ //LsaRegisterLogonProcess(...); - pgContext->DoAutoLogonOnce = FALSE; + pgContext->AutoLogonState = AUTOLOGON_CHECK_REGISTRY; ChooseGinaUI(); return pGinaUI->Initialize(pgContext); @@ -290,45 +333,10 @@ IN PVOID pWlxContext) { PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; - if (pgContext->hStatusWindow) - { - EndDialog(pgContext->hStatusWindow, 0); - pgContext->hStatusWindow = 0; - } - - return TRUE; -} - -static LONG -ReadRegSzKey( - IN HKEY hKey, - IN LPCWSTR pszKey, - OUT LPWSTR* pValue) -{ - LONG rc; - DWORD dwType; - DWORD cbData = 0; - LPWSTR Value; - - rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, NULL, &cbData); - if (rc != ERROR_SUCCESS) - return rc; - if (dwType != REG_SZ) - return ERROR_FILE_NOT_FOUND; - Value = HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR)); - if (!Value) - return ERROR_NOT_ENOUGH_MEMORY; - rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)Value, &cbData); - if (rc != ERROR_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, Value); - return rc; - } - /* NULL-terminate the string */ - Value[cbData / sizeof(WCHAR)] = '\0'; - - *pValue = Value; - return ERROR_SUCCESS; + + TRACE("WlxRemoveStatusMessage()\n"); + + return pGinaUI->RemoveStatusMessage(pgContext); } static PWSTR @@ -394,8 +402,7 @@ static BOOL DoAutoLogon( - IN PGINA_CONTEXT pgContext, - IN BOOL CheckOnly) + IN PGINA_CONTEXT pgContext) { HKEY WinLogonKey = NULL; LPWSTR AutoLogon = NULL; @@ -407,6 +414,12 @@ BOOL result = FALSE; LONG rc; + TRACE("DoAutoLogon(): AutoLogonState = %lu\n", + pgContext->AutoLogonState); + + if (pgContext->AutoLogonState == AUTOLOGON_DISABLED) + return FALSE; + rc = RegOpenKeyEx( HKEY_LOCAL_MACHINE, L"SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\WinLogon", @@ -416,47 +429,54 @@ if (rc != ERROR_SUCCESS) goto cleanup; - rc = ReadRegSzKey(WinLogonKey, L"AutoAdminLogon", &AutoLogon); - if (rc != ERROR_SUCCESS) - goto cleanup; - if (wcscmp(AutoLogon, L"1") != 0) - goto cleanup; - - rc = ReadRegSzKey(WinLogonKey, L"AutoLogonCount", &AutoCount); - if (rc == ERROR_SUCCESS && wcscmp(AutoCount, L"0") == 0) - goto cleanup; - else if (rc != ERROR_FILE_NOT_FOUND) - goto cleanup; - - rc = ReadRegSzKey(WinLogonKey, L"IgnoreShiftOverride", &UserName); - if (rc == ERROR_SUCCESS) - { - if (wcscmp(AutoLogon, L"1") != 0 && GetKeyState(VK_SHIFT) < 0) - goto cleanup; - } - else if (GetKeyState(VK_SHIFT) < 0) - { - /* User pressed SHIFT */ - goto cleanup; - } - - if (CheckOnly) - { + if (pgContext->AutoLogonState == AUTOLOGON_CHECK_REGISTRY) + { + /* Set it by default to disabled, we might reenable it again later */ + pgContext->AutoLogonState = AUTOLOGON_DISABLED; + + rc = ReadRegSzKey(WinLogonKey, L"AutoAdminLogon", &AutoLogon); + if (rc != ERROR_SUCCESS) + goto cleanup; + if (wcscmp(AutoLogon, L"1") != 0) + goto cleanup; + + rc = ReadRegSzKey(WinLogonKey, L"AutoLogonCount", &AutoCount); + if (rc == ERROR_SUCCESS && wcscmp(AutoCount, L"0") == 0) + goto cleanup; + else if (rc != ERROR_FILE_NOT_FOUND) + goto cleanup; + + rc = ReadRegSzKey(WinLogonKey, L"IgnoreShiftOverride", &UserName); + if (rc == ERROR_SUCCESS) + { + if (wcscmp(AutoLogon, L"1") != 0 && GetKeyState(VK_SHIFT) < 0) + goto cleanup; + } + else if (GetKeyState(VK_SHIFT) < 0) + { + /* User pressed SHIFT */ + goto cleanup; + } + + pgContext->AutoLogonState = AUTOLOGON_ONCE; result = TRUE; - goto cleanup; - } - - rc = ReadRegSzKey(WinLogonKey, L"DefaultUserName", &UserName); - if (rc != ERROR_SUCCESS) - goto cleanup; - rc = ReadRegSzKey(WinLogonKey, L"DefaultDomainName", &DomainName); - if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND) - goto cleanup; - rc = ReadRegSzKey(WinLogonKey, L"DefaultPassword", &Password); - if (rc != ERROR_SUCCESS) - goto cleanup; - - result = DoLoginTasks(pgContext, UserName, DomainName, Password); + } + else /* pgContext->AutoLogonState == AUTOLOGON_ONCE */ + { + pgContext->AutoLogonState = AUTOLOGON_DISABLED; + + rc = ReadRegSzKey(WinLogonKey, L"DefaultUserName", &UserName); + if (rc != ERROR_SUCCESS) + goto cleanup; + rc = ReadRegSzKey(WinLogonKey, L"DefaultDomainName", &DomainName); + if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND) + goto cleanup; + rc = ReadRegSzKey(WinLogonKey, L"DefaultPassword", &Password); + if (rc != ERROR_SUCCESS) + goto cleanup; + + result = DoLoginTasks(pgContext, UserName, DomainName, Password); + } cleanup: if (WinLogonKey != NULL) @@ -467,6 +487,8 @@ HeapFree(GetProcessHeap(), 0, UserName); HeapFree(GetProcessHeap(), 0, DomainName); HeapFree(GetProcessHeap(), 0, Password); + TRACE("DoAutoLogon(): AutoLogonState = %lu, returning %d\n", + pgContext->AutoLogonState, result); return result; } @@ -488,13 +510,15 @@ return; } - if (DoAutoLogon(NULL, TRUE)) + if (DoAutoLogon(pgContext)) { /* Don't display the window, we want to do an automatic logon */ - pgContext->DoAutoLogonOnce = TRUE; + pgContext->AutoLogonState = AUTOLOGON_ONCE; pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); return; } + else + pgContext->AutoLogonState = AUTOLOGON_DISABLED; pGinaUI->DisplaySASNotice(pgContext); @@ -526,12 +550,10 @@ pgContext->pProfile = pProfile; if (!GetSystemMetrics(SM_REMOTESESSION) && - pgContext->DoAutoLogonOnce && - DoAutoLogon(pgContext, FALSE)) + DoAutoLogon(pgContext)) { /* User is local and registry contains information * to log on him automatically */ - pgContext->DoAutoLogonOnce = FALSE; return WLX_SAS_ACTION_LOGON; } Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h (original) +++ trunk/reactos/dll/win32/msgina/msgina.h Fri Aug 4 23:44:35 2006 @@ -5,7 +5,13 @@ #include <winwlx.h> #include "resource.h" -typedef struct { +/* Values for GINA_CONTEXT.AutoLogonState */ +#define AUTOLOGON_CHECK_REGISTRY 1 +#define AUTOLOGON_ONCE 2 +#define AUTOLOGON_DISABLED 3 + +typedef struct +{ HANDLE hWlx; LPWSTR station; PWLX_DISPATCH_VERSION_1_3 pWlxFuncs; @@ -13,7 +19,7 @@ HANDLE UserToken; HWND hStatusWindow; BOOL SignaledStatusWindowCreated; - BOOL DoAutoLogonOnce; + DWORD AutoLogonState; /* Informations to be filled during logon */ PLUID pAuthenticationId; @@ -30,6 +36,7 @@ typedef BOOL (*PFGINA_INITIALIZE)(PGINA_CONTEXT); typedef BOOL (*PFGINA_DISPLAYSTATUSMESSAGE)(PGINA_CONTEXT, HDESK, DWORD, PWSTR, PWSTR); +typedef BOOL (*PFGINA_REMOVESTATUSMESSAGE)(PGINA_CONTEXT); typedef VOID (*PFGINA_DISPLAYSASNOTICE)(PGINA_CONTEXT); typedef INT (*PFGINA_LOGGEDONSAS)(PGINA_CONTEXT, DWORD); typedef INT (*PFGINA_LOGGEDOUTSAS)(PGINA_CONTEXT); @@ -37,6 +44,7 @@ { PFGINA_INITIALIZE Initialize; PFGINA_DISPLAYSTATUSMESSAGE DisplayStatusMessage; + PFGINA_REMOVESTATUSMESSAGE RemoveStatusMessage; PFGINA_DISPLAYSASNOTICE DisplaySASNotice; PFGINA_LOGGEDONSAS LoggedOnSAS; PFGINA_LOGGEDOUTSAS LoggedOutSAS; Modified: trunk/reactos/dll/win32/msgina/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/tui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/tui.c (original) +++ trunk/reactos/dll/win32/msgina/tui.c Fri Aug 4 23:44:35 2006 @@ -45,6 +45,14 @@ wcslen(newLine), &result, NULL); +} + +static BOOL +TUIRemoveStatusMessage( + IN PGINA_CONTEXT pgContext) +{ + /* Nothing to do */ + return TRUE; } static VOID @@ -145,6 +153,7 @@ GINA_UI GinaTextUI = { TUIInitialize, TUIDisplayStatusMessage, + TUIRemoveStatusMessage, TUIDisplaySASNotice, TUILoggedOnSAS, TUILoggedOutSAS,

1 0

[fireball] 23446: Add an entry to enable unattended 1st stage setup (commented out by default). In order to get unattended setup working: 1. Copy unattend.inf.sample to unattend.inf, adjust as needed 2. Uncomment the line in bootdata.rbuild to include it into bootcd
by fireball＠svn.reactos.org 04 Aug '06

04 Aug '06

Author: fireball Date: Fri Aug 4 23:28:54 2006 New Revision: 23446 URL: http://svn.reactos.org/svn/reactos?rev=23446&view=rev Log: Add an entry to enable unattended 1st stage setup (commented out by default). In order to get unattended setup working: 1. Copy unattend.inf.sample to unattend.inf, adjust as needed 2. Uncomment the line in bootdata.rbuild to include it into bootcd Modified: trunk/reactos/boot/bootdata/bootdata.rbuild Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild Fri Aug 4 23:28:54 2006 @@ -7,6 +7,7 @@ <cdfile base="reactos">hivesft.inf</cdfile> <cdfile base="reactos">hivesys.inf</cdfile> <cdfile base="reactos">txtsetup.sif</cdfile> + <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory>

1 0

[hpoussin] 23445: Try to implement a working shutdown. Sorry, I had to disable some code to close user processes in subsystems/win32/csrss/win32csr/exitros.c
by hpoussin＠svn.reactos.org 04 Aug '06

04 Aug '06

Author: hpoussin Date: Fri Aug 4 19:39:44 2006 New Revision: 23445 URL: http://svn.reactos.org/svn/reactos?rev=23445&view=rev Log: Try to implement a working shutdown. Sorry, I had to disable some code to close user processes in subsystems/win32/csrss/win32csr/exitros.c Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Fri Aug 4 19:39:44 2006 @@ -272,6 +272,20 @@ return 0; } RevertToSelf(); + + /* This is not right (see top of reactos/dll/win32/user32/misc/exit.c), + * but this should be enough atm */ + switch (LSData->Flags & EWX_ACTION_MASK) + { + case EWX_SHUTDOWN: + NtShutdownSystem(ShutdownNoReboot); + break; + case EWX_REBOOT: + NtShutdownSystem(ShutdownReboot); + break; + default: + UNIMPLEMENTED; + } HeapFree(GetProcessHeap(), 0, LSData); Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c Fri Aug 4 19:39:44 2006 @@ -418,7 +418,7 @@ int WINAPI LogoffWindowsDialog(DWORD uFlags) { ERR("LogoffWindowsDialog is UNIMPLEMENTED\n"); - ExitProcess(0); + ExitWindowsEx(EWX_LOGOFF, 0); return 0; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c Fri Aug 4 19:39:44 2006 @@ -783,6 +783,9 @@ return STATUS_ACCESS_DENIED; } + DPRINT1("FIXME: Need to close all user processes!\n"); + return STATUS_SUCCESS; + CallerThread = OpenThread(THREAD_QUERY_INFORMATION, FALSE, ThreadId); if (NULL == CallerThread) {

1 0

[hpoussin] 23444: We should be able to set ThreadImpersonationToken information with NtSetInformationThread
by hpoussin＠svn.reactos.org 04 Aug '06

04 Aug '06

Author: hpoussin Date: Fri Aug 4 17:52:16 2006 New Revision: 23444 URL: http://svn.reactos.org/svn/reactos?rev=23444&view=rev Log: We should be able to set ThreadImpersonationToken information with NtSetInformationThread Modified: trunk/reactos/ntoskrnl/include/internal/ps_i.h Modified: trunk/reactos/ntoskrnl/include/internal/ps_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_i.h Fri Aug 4 17:52:16 2006 @@ -393,7 +393,7 @@ ( HANDLE, ULONG, - ICIF_QUERY + ICIF_QUERY | ICIF_SET ), /* ThreadDescriptorTableEntry */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs