Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[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

[hpoussin] 23443: - Remove now useless entries about PCI bus, as StartService is now working in 2nd stage setup - Add Netlogon service (lsass.exe)
by hpoussin＠svn.reactos.org 04 Aug '06

04 Aug '06

Author: hpoussin Date: Fri Aug 4 16:01:27 2006 New Revision: 23443 URL: http://svn.reactos.org/svn/reactos?rev=23443&view=rev Log: - Remove now useless entries about PCI bus, as StartService is now working in 2nd stage setup - Add Netlogon service (lsass.exe) Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Fri Aug 4 16:01:27 2006 @@ -645,23 +645,16 @@ 01,00,00,00,01,00,01,00,01,00,00,00, \ 00,06,00,00,00,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -; We need the PCI bus to be installed at 3rd boot to enumerate display cards and to -; not have the "CsrServerInitialization: failed to initialize video (Status=c0000001)" -; error when a custom driver (as the VMware one) is installed. At the moment, -; StartServiceW is not implemented, so PlugPlay service can't start during -; second stage setup. => We have to code PCI bus parameters it in registry... -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0A03\0000","Service",0x00000000,"pci" -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","ErrorControl",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Group",0x00000000,"Boot Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","ImagePath",0x00020000,"system32\drivers\pci.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\PCI","Tag",0x00010001,0x00000002 - ; ACPI bus HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","HardwareID",0x00010000,"*PNP0C08" HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","DeviceDesc",0x00000000,"ACPI bus" HKLM,"SYSTEM\CurrentControlSet\Enum\Root\*PNP0C08\0000","Service",0x00000000,"acpi" + +; NetLogon +HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020 ; Named Pipe filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000

1 0

[hpoussin] 23442: - Specify *W at the end of function calls, and remove the need to define UNICODE - Rename MsGina to Gina - Start services.exe before running 2nd stage setup
by hpoussin＠svn.reactos.org 04 Aug '06

04 Aug '06

Author: hpoussin Date: Fri Aug 4 15:37:18 2006 New Revision: 23442 URL: http://svn.reactos.org/svn/reactos?rev=23442&view=rev Log: - Specify *W at the end of function calls, and remove the need to define UNICODE - Rename MsGina to Gina - Start services.exe before running 2nd stage setup Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/setup.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/winlogon.rbuild 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 Fri Aug 4 15:37:18 2006 @@ -28,8 +28,8 @@ StartTaskManager( IN OUT PWLSESSION Session) { - return Session->MsGina.Functions.WlxStartApplication( - Session->MsGina.Context, + return Session->Gina.Functions.WlxStartApplication( + Session->Gina.Context, L"Default", NULL, L"taskmgr.exe"); @@ -81,8 +81,8 @@ /* FIXME: reverting to lower privileges after creating user shell? */ RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); - return Session->MsGina.Functions.WlxActivateUserShell( - Session->MsGina.Context, + return Session->Gina.Functions.WlxActivateUserShell( + Session->Gina.Context, L"Default",//NULL, /* FIXME */ NULL, /* FIXME */ lpEnvironment); @@ -127,11 +127,11 @@ case WLX_SAS_ACTION_NONE: /* 0x02 */ break; case WLX_SAS_ACTION_LOCK_WKSTA: /* 0x03 */ - if (Session->MsGina.Functions.WlxIsLockOk(Session->MsGina.Context)) + if (Session->Gina.Functions.WlxIsLockOk(Session->Gina.Context)) { SwitchDesktop(WLSession->WinlogonDesktop); Session->LogonStatus = WKSTA_IS_LOCKED; - Session->MsGina.Functions.WlxDisplayLockedNotice(Session->MsGina.Context); + Session->Gina.Functions.WlxDisplayLockedNotice(Session->Gina.Context); } break; case WLX_SAS_ACTION_LOGOFF: /* 0x04 */ @@ -140,13 +140,13 @@ case WLX_SAS_ACTION_SHUTDOWN_REBOOT: /* 0x0b */ if (Session->LogonStatus != WKSTA_IS_LOGGED_OFF) { - if (!Session->MsGina.Functions.WlxIsLogoffOk(Session->MsGina.Context)) + if (!Session->Gina.Functions.WlxIsLogoffOk(Session->Gina.Context)) break; SwitchDesktop(WLSession->WinlogonDesktop); - Session->MsGina.Functions.WlxLogoff(Session->MsGina.Context); + Session->Gina.Functions.WlxLogoff(Session->Gina.Context); HandleLogoff(Session); Session->LogonStatus = WKSTA_IS_LOGGED_OFF; - Session->MsGina.Functions.WlxDisplaySASNotice(Session->MsGina.Context); + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); } if (WLX_SHUTTINGDOWN(wlxAction)) HandleShutdown(Session, wlxAction); @@ -172,9 +172,9 @@ DWORD wlxAction = WLX_SAS_ACTION_NONE; if (Session->LogonStatus == WKSTA_IS_LOGGED_ON) - wlxAction = Session->MsGina.Functions.WlxLoggedOnSAS(Session->MsGina.Context, dwSasType, NULL); + wlxAction = Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); else if (Session->LogonStatus == WKSTA_IS_LOCKED) - wlxAction = Session->MsGina.Functions.WlxWkstaLockedSAS(Session->MsGina.Context, dwSasType); + wlxAction = Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); else { /* Display a new dialog (if necessary) */ @@ -182,7 +182,7 @@ { case WLX_SAS_TYPE_TIMEOUT: /* 0x00 */ { - Session->MsGina.Functions.WlxDisplaySASNotice(Session->MsGina.Context); + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); break; } case WLX_SAS_TYPE_CTRL_ALT_DEL: /* 0x01 */ @@ -192,8 +192,8 @@ ZeroMemory(&Session->Profile, sizeof(Session->Profile)); Session->Options = 0; - wlxAction = Session->MsGina.Functions.WlxLoggedOutSAS( - Session->MsGina.Context, + wlxAction = Session->Gina.Functions.WlxLoggedOutSAS( + Session->Gina.Context, Session->SASAction, &Session->LogonId, LogonSid, @@ -384,6 +384,8 @@ case MAKELONG(MOD_CONTROL | MOD_ALT, VK_DELETE): { TRACE("SAS: CONTROL+ALT+DELETE\n"); + if (!Session->Gina.UseCtrlAltDelete) + break; DispatchSAS(Session, WLX_SAS_TYPE_CTRL_ALT_DEL); return TRUE; } @@ -435,7 +437,7 @@ InitializeSAS( IN OUT PWLSESSION Session) { - WNDCLASSEX swc; + WNDCLASSEXW swc; /* register SAS window class. * WARNING! MAKE SURE WE ARE IN THE WINLOGON DESKTOP! */ @@ -451,11 +453,11 @@ swc.lpszMenuName = NULL; swc.lpszClassName = WINLOGON_SAS_CLASS; swc.hIconSm = NULL; - RegisterClassEx(&swc); /* FIXME: check return code */ + RegisterClassExW(&swc); /* FIXME: check return code */ /* create invisible SAS window */ DPRINT1("Session %p\n", Session); - Session->SASWindow = CreateWindowEx( + Session->SASWindow = CreateWindowExW( 0, WINLOGON_SAS_CLASS, WINLOGON_SAS_TITLE, Modified: trunk/reactos/base/system/winlogon/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.c (original) +++ trunk/reactos/base/system/winlogon/setup.c Fri Aug 4 15:37:18 2006 @@ -43,7 +43,7 @@ DWORD dwSize; DWORD dwSetupType; - dwError = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\Setup", //TEXT("SYSTEM\\Setup"), 0, KEY_QUERY_VALUE, @@ -54,7 +54,7 @@ } dwSize = sizeof(DWORD); - dwError = RegQueryValueEx (hKey, + dwError = RegQueryValueExW (hKey, L"SetupType", //TEXT("SetupType"), NULL, &dwType, @@ -76,7 +76,7 @@ DWORD dwError; HKEY hKey; - dwError = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\Setup", //TEXT("SYSTEM\\Setup"), 0, KEY_SET_VALUE, @@ -86,7 +86,7 @@ return FALSE; } - dwError = RegSetValueEx (hKey, + dwError = RegSetValueExW (hKey, L"SetupType", //TEXT("SetupType"), 0, REG_DWORD, @@ -106,7 +106,7 @@ RunSetup (VOID) { PROCESS_INFORMATION ProcessInformation; - STARTUPINFO StartupInfo; + STARTUPINFOW StartupInfo; WCHAR Shell[MAX_PATH]; WCHAR CommandLine[MAX_PATH]; BOOLEAN Result; 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 Fri Aug 4 15:37:18 2006 @@ -36,7 +36,7 @@ { case IDC_BTNSHTDOWNCOMPUTER: EndDialog(hwndDlg, IDC_BTNSHTDOWNCOMPUTER); - break; + return TRUE; } break; } @@ -44,10 +44,10 @@ { RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); SetFocus(GetDlgItem(hwndDlg, IDC_BTNSHTDOWNCOMPUTER)); - break; + return TRUE; } } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static BOOL @@ -55,7 +55,7 @@ { HANDLE ServicesInitEvent; BOOLEAN Result; - STARTUPINFO StartupInfo; + STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInformation; DWORD Count; WCHAR ServiceString[] = L"services.exe"; @@ -74,7 +74,7 @@ DPRINT1(L"WL: Creating new process - \"services.exe\".\n"); #endif - Result = CreateProcess(NULL, + Result = CreateProcessW(NULL, ServiceString, NULL, NULL, @@ -96,7 +96,7 @@ Sleep(1000); DPRINT("WL: Attempting to open event \"SvcctrlStartEvent_A3725DX\"\n"); - ServicesInitEvent = OpenEvent(EVENT_ALL_ACCESS, //SYNCHRONIZE, + ServicesInitEvent = OpenEventW(EVENT_ALL_ACCESS, //SYNCHRONIZE, FALSE, L"SvcctrlStartEvent_A3725DX"); if (ServicesInitEvent != NULL) @@ -133,7 +133,7 @@ if (!hSCManager) goto cleanup; - hService = OpenService(hSCManager, ServiceName, SERVICE_START); + hService = OpenServiceW(hSCManager, ServiceName, SERVICE_START); if (!hService) goto cleanup; #if 0 @@ -156,7 +156,7 @@ { HANDLE LsassInitEvent; - LsassInitEvent = CreateEvent( + LsassInitEvent = CreateEventW( NULL, TRUE, FALSE, @@ -393,7 +393,7 @@ DestroyEnvironmentBlock (lpEnvironment); return FALSE; } - /*WLSession->MsGina.Functions.WlxActivateUserShell(WLSession->MsGina.Context, + /*WLSession->Gina.Functions.WlxActivateUserShell(WLSession->Gina.Context, L"WinSta0\\Default", NULL, NULL);*/ @@ -439,10 +439,10 @@ if (Session->SuppressStatus) return TRUE; - if (LoadString(hAppInstance, ResourceId, StatusMsg, MAX_PATH) == 0) + if (LoadStringW(hAppInstance, ResourceId, StatusMsg, MAX_PATH) == 0) return FALSE; - return Session->MsGina.Functions.WlxDisplayStatusMessage(Session->MsGina.Context, hDesktop, 0, NULL, StatusMsg); + return Session->Gina.Functions.WlxDisplayStatusMessage(Session->Gina.Context, hDesktop, 0, NULL, StatusMsg); } static VOID @@ -481,7 +481,7 @@ RemoveStatusMessage(Session); - if(!MsGinaInst->Functions->WlxActivateUserShell(MsGinaInst->Context, + if(!GinaInst->Functions->WlxActivateUserShell(GinaInst->Context, L"WinSta0\\Default", NULL, NULL)) @@ -498,13 +498,56 @@ Sleep(150); - MsGinaInst->Functions->WlxShutdown(MsGinaInst->Context, WLX_SAS_ACTION_SHUTDOWN); + GinaInst->Functions->WlxShutdown(GinaInst->Context, WLX_SAS_ACTION_SHUTDOWN); DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); Sleep(250); RemoveStatusMessage(Session); */ +} + +static INT_PTR CALLBACK +GinaLoadFailedWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + switch (uMsg) + { + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg, IDOK); + return TRUE; + } + break; + } + case WM_INITDIALOG: + { + int len; + WCHAR templateText[MAX_PATH], text[MAX_PATH]; + + len = GetDlgItemTextW(hwndDlg, IDC_GINALOADFAILED, templateText, MAX_PATH); + if (len) + { + wsprintfW(text, templateText, (LPWSTR)lParam); + SetDlgItemTextW(hwndDlg, IDC_GINALOADFAILED, text); + } + SetFocus(GetDlgItem(hwndDlg, IDOK)); + return TRUE; + } + case WM_CLOSE: + { + EndDialog(hwndDlg, IDCANCEL); + return TRUE; + } + } + + return FALSE; } int WINAPI @@ -550,31 +593,6 @@ } LockWorkstation(WLSession); - /* Check for pending setup */ - if (GetSetupType() != 0) - { - DPRINT("Winlogon: CheckForSetup() in setup mode\n"); - - /* Run setup and reboot when done */ - SwitchDesktop(WLSession->ApplicationDesktop); - RunSetup(); - - NtShutdownSystem(ShutdownReboot); - ExitProcess(0); - return 0; - } - - /* Load and initialize gina */ - if (!GinaInit(WLSession)) - { - ERR("WL: Failed to initialize Gina\n"); - NtShutdownSystem(ShutdownNoReboot); - ExitProcess(0); - return 0; - } - - DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); - if (!StartServicesManager()) { ERR("WL: Could not start services.exe\n"); @@ -582,6 +600,32 @@ ExitProcess(0); return 0; } + + /* Check for pending setup */ + if (GetSetupType() != 0) + { + TRACE("WL: Setup mode detected\n"); + + /* Run setup and reboot when done */ + SwitchDesktop(WLSession->ApplicationDesktop); + RunSetup(); + + NtShutdownSystem(ShutdownReboot); + ExitProcess(0); + return 0; + } + + /* Load and initialize gina */ + if (!GinaInit(WLSession)) + { + ERR("WL: Failed to initialize Gina\n"); + DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), 0, GinaLoadFailedWindowProc, (LPARAM)L""); + NtShutdownSystem(ShutdownReboot); + ExitProcess(0); + return 0; + } + + DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); if (!StartLsass()) { @@ -597,7 +641,12 @@ if (Status == STATUS_PORT_CONNECTION_REFUSED) { /* Add the 'SeTcbPrivilege' privilege and try again */ - RtlAdjustPrivilege(SE_TCB_PRIVILEGE, TRUE, TRUE, &Old); + Status = RtlAdjustPrivilege(SE_TCB_PRIVILEGE, TRUE, TRUE, &Old); + if (!NT_SUCCESS(Status)) + { + ERR("RtlAdjustPrivilege() failed with error %lu\n", LsaNtStatusToWinError(Status)); + return 1; + } Status = LsaRegisterLogonProcess(&ProcessName, &LsaHandle, &Mode); } if (!NT_SUCCESS(Status)) 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 Fri Aug 4 15:37:18 2006 @@ -68,7 +68,7 @@ typedef BOOL (WINAPI * PFWLXGETSTATUSMESSAGE) (PVOID, DWORD *, PWSTR, DWORD); typedef BOOL (WINAPI * PFWLXREMOVESTATUSMESSAGE) (PVOID); -typedef struct _MSGINAFUNCTIONS +typedef struct _GINAFUNCTIONS { /* Functions always available for a valid GINA */ PFWLXNEGOTIATE WlxNegotiate; @@ -99,15 +99,16 @@ PFWLXREMOVESTATUSMESSAGE WlxRemoveStatusMessage; /* Functions available if WlxVersion >= WLX_VERSION_1_4 (MS Windows XP) */ -} MSGINAFUNCTIONS, *PMSGINAFUNCTIONS; - -typedef struct _MSGINAINSTANCE +} GINAFUNCTIONS, *PGINAFUNCTIONS; + +typedef struct _GINAINSTANCE { HMODULE hDllInstance; - MSGINAFUNCTIONS Functions; + GINAFUNCTIONS Functions; PVOID Context; DWORD Version; -} MSGINAINSTANCE, *PMSGINAINSTANCE; + BOOL UseCtrlAltDelete; +} GINAINSTANCE, *PGINAINSTANCE; /* FIXME: put in an enum */ #define WKSTA_IS_LOGGED_OFF 0 @@ -119,7 +120,7 @@ typedef struct _WLSESSION { - MSGINAINSTANCE MsGina; + GINAINSTANCE Gina; DWORD SASAction; DWORD LogonStatus; BOOL SuppressStatus; @@ -157,9 +158,9 @@ ) #define RemoveStatusMessage(Session) \ - Session->MsGina.Functions.WlxRemoveStatusMessage(Session->MsGina.Context); + Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); #define DisplaySASNotice(Session) \ - Session->MsGina.Functions.WlxDisplaySASNotice(Session->MsGina.Context); + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); /* user32 */ BOOL WINAPI Modified: trunk/reactos/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rbuild (original) +++ trunk/reactos/base/system/winlogon/winlogon.rbuild Fri Aug 4 15:37:18 2006 @@ -2,8 +2,6 @@ <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <module name="winlogon" type="win32gui" installbase="system32" installname="winlogon.exe"> <include base="winlogon">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> 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 Fri Aug 4 15:37:18 2006 @@ -27,35 +27,25 @@ { if (uMsg == WM_TIMER && (UINT_PTR)wParam == IdTimer) { - CHECKPOINT1; EndDialog(hwndDlg, -1); KillTimer(hwndDlg, IdTimer); - CHECKPOINT1; return TRUE; } else if (uMsg == WM_INITDIALOG) { - CHECKPOINT1; - PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); IdTimer = SetTimer(hwndDlg, 0, WLSession->DialogTimeout * 1000, NULL); - CHECKPOINT1; - if (IdTimer == 0) - return FALSE; - return TRUE; + return PreviousWindowProc(hwndDlg, uMsg, wParam, lParam);; } else if (uMsg == WM_NCDESTROY) { - CHECKPOINT1; - PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); - CHECKPOINT1; + BOOL ret; + ret = PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); PreviousWindowProc = NULL; - return TRUE; + return ret; } else { - INT_PTR ret = PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); - ret = PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); - return ret; + return PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); } } @@ -66,7 +56,8 @@ WlxUseCtrlAltDel( HANDLE hWlx) { - WlxSetOption(hWlx, WLX_OPTION_USE_CTRL_ALT_DEL, TRUE, NULL); + ULONG_PTR OldValue; + WlxSetOption(hWlx, WLX_OPTION_USE_CTRL_ALT_DEL, TRUE, &OldValue); } /* @@ -77,7 +68,8 @@ HANDLE hWlx, PVOID pWlxContext) { - WlxSetOption(hWlx, WLX_OPTION_CONTEXT_POINTER, (ULONG_PTR)pWlxContext, NULL); + ULONG_PTR OldValue; + WlxSetOption(hWlx, WLX_OPTION_CONTEXT_POINTER, (ULONG_PTR)pWlxContext, &OldValue); } /* @@ -147,7 +139,7 @@ if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; - return (int)DialogBox(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc); + return (int)DialogBoxW(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc); } /* @@ -165,7 +157,7 @@ if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; - return (int)DialogBoxParam(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); + return (int)DialogBoxParamW(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); } /* @@ -182,7 +174,7 @@ if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; - return (int)DialogBoxIndirect(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc); + return (int)DialogBoxIndirectW(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc); } /* @@ -200,7 +192,7 @@ if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; - return (int)DialogBoxIndirectParam(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); + return (int)DialogBoxIndirectParamW(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); } /* @@ -316,30 +308,27 @@ ULONG_PTR* OldValue) { PWLSESSION Session = (PWLSESSION)hWlx; - UNIMPLEMENTED; - - if (Session || !Value) - { - switch (Option) - { - case WLX_OPTION_USE_CTRL_ALT_DEL: - return TRUE; - case WLX_OPTION_CONTEXT_POINTER: - { - *OldValue = (ULONG_PTR)Session->MsGina.Context; - Session->MsGina.Context = (PVOID)Value; - return TRUE; - } - case WLX_OPTION_USE_SMART_CARD: - return FALSE; - } - } - - return FALSE; -} - -/* - * @unimplemented + + switch (Option) + { + case WLX_OPTION_USE_CTRL_ALT_DEL: + *OldValue = (ULONG_PTR)Session->Gina.UseCtrlAltDelete; + Session->Gina.UseCtrlAltDelete = (BOOL)Value; + return TRUE; + case WLX_OPTION_CONTEXT_POINTER: + *OldValue = (ULONG_PTR)Session->Gina.Context; + Session->Gina.Context = (PVOID)Value; + return TRUE; + case WLX_OPTION_USE_SMART_CARD: + UNIMPLEMENTED; + return FALSE; + } + + return FALSE; +} + +/* + * @implemented */ BOOL WINAPI WlxGetOption( @@ -347,28 +336,26 @@ DWORD Option, ULONG_PTR* Value) { - PMSGINAINSTANCE Instance = (PMSGINAINSTANCE)hWlx; - UNIMPLEMENTED; - - if (Instance || !Value) - { - switch (Option) + PWLSESSION Session = (PWLSESSION)hWlx; + + switch (Option) + { + case WLX_OPTION_USE_CTRL_ALT_DEL: + *Value = (ULONG_PTR)Session->Gina.UseCtrlAltDelete; + return TRUE; + case WLX_OPTION_CONTEXT_POINTER: { - case WLX_OPTION_USE_CTRL_ALT_DEL: - return TRUE; - case WLX_OPTION_CONTEXT_POINTER: - { - *Value = (ULONG_PTR)Instance->Context; - return TRUE; - } - case WLX_OPTION_USE_SMART_CARD: - case WLX_OPTION_SMART_CARD_PRESENT: - case WLX_OPTION_SMART_CARD_INFO: - *Value = 0; - return FALSE; - case WLX_OPTION_DISPATCH_TABLE_SIZE: - { - switch (Instance->Version) + *Value = (ULONG_PTR)Session->Gina.Context; + return TRUE; + } + case WLX_OPTION_USE_SMART_CARD: + case WLX_OPTION_SMART_CARD_PRESENT: + case WLX_OPTION_SMART_CARD_INFO: + UNIMPLEMENTED; + return FALSE; + case WLX_OPTION_DISPATCH_TABLE_SIZE: + { + switch (Session->Gina.Version) { case WLX_VERSION_1_0: *Value = sizeof(WLX_DISPATCH_VERSION_1_0); @@ -387,9 +374,8 @@ break; default: return FALSE; - } - return TRUE; } + return TRUE; } } @@ -516,7 +502,7 @@ DWORD Type, Size; HKEY hKey; - Status = RegOpenKeyEx( + Status = RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", 0, @@ -530,7 +516,7 @@ } Size = Len * sizeof(WCHAR); - Status = RegQueryValueEx( + Status = RegQueryValueExW( hKey, L"GinaDLL", NULL, @@ -543,74 +529,30 @@ return TRUE; } -static INT_PTR CALLBACK -GinaLoadFailedWindowProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - switch (uMsg) - { - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDOK: - EndDialog(hwndDlg, IDOK); - break; - } - break; - } - case WM_INITDIALOG: - { - int len; - WCHAR templateText[MAX_PATH], text[MAX_PATH]; - - len = GetDlgItemText(hwndDlg, IDC_GINALOADFAILED, templateText, MAX_PATH); - if (len) - { - wsprintf(text, templateText, (LPWSTR)lParam); - SetDlgItemText(hwndDlg, IDC_GINALOADFAILED, text); - } - SetFocus(GetDlgItem(hwndDlg, IDOK)); - break; - } - case WM_CLOSE: - { - EndDialog(hwndDlg, IDCANCEL); - return TRUE; - } - } - - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); -} - -#define FAIL_AND_RETURN() return DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), 0, GinaLoadFailedWindowProc, (LPARAM)GinaDll) && FALSE static BOOL LoadGina( - IN OUT PMSGINAFUNCTIONS Functions, + IN OUT PGINAFUNCTIONS Functions, OUT DWORD *DllVersion, OUT HMODULE *GinaInstance) { - HMODULE hGina; + HMODULE hGina = NULL; WCHAR GinaDll[MAX_PATH + 1]; + BOOL ret = FALSE; GinaDll[0] = '\0'; if (!GetGinaPath(GinaDll, MAX_PATH)) - FAIL_AND_RETURN(); + goto cleanup; /* Terminate string */ GinaDll[MAX_PATH] = '\0'; - if (!(hGina = LoadLibrary(GinaDll))) - FAIL_AND_RETURN(); - *GinaInstance = hGina; + if (!(hGina = LoadLibraryW(GinaDll))) + goto cleanup; Functions->WlxNegotiate = (PFWLXNEGOTIATE)GetProcAddress(hGina, "WlxNegotiate"); Functions->WlxInitialize = (PFWLXINITIALIZE)GetProcAddress(hGina, "WlxInitialize"); if (!Functions->WlxInitialize) - FAIL_AND_RETURN(); + goto cleanup; if (!Functions->WlxNegotiate) { @@ -618,55 +560,64 @@ *DllVersion = WLX_CURRENT_VERSION; } else if (!Functions->WlxNegotiate(WLX_CURRENT_VERSION, DllVersion)) - FAIL_AND_RETURN(); + goto cleanup; if (*DllVersion >= WLX_VERSION_1_0) { Functions->WlxActivateUserShell = (PFWLXACTIVATEUSERSHELL)GetProcAddress(hGina, "WlxActivateUserShell"); - if (!Functions->WlxActivateUserShell) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxDisplayLockedNotice = (PFWLXDISPLAYLOCKEDNOTICE)GetProcAddress(hGina, "WlxDisplayLockedNotice"); - if (!Functions->WlxDisplayLockedNotice) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxDisplaySASNotice = (PFWLXDISPLAYSASNOTICE)GetProcAddress(hGina, "WlxDisplaySASNotice"); - if (!Functions->WlxDisplaySASNotice) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxIsLockOk = (PFWLXISLOCKOK)GetProcAddress(hGina, "WlxIsLockOk"); - if (!Functions->WlxIsLockOk) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxIsLogoffOk = (PFWLXISLOGOFFOK)GetProcAddress(hGina, "WlxIsLogoffOk"); - if (!Functions->WlxIsLogoffOk) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxLoggedOnSAS = (PFWLXLOGGEDONSAS)GetProcAddress(hGina, "WlxLoggedOnSAS"); - if (!Functions->WlxLoggedOnSAS) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxLoggedOutSAS = (PFWLXLOGGEDOUTSAS)GetProcAddress(hGina, "WlxLoggedOutSAS"); - if (!Functions->WlxLoggedOutSAS) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxLogoff = (PFWLXLOGOFF)GetProcAddress(hGina, "WlxLogoff"); - if (!Functions->WlxLogoff) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxShutdown = (PFWLXSHUTDOWN)GetProcAddress(hGina, "WlxShutdown"); - if (!Functions->WlxShutdown) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxWkstaLockedSAS = (PFWLXWKSTALOCKEDSAS)GetProcAddress(hGina, "WlxWkstaLockedSAS"); - if (!Functions->WlxWkstaLockedSAS) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; } if (*DllVersion >= WLX_VERSION_1_1) { Functions->WlxScreenSaverNotify = (PFWLXSCREENSAVERNOTIFY)GetProcAddress(hGina, "WlxScreenSaverNotify"); - if (!Functions->WlxScreenSaverNotify) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxStartApplication = (PFWLXSTARTAPPLICATION)GetProcAddress(hGina, "WlxStartApplication"); - if (!Functions->WlxStartApplication) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; } if (*DllVersion >= WLX_VERSION_1_3) { Functions->WlxDisplayStatusMessage = (PFWLXDISPLAYSTATUSMESSAGE)GetProcAddress(hGina, "WlxDisplayStatusMessage"); - if (!Functions->WlxDisplayStatusMessage) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxGetStatusMessage = (PFWLXGETSTATUSMESSAGE)GetProcAddress(hGina, "WlxGetStatusMessage"); - if (!Functions->WlxGetStatusMessage) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxNetworkProviderLoad = (PFWLXNETWORKPROVIDERLOAD)GetProcAddress(hGina, "WlxNetworkProviderLoad"); - if (!Functions->WlxNetworkProviderLoad) FAIL_AND_RETURN(); + if (!Functions->WlxActivateUserShell) goto cleanup; Functions->WlxRemoveStatusMessage = (PFWLXREMOVESTATUSMESSAGE)GetProcAddress(hGina, "WlxRemoveStatusMessage"); - if (!Functions->WlxRemoveStatusMessage) FAIL_AND_RETURN(); - } - - return TRUE; -} -#undef FAIL_AND_RETURN + if (!Functions->WlxActivateUserShell) goto cleanup; + } + + ret = TRUE; + +cleanup: + if (!ret) + { + if (hGina) + FreeLibrary(hGina); + } + else + *GinaInstance = hGina; + return ret; +} BOOL GinaInit( @@ -674,20 +625,21 @@ { DWORD GinaDllVersion; - if (!LoadGina(&Session->MsGina.Functions, &GinaDllVersion, &Session->MsGina.hDllInstance)) + if (!LoadGina(&Session->Gina.Functions, &GinaDllVersion, &Session->Gina.hDllInstance)) return FALSE; - Session->MsGina.Context = NULL; - Session->MsGina.Version = GinaDllVersion; + Session->Gina.Context = NULL; + Session->Gina.Version = GinaDllVersion; + Session->Gina.UseCtrlAltDelete = FALSE; Session->SuppressStatus = FALSE; PreviousWindowProc = NULL; - return Session->MsGina.Functions.WlxInitialize( + return Session->Gina.Functions.WlxInitialize( Session->InteractiveWindowStationName, (HANDLE)Session, NULL, (PVOID)&FunctionTable, - &Session->MsGina.Context); + &Session->Gina.Context); } BOOL @@ -698,7 +650,7 @@ * Create the interactive window station */ Session->InteractiveWindowStationName = L"WinSta0"; - Session->InteractiveWindowStation = CreateWindowStation( + Session->InteractiveWindowStation = CreateWindowStationW( Session->InteractiveWindowStationName, 0, WINSTA_CREATEDESKTOP, @@ -713,7 +665,7 @@ /* * Create the application desktop */ - Session->ApplicationDesktop = CreateDesktop( + Session->ApplicationDesktop = CreateDesktopW( L"Default", NULL, NULL, @@ -729,7 +681,7 @@ /* * Create the winlogon desktop */ - Session->WinlogonDesktop = CreateDesktop( + Session->WinlogonDesktop = CreateDesktopW( L"Winlogon", NULL, NULL, @@ -745,7 +697,7 @@ /* * Create the screen saver desktop */ - Session->ScreenSaverDesktop = CreateDesktop( + Session->ScreenSaverDesktop = CreateDesktopW( L"Screen-Saver", NULL, NULL,

1 0

[gedmurphy] 23441: fix loading of current values for ip and dhcp
by gedmurphy＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: gedmurphy Date: Fri Aug 4 02:20:44 2006 New Revision: 23441 URL: http://svn.reactos.org/svn/reactos?rev=23441&view=rev Log: fix loading of current values for ip and dhcp Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Fri Aug 4 02:20:44 2006 @@ -61,25 +61,35 @@ static void -ManualDNS(HWND Dlg, BOOL Enabled) { +ManualDNS(HWND Dlg, BOOL Enabled, UINT uCmd) { PTCPIP_PROPERTIES_DATA DlgData = (PTCPIP_PROPERTIES_DATA) GetWindowLongPtrW(Dlg, GWL_USERDATA); - if (! DlgData->OldDhcpEnabled) - { - if (INADDR_NONE != DlgData->OldIpAddress) { - SendDlgItemMessage(Dlg, IDC_IPADDR, IPM_SETADDRESS, 0, - ntohl(DlgData->OldIpAddress)); - } - if (INADDR_NONE != DlgData->OldSubnetMask) { - SendDlgItemMessage(Dlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, - ntohl(DlgData->OldSubnetMask)); - } - if (INADDR_NONE != DlgData->OldGateway) { - SendDlgItemMessage(Dlg, IDC_DEFGATEWAY, IPM_SETADDRESS, 0, - ntohl(DlgData->OldGateway)); - } - } + if (! DlgData->OldDhcpEnabled && + (uCmd == IDC_USEDHCP || uCmd == IDC_NODHCP)) { + if (INADDR_NONE != DlgData->OldIpAddress) { + SendDlgItemMessage(Dlg, IDC_IPADDR, IPM_SETADDRESS, 0, + ntohl(DlgData->OldIpAddress)); + } + if (INADDR_NONE != DlgData->OldSubnetMask) { + SendDlgItemMessage(Dlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, + ntohl(DlgData->OldSubnetMask)); + } + if (INADDR_NONE != DlgData->OldGateway) { + SendDlgItemMessage(Dlg, IDC_DEFGATEWAY, IPM_SETADDRESS, 0, + ntohl(DlgData->OldGateway)); + } + } + + if (INADDR_NONE != DlgData->OldDns1 && + (uCmd == IDC_FIXEDDNS || uCmd == IDC_AUTODNS || IDC_NODHCP)) { + SendDlgItemMessage(Dlg, IDC_DNS1, IPM_SETADDRESS, 0, + ntohl(DlgData->OldDns1)); + if (INADDR_NONE != DlgData->OldDns2) { + SendDlgItemMessage(Dlg, IDC_DNS2, IPM_SETADDRESS, 0, + ntohl(DlgData->OldDns2)); + } + } CheckDlgButton(Dlg, IDC_FIXEDDNS, Enabled ? BST_CHECKED : BST_UNCHECKED); @@ -95,7 +105,7 @@ } static void -EnableDHCP(HWND Dlg, BOOL Enabled) { +EnableDHCP(HWND Dlg, BOOL Enabled, UINT uCmd) { CheckDlgButton(Dlg, IDC_USEDHCP, Enabled ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(Dlg, IDC_NODHCP, Enabled ? BST_UNCHECKED : BST_CHECKED); EnableWindow(GetDlgItem(Dlg, IDC_IPADDR), ! Enabled); @@ -107,7 +117,7 @@ SendDlgItemMessage(Dlg, IDC_SUBNETMASK, IPM_CLEARADDRESS, 0, 0); SendDlgItemMessage(Dlg, IDC_DEFGATEWAY, IPM_CLEARADDRESS, 0, 0); } else { - ManualDNS(Dlg, TRUE); + ManualDNS(Dlg, TRUE, uCmd); } } @@ -354,7 +364,7 @@ EnableWindow(GetDlgItem(Dlg, IDC_ADVANCED), FALSE); - EnableDHCP(Dlg, DlgData->OldDhcpEnabled); + EnableDHCP(Dlg, DlgData->OldDhcpEnabled, 0); if (! DlgData->OldDhcpEnabled) { @@ -380,25 +390,25 @@ ntohl(DlgData->OldDns2)); } } - ManualDNS(Dlg, INADDR_NONE != DlgData->OldDns1); + ManualDNS(Dlg, INADDR_NONE != DlgData->OldDns1, 0); break; case WM_COMMAND: switch(LOWORD(wParam)) { case IDC_FIXEDDNS: - ManualDNS(Dlg, TRUE); + ManualDNS(Dlg, TRUE, LOWORD(wParam)); return TRUE; case IDC_AUTODNS: - ManualDNS(Dlg, FALSE); + ManualDNS(Dlg, FALSE, LOWORD(wParam)); return TRUE; case IDC_USEDHCP: - EnableDHCP(Dlg, TRUE); + EnableDHCP(Dlg, TRUE, LOWORD(wParam)); return TRUE; case IDC_NODHCP: - EnableDHCP(Dlg, FALSE); + EnableDHCP(Dlg, FALSE, LOWORD(wParam)); return TRUE; } break;

1 0

[gedmurphy] 23440: - load the current IP address when switching from dhcp to manual. - this isn't how Windows behaves, but it should be as it makes life slightly easier in most cases
by gedmurphy＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: gedmurphy Date: Fri Aug 4 01:29:09 2006 New Revision: 23440 URL: http://svn.reactos.org/svn/reactos?rev=23440&view=rev Log: - load the current IP address when switching from dhcp to manual. - this isn't how Windows behaves, but it should be as it makes life slightly easier in most cases Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Fri Aug 4 01:29:09 2006 @@ -62,6 +62,25 @@ static void ManualDNS(HWND Dlg, BOOL Enabled) { + PTCPIP_PROPERTIES_DATA DlgData = + (PTCPIP_PROPERTIES_DATA) GetWindowLongPtrW(Dlg, GWL_USERDATA); + + if (! DlgData->OldDhcpEnabled) + { + if (INADDR_NONE != DlgData->OldIpAddress) { + SendDlgItemMessage(Dlg, IDC_IPADDR, IPM_SETADDRESS, 0, + ntohl(DlgData->OldIpAddress)); + } + if (INADDR_NONE != DlgData->OldSubnetMask) { + SendDlgItemMessage(Dlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, + ntohl(DlgData->OldSubnetMask)); + } + if (INADDR_NONE != DlgData->OldGateway) { + SendDlgItemMessage(Dlg, IDC_DEFGATEWAY, IPM_SETADDRESS, 0, + ntohl(DlgData->OldGateway)); + } + } + CheckDlgButton(Dlg, IDC_FIXEDDNS, Enabled ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(Dlg, IDC_AUTODNS,

1 0

[gedmurphy] 23439: doh, rushed code leads to leaked resources. thanks lkjasa for pointing it out.
by gedmurphy＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: gedmurphy Date: Fri Aug 4 00:32:10 2006 New Revision: 23439 URL: http://svn.reactos.org/svn/reactos?rev=23439&view=rev Log: doh, rushed code leads to leaked resources. thanks lkjasa for pointing it out. Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Fri Aug 4 00:32:10 2006 @@ -516,5 +516,8 @@ ShowError(hParent, IDS_CANNOT_CREATE_PROPSHEET); } + if (tpszCaption != NULL) + HeapFree(GetProcessHeap(), 0, tpszCaption); + return; }

1 0

[gedmurphy] 23438: size the buffer dynamically to avoid potentially overflowing it
by gedmurphy＠svn.reactos.org 03 Aug '06

03 Aug '06

Author: gedmurphy Date: Thu Aug 3 23:06:12 2006 New Revision: 23438 URL: http://svn.reactos.org/svn/reactos?rev=23438&view=rev Log: size the buffer dynamically to avoid potentially overflowing it Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Thu Aug 3 23:06:12 2006 @@ -466,14 +466,25 @@ PROPSHEETHEADERW psh; INITCOMMONCONTROLSEX cce; TCPIP_PROPERTIES_DATA DlgData; - TCHAR tpszCaption[MAX_PATH]; - HWND hListBox = GetDlgItem(hParent,IDC_COMPONENTSLIST); - int iListBoxIndex = (int) SendMessage(hListBox,LB_GETCURSEL,0,0); + LPTSTR tpszCaption = NULL; + INT StrLen; + + HWND hListBox = GetDlgItem(hParent, IDC_COMPONENTSLIST); + int iListBoxIndex = (int) SendMessage(hListBox, LB_GETCURSEL, 0, 0); + if(iListBoxIndex != LB_ERR) - SendMessage(hListBox,LB_GETTEXT,iListBoxIndex,(LPARAM)tpszCaption); - else - _stprintf(tpszCaption,_T("[ERROR]")); - _tcscat(tpszCaption,_T(" Properties")); + { + StrLen = SendMessage(hListBox, LB_GETTEXTLEN, iListBoxIndex, 0); + + if (StrLen != LB_ERR) + { + TCHAR suffix[] = _T(" Properties"); + INT HeapSize = ((StrLen + 1) + (_tcslen(suffix) + 1)) * sizeof(TCHAR); + tpszCaption = (LPTSTR)HeapAlloc(GetProcessHeap(), 0, HeapSize); + SendMessage(hListBox, LB_GETTEXT, iListBoxIndex, (LPARAM)tpszCaption); + _tcscat(tpszCaption, suffix); + } + } if (! LoadDataFromInfo(&DlgData, pInfo)) {

1 0

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

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 August 2006