Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 23543: Revert one meaningless change from the previous patch
by fireball＠svn.reactos.org 10 Aug '06

10 Aug '06

Author: fireball Date: Fri Aug 11 00:56:48 2006 New Revision: 23543 URL: http://svn.reactos.org/svn/reactos?rev=23543&view=rev Log: Revert one meaningless change from the previous patch 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 Fri Aug 11 00:56:48 2006 @@ -121,7 +121,7 @@ &ObjectAttributes, 0, NULL, - 0, + REG_OPTION_NON_VOLATILE, NULL); if (Status == STATUS_ACCESS_DENIED)

1 0

[arty] 23542: Added missing return.
by arty＠svn.reactos.org 10 Aug '06

10 Aug '06

Author: arty Date: Thu Aug 10 23:52:55 2006 New Revision: 23542 URL: http://svn.reactos.org/svn/reactos?rev=23542&view=rev Log: Added missing return. Modified: trunk/reactos/base/system/winlogon/sas.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 Thu Aug 10 23:52:55 2006 @@ -535,6 +535,7 @@ WARN("SE_SHUTDOWN privilege not enabled\n"); return STATUS_ACCESS_DENIED; } + return STATUS_SUCCESS; } static LRESULT CALLBACK

1 0

[hpoussin] 23541: "Unicodify" msgina Add stubs for locking/unlocking
by hpoussin＠svn.reactos.org 10 Aug '06

10 Aug '06

Author: hpoussin Date: Thu Aug 10 22:41:23 2006 New Revision: 23541 URL: http://svn.reactos.org/svn/reactos?rev=23541&view=rev Log: "Unicodify" msgina Add stubs for locking/unlocking Modified: trunk/reactos/dll/win32/msgina/En.rc 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/msgina.rbuild trunk/reactos/dll/win32/msgina/resource.h trunk/reactos/dll/win32/msgina/stubs.c trunk/reactos/dll/win32/msgina/tui.c Modified: trunk/reactos/dll/win32/msgina/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/En.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/En.rc (original) +++ trunk/reactos/dll/win32/msgina/En.rc Thu Aug 10 22:41:23 2006 @@ -47,7 +47,10 @@ STRINGTABLE BEGIN - IDS_PRESSCTRLALTDELETE "Press CONTROL+ALT+DELETE key combination\n" - IDS_ASKFORUSER "User name: " - IDS_ASKFORPASSWORD "Password: " + IDS_LOGGEDOUTSAS "Welcome!" + IDS_LOCKEDSAS "The computer is currently locked" + IDS_PRESSCTRLALTDELETE "Press CONTROL+ALT+DELETE key combination" + IDS_ASKFORUSER "User name: " + IDS_ASKFORPASSWORD "Password: " + IDS_FORCELOGOFF "This will close the the session of the current user, and loose all his unsaved work. Continue?" END 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 Thu Aug 10 22:41:23 2006 @@ -7,7 +7,7 @@ #include "msgina.h" -#define YDEBUG +//#define YDEBUG #include <wine/debug.h> typedef struct _DISPLAYSTATUSMSG @@ -46,17 +46,17 @@ msg->Context->hStatusWindow = hwndDlg; if (msg->pTitle) - SetWindowText(hwndDlg, msg->pTitle); - SetDlgItemText(hwndDlg, IDC_STATUSLABEL, msg->pMessage); + SetWindowTextW(hwndDlg, msg->pTitle); + SetDlgItemTextW(hwndDlg, IDC_STATUSLABEL, msg->pMessage); if (!msg->Context->SignaledStatusWindowCreated) { msg->Context->SignaledStatusWindowCreated = TRUE; SetEvent(msg->StartupEvent); } - break; - } - } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return TRUE; + } + } + return FALSE; } static DWORD WINAPI @@ -141,9 +141,9 @@ } if(pTitle) - SetWindowText(pgContext->hStatusWindow, pTitle); - - SetDlgItemText(pgContext->hStatusWindow, IDC_STATUSLABEL, pMessage); + SetWindowTextW(pgContext->hStatusWindow, pTitle); + + SetDlgItemTextW(pgContext->hStatusWindow, IDC_STATUSLABEL, pMessage); return TRUE; } @@ -159,16 +159,6 @@ } return TRUE; -} - -static INT_PTR CALLBACK -DisplaySASNoticeWindowProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static VOID @@ -184,7 +174,7 @@ pgContext->hDllInstance, MAKEINTRESOURCE(IDD_NOTICE_DLG), NULL, - DisplaySASNoticeWindowProc, + NULL, (LPARAM)NULL); if (result == -1) { @@ -209,13 +199,90 @@ Text = HeapAlloc(GetProcessHeap(), 0, (Count + 1) * sizeof(WCHAR)); if (!Text) return FALSE; - if (Count != GetWindowText(GetDlgItem(hwndDlg, TextboxId), Text, Count + 1)) + if (Count != GetWindowTextW(GetDlgItem(hwndDlg, TextboxId), Text, Count + 1)) { HeapFree(GetProcessHeap(), 0, Text); return FALSE; } *pText = Text; return TRUE; +} + +static INT_PTR CALLBACK +LoggedOnWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + switch (uMsg) + { + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_LOCK: + EndDialog(hwndDlg, WLX_SAS_ACTION_LOCK_WKSTA); + return TRUE; + case IDC_LOGOFF: + EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); + return TRUE; + case IDC_SHUTDOWN: + EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); + return TRUE; + case IDC_TASKMGR: + EndDialog(hwndDlg, WLX_SAS_ACTION_TASKLIST); + return TRUE; + case IDCANCEL: + EndDialog(hwndDlg, WLX_SAS_ACTION_NONE); + return TRUE; + } + break; + } + case WM_INITDIALOG: + { + SetFocus(GetDlgItem(hwndDlg, IDNO)); + return TRUE; + } + case WM_CLOSE: + { + EndDialog(hwndDlg, IDNO); + return TRUE; + } + } + + return FALSE; +} + +static INT +GUILoggedOnSAS( + IN OUT PGINA_CONTEXT pgContext, + IN DWORD dwSasType) +{ + INT result; + + TRACE("GUILoggedOnSAS()\n"); + + if (dwSasType != WLX_SAS_TYPE_CTRL_ALT_DEL) + { + /* Nothing to do for WLX_SAS_TYPE_TIMEOUT ; the dialog will + * close itself thanks to the use of WlxDialogBoxParam */ + return WLX_SAS_ACTION_NONE; + } + + result = pgContext->pWlxFuncs->WlxDialogBoxParam( + pgContext->hWlx, + pgContext->hDllInstance, + MAKEINTRESOURCEW(IDD_LOGGEDON_DLG), + NULL, + LoggedOnWindowProc, + (LPARAM)pgContext); + if (result >= WLX_SAS_ACTION_LOGON && + result <= WLX_SAS_ACTION_SWITCH_CONSOLE) + { + return result; + } + return WLX_SAS_ACTION_NONE; } static INT_PTR CALLBACK @@ -297,95 +364,18 @@ return FALSE; } -static INT_PTR CALLBACK -LoggedOnWindowProc( - IN HWND hwndDlg, - IN UINT uMsg, - IN WPARAM wParam, - IN LPARAM lParam) -{ - switch (uMsg) - { - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_LOCK: - EndDialog(hwndDlg, WLX_SAS_ACTION_LOCK_WKSTA); - return TRUE; - case IDC_LOGOFF: - EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); - return TRUE; - case IDC_SHUTDOWN: - EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); - return TRUE; - case IDC_TASKMGR: - EndDialog(hwndDlg, WLX_SAS_ACTION_TASKLIST); - return TRUE; - case IDCANCEL: - EndDialog(hwndDlg, WLX_SAS_ACTION_NONE); - return TRUE; - } - break; - } - case WM_INITDIALOG: - { - SetFocus(GetDlgItem(hwndDlg, IDNO)); - return TRUE; - } - case WM_CLOSE: - { - EndDialog(hwndDlg, IDNO); - return TRUE; - } - } - - return FALSE; -} - static INT -GUILoggedOnSAS( - IN OUT PGINA_CONTEXT pgContext, - IN DWORD dwSasType) -{ - INT result; - - TRACE("GUILoggedOnSAS()\n"); - - if (dwSasType != WLX_SAS_TYPE_CTRL_ALT_DEL) - { - /* Nothing to do for WLX_SAS_TYPE_TIMEOUT ; the dialog will - * close itself thanks to the use of WlxDialogBoxParam */ - return WLX_SAS_ACTION_NONE; - } +GUILoggedOutSAS( + IN OUT PGINA_CONTEXT pgContext) +{ + int result; + + TRACE("GUILoggedOutSAS()\n"); result = pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, pgContext->hDllInstance, - MAKEINTRESOURCE(IDD_LOGGEDON_DLG), - NULL, - LoggedOnWindowProc, - (LPARAM)pgContext); - if (result >= WLX_SAS_ACTION_LOGON && - result <= WLX_SAS_ACTION_SWITCH_CONSOLE) - { - return result; - } - return WLX_SAS_ACTION_NONE; -} - -static INT -GUILoggedOutSAS( - IN OUT PGINA_CONTEXT pgContext) -{ - int result; - - TRACE("GUILoggedOutSAS()\n"); - - result = pgContext->pWlxFuncs->WlxDialogBoxParam( - pgContext->hWlx, - pgContext->hDllInstance, - MAKEINTRESOURCE(IDD_LOGGEDOUT_DLG), + MAKEINTRESOURCEW(IDD_LOGGEDOUT_DLG), NULL, LoggedOutWindowProc, (LPARAM)pgContext); @@ -398,6 +388,16 @@ WARN("WlxDialogBoxParam() failed (0x%x)\n", result); return WLX_SAS_ACTION_NONE; +} + +static INT +GUILockedSAS( + IN OUT PGINA_CONTEXT pgContext) +{ + TRACE("GUILockedSAS()\n"); + + UNIMPLEMENTED; + return WLX_SAS_ACTION_UNLOCK_WKSTA; } GINA_UI GinaGraphicalUI = { @@ -407,4 +407,5 @@ GUIDisplaySASNotice, GUILoggedOnSAS, GUILoggedOutSAS, + GUILockedSAS, }; 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 Thu Aug 10 22:41:23 2006 @@ -94,7 +94,7 @@ BOOL ConsoleBoot = FALSE; LONG rc; - rc = RegOpenKeyEx( + rc = RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control", 0, @@ -178,7 +178,6 @@ return pGinaUI->Initialize(pgContext); } - /* * @implemented */ @@ -190,12 +189,12 @@ PWSTR pszCmdLine) { PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; - STARTUPINFO StartupInfo; + STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInformation; WCHAR CurrentDirectory[MAX_PATH]; BOOL Ret; - StartupInfo.cb = sizeof(STARTUPINFO); + StartupInfo.cb = sizeof(STARTUPINFOW); StartupInfo.lpReserved = NULL; StartupInfo.lpTitle = pszCmdLine; StartupInfo.dwX = StartupInfo.dwY = StartupInfo.dwXSize = StartupInfo.dwYSize = 0L; @@ -206,9 +205,9 @@ StartupInfo.lpDesktop = pszDesktopName; GetWindowsDirectoryW (CurrentDirectory, MAX_PATH); - Ret = CreateProcessAsUser(pgContext->UserToken, + Ret = CreateProcessAsUserW(pgContext->UserToken, + pszCmdLine, NULL, - pszCmdLine, NULL, NULL, FALSE, @@ -237,7 +236,7 @@ DWORD BufSize, ValueType; WCHAR pszUserInitApp[MAX_PATH]; WCHAR pszExpUserInitApp[MAX_PATH]; - + TRACE("WlxActivateUserShell()\n"); /* get the path of userinit */ if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\Winlogon", @@ -247,7 +246,7 @@ return FALSE; } BufSize = MAX_PATH * sizeof(WCHAR); - if((RegQueryValueEx(hKey, L"Userinit", NULL, &ValueType, (LPBYTE)pszUserInitApp, + if((RegQueryValueExW(hKey, L"Userinit", NULL, &ValueType, (LPBYTE)pszUserInitApp, &BufSize) != ERROR_SUCCESS) || !((ValueType == REG_SZ) || (ValueType == REG_EXPAND_SZ))) {ERR("GINA: Failed: 2\n"); @@ -256,7 +255,7 @@ return FALSE; } RegCloseKey(hKey); - ExpandEnvironmentStrings(pszUserInitApp, pszExpUserInitApp, MAX_PATH); + ExpandEnvironmentStringsW(pszUserInitApp, pszExpUserInitApp, MAX_PATH); /* Start userinit */ /* FIXME - allow to start more applications that are comma-separated */ @@ -363,27 +362,25 @@ TOKEN_STATISTICS Stats; DWORD cbStats; - if(!LogonUserW(UserName, Domain, Password, + if (!LogonUserW(UserName, Domain, Password, LOGON32_LOGON_INTERACTIVE, /* FIXME - use LOGON32_LOGON_UNLOCK instead! */ LOGON32_PROVIDER_DEFAULT, - pgContext->phToken)) + &pgContext->UserToken)) { WARN("LogonUserW() failed\n"); return FALSE; } - if(!*pgContext->phToken) - { - WARN("*phToken == NULL!\n"); + if (!pgContext->UserToken) + { + WARN("UserToken == NULL!\n"); return FALSE; } - pgContext->UserToken =*pgContext->phToken; - *pgContext->pdwOptions = 0; - *pgContext->pProfile =NULL; - - if(!GetTokenInformation(*pgContext->phToken, + *pgContext->pProfile = NULL; + + if (!GetTokenInformation(pgContext->UserToken, TokenStatistics, (PVOID)&Stats, sizeof(TOKEN_STATISTICS), @@ -420,7 +417,7 @@ if (pgContext->AutoLogonState == AUTOLOGON_DISABLED) return FALSE; - rc = RegOpenKeyEx( + rc = RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\WinLogon", 0, @@ -540,12 +537,12 @@ OUT PVOID *pProfile) { PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; + INT res; TRACE("WlxLoggedOutSAS()\n"); pgContext->pAuthenticationId = pAuthenticationId; pgContext->pdwOptions = pdwOptions; - pgContext->phToken = phToken; pgContext->pNprNotifyInfo = pNprNotifyInfo; pgContext->pProfile = pProfile; @@ -554,10 +551,28 @@ { /* User is local and registry contains information * to log on him automatically */ + *phToken = pgContext->UserToken; return WLX_SAS_ACTION_LOGON; } - return pGinaUI->LoggedOutSAS(pgContext); + res = pGinaUI->LoggedOutSAS(pgContext); + *phToken = pgContext->UserToken; + return res; +} + +/* + * @implemented + */ +int WINAPI +WlxWkstaLockedSAS( + PVOID pWlxContext, + DWORD dwSasType) +{ + PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; + + TRACE("WlxWkstaLockedSAS()\n"); + + return pGinaUI->LockedSAS(pgContext); } BOOL WINAPI 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 Thu Aug 10 22:41:23 2006 @@ -16,15 +16,14 @@ LPWSTR station; PWLX_DISPATCH_VERSION_1_3 pWlxFuncs; HANDLE hDllInstance; - HANDLE UserToken; HWND hStatusWindow; BOOL SignaledStatusWindowCreated; DWORD AutoLogonState; /* Informations to be filled during logon */ + HANDLE UserToken; PLUID pAuthenticationId; PDWORD pdwOptions; - PHANDLE phToken; PWLX_MPR_NOTIFY_INFO pNprNotifyInfo; PVOID *pProfile; @@ -40,6 +39,7 @@ typedef VOID (*PFGINA_DISPLAYSASNOTICE)(PGINA_CONTEXT); typedef INT (*PFGINA_LOGGEDONSAS)(PGINA_CONTEXT, DWORD); typedef INT (*PFGINA_LOGGEDOUTSAS)(PGINA_CONTEXT); +typedef INT (*PFGINA_LOCKEDSAS)(PGINA_CONTEXT); typedef struct _GINA_UI { PFGINA_INITIALIZE Initialize; @@ -48,6 +48,7 @@ PFGINA_DISPLAYSASNOTICE DisplaySASNotice; PFGINA_LOGGEDONSAS LoggedOnSAS; PFGINA_LOGGEDOUTSAS LoggedOutSAS; + PFGINA_LOCKEDSAS LockedSAS; } GINA_UI, *PGINA_UI; /* msgina.c */ Modified: trunk/reactos/dll/win32/msgina/msgina.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rb… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rbuild (original) +++ trunk/reactos/dll/win32/msgina/msgina.rbuild Thu Aug 10 22:41:23 2006 @@ -2,8 +2,6 @@ <importlibrary definition="msgina.def" /> <include base="msgina">.</include> <include base="msgina">include</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <library>ntdll</library> Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h (original) +++ trunk/reactos/dll/win32/msgina/resource.h Thu Aug 10 22:41:23 2006 @@ -6,6 +6,8 @@ #define IDD_NOTICE_DLG 101 #define IDD_LOGGEDON_DLG 102 #define IDD_LOGGEDOUT_DLG 103 +#define IDD_LOCKED_DLG 104 + #define IDC_LOGOFF 1001 #define IDC_USERNAME 1002 #define IDC_PASSWORD 1003 @@ -13,12 +15,16 @@ #define IDC_STATUSLABEL 1005 #define IDC_LOCK 1006 #define IDC_ROSLOGO 1007 -#define IDI_ROSLOGO 1008 -#define IDS_ASKFORUSER 40000 -#define IDS_PRESSCTRLALTDELETE 40001 -#define IDC_TASKMGR 40002 -#define IDS_ASKFORPASSWORD 40002 +#define IDC_TASKMGR 1008 +#define IDI_ROSLOGO 20000 + +#define IDS_LOGGEDOUTSAS 40000 +#define IDS_LOCKEDSAS 40001 +#define IDS_PRESSCTRLALTDELETE 40002 +#define IDS_ASKFORUSER 40003 +#define IDS_ASKFORPASSWORD 40004 +#define IDS_FORCELOGOFF 40005 #endif /* __MSGINA_RESOURCE_H */ Modified: trunk/reactos/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c (original) +++ trunk/reactos/dll/win32/msgina/stubs.c Thu Aug 10 22:41:23 2006 @@ -100,26 +100,14 @@ /* * @unimplemented */ -int WINAPI -WlxWkstaLockedSAS( - PVOID pWlxContext, - DWORD dwSasType) -{ - UNIMPLEMENTED; - return WLX_SAS_ACTION_UNLOCK_WKSTA; -} - - -/* - * @unimplemented - */ BOOL WINAPI WlxScreenSaverNotify( PVOID pWlxContext, BOOL *pSecure) { + //HKLM\Software\Policies\Microsoft\Windows\Control Panel\Desktop : ScreenSaverIsSecure UNIMPLEMENTED; - return FALSE; + return TRUE; } 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 Thu Aug 10 22:41:23 2006 @@ -55,24 +55,45 @@ return TRUE; } +static BOOL +DisplayResourceText( + IN UINT uIdResourceText, + IN BOOL AddNewLine) +{ + WCHAR Prompt[256]; + static LPCWSTR newLine = L"\n"; + DWORD count; + + if (!LoadStringW(hDllInstance, uIdResourceText, Prompt, 256)) + return FALSE; + if (!WriteConsole( + GetStdHandle(STD_OUTPUT_HANDLE), + Prompt, wcslen(Prompt), + &count, NULL)) + { + return FALSE; + } + if (AddNewLine) + { + if (!WriteConsoleW( + GetStdHandle(STD_OUTPUT_HANDLE), + newLine, wcslen(newLine), + &count, NULL)) + { + return FALSE; + } + } + return TRUE; +} + static VOID TUIDisplaySASNotice( IN OUT PGINA_CONTEXT pgContext) { - WCHAR CtrlAltDelPrompt[256]; - DWORD count; - TRACE("TUIDisplaySASNotice()\n"); - if (LoadString(hDllInstance, IDS_PRESSCTRLALTDELETE, CtrlAltDelPrompt, 256)) - { - WriteConsole( - GetStdHandle(STD_OUTPUT_HANDLE), - CtrlAltDelPrompt, - wcslen(CtrlAltDelPrompt), - &count, - NULL); - } + DisplayResourceText(IDS_LOGGEDOUTSAS, TRUE); + DisplayResourceText(IDS_PRESSCTRLALTDELETE, TRUE); } static INT @@ -100,7 +121,6 @@ IN DWORD BufferLength, IN BOOL ShowString) { - WCHAR Prompt[256]; DWORD count, i; if (!SetConsoleMode( @@ -110,10 +130,7 @@ return FALSE; } - if (!LoadString(hDllInstance, uIdResourcePrompt, Prompt, 256)) - return FALSE; - - if (!WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), Prompt, wcslen(Prompt), &count, NULL)) + if (!DisplayResourceText(uIdResourcePrompt, FALSE)) return FALSE; i = 0; @@ -150,6 +167,28 @@ return WLX_SAS_ACTION_NONE; } +static INT +TUILockedSAS( + IN OUT PGINA_CONTEXT pgContext) +{ + WCHAR UserName[256]; + WCHAR Password[256]; + + TRACE("TUILockedSAS()\n"); + + if (!DisplayResourceText(IDS_LOGGEDOUTSAS, TRUE)) + return WLX_SAS_ACTION_UNLOCK_WKSTA; + + /* Ask the user for credentials */ + if (!ReadString(pgContext, IDS_ASKFORUSER, UserName, 256, TRUE)) + return WLX_SAS_ACTION_NONE; + if (!ReadString(pgContext, IDS_ASKFORPASSWORD, Password, 256, FALSE)) + return WLX_SAS_ACTION_NONE; + + FIXME("FIXME: Check user/password\n"); + return WLX_SAS_ACTION_UNLOCK_WKSTA; +} + GINA_UI GinaTextUI = { TUIInitialize, TUIDisplayStatusMessage, @@ -157,4 +196,5 @@ TUIDisplaySASNotice, TUILoggedOnSAS, TUILoggedOutSAS, + TUILockedSAS, };

1 0

[hpoussin] 23540: Add code to start the screensaver from winlogon This code should replace the existing one in win32k/csrss, but is not activated (yet) due to some bugs: - Calling SetWindowsHookEx with WH_KEYBOARD_LL gives a BSOD when pressing a key - Time field in PKBDLLHOOKSTRUCT/PMSLLHOOKSTRUCT should be in milliseconds - Screen saver parameters can't be retrieved with SystemParametersInfoW - Probably others... Plus a few less important ones: - When sending a message with HWND_BROADCAST, the
by hpoussin＠svn.reactos.org 10 Aug '06

10 Aug '06

Author: hpoussin Date: Thu Aug 10 22:37:03 2006 New Revision: 23540 URL: http://svn.reactos.org/svn/reactos?rev=23540&view=rev Log: Add code to start the screensaver from winlogon This code should replace the existing one in win32k/csrss, but is not activated (yet) due to some bugs: - Calling SetWindowsHookEx with WH_KEYBOARD_LL gives a BSOD when pressing a key - Time field in PKBDLLHOOKSTRUCT/PMSLLHOOKSTRUCT should be in milliseconds - Screen saver parameters can't be retrieved with SystemParametersInfoW - Probably others... Plus a few less important ones: - When sending a message with HWND_BROADCAST, the invisible SAS window doesn't get the message - When calling (NtUser)SystemParametersInfo, WM_SETTINGSCHANGE message is not sent - desk.cpl doesn't save (some) screensaver parameters to registry Added: trunk/reactos/base/system/winlogon/screensaver.c Modified: trunk/reactos/base/system/winlogon/sas.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 Thu Aug 10 22:37:03 2006 @@ -108,6 +108,10 @@ RemoveStatusMessage(Session); */ + + if (!InitializeScreenSaver(Session)) + ERR("WL: Failed to initialize screen saver\n"); + return TRUE; } @@ -127,7 +131,7 @@ if (LSData->Session->UserToken && !ImpersonateLoggedOnUser(LSData->Session->UserToken)) { - ERR("ImpersonateLoggedOnUser failed with error %lu\n", GetLastError()); + ERR("ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); return 0; } @@ -240,6 +244,8 @@ DestroyWindow(Session->SASWindow); Session->SASWindow = NULL; } + if (Session->hEndOfScreenSaverThread) + SetEvent(Session->hEndOfScreenSaverThread); UnregisterClassW(WINLOGON_SAS_CLASS, hAppInstance); } @@ -378,7 +384,7 @@ } } -VOID +static VOID DispatchSAS( IN OUT PWLSESSION Session, IN DWORD dwSasType) @@ -399,7 +405,7 @@ Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); break; } - case WLX_SAS_TYPE_CTRL_ALT_DEL: /* 0x01 */ + default: { PSID LogonSid = NULL; /* FIXME */ @@ -417,10 +423,26 @@ (PVOID*)&Session->Profile); break; } - default: - WARN("Unknown SAS type 0x%lx\n", dwSasType); - } - } + } + } + + if (dwSasType == WLX_SAS_TYPE_SCRNSVR_TIMEOUT) + { + BOOL bSecure = TRUE; + if (!Session->Gina.Functions.WlxScreenSaverNotify(Session->Gina.Context, &bSecure)) + { + /* Skip start of screen saver */ + SetEvent(Session->hUserActivity); + } + else + { + if (bSecure) + DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA); + StartScreenSaver(Session); + } + } + else if (dwSasType == WLX_SAS_TYPE_SCRNSVR_ACTIVITY) + SetEvent(Session->hUserActivity); DoGenericAction(Session, wlxAction); } @@ -535,7 +557,7 @@ TRACE("SAS: CONTROL+ALT+DELETE\n"); if (!Session->Gina.UseCtrlAltDelete) break; - DispatchSAS(Session, WLX_SAS_TYPE_CTRL_ALT_DEL); + PostMessageW(Session->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_CTRL_ALT_DEL, 0); return TRUE; } case MAKELONG(MOD_CONTROL | MOD_SHIFT, VK_ESCAPE): @@ -560,6 +582,21 @@ case WM_DESTROY: { UnregisterHotKeys(Session, hwndDlg); + return TRUE; + } + case WM_SETTINGCHANGE: + { + UINT uiAction = (UINT)wParam; + if (uiAction == SPI_SETSCREENSAVETIMEOUT + || uiAction == SPI_SETSCREENSAVEACTIVE) + { + SetEvent(Session->hScreenSaverParametersChanged); + } + return TRUE; + } + case WLX_WM_SAS: + { + DispatchSAS(Session, (DWORD)wParam); return TRUE; } case PM_WINLOGON_EXITWINDOWS: @@ -601,6 +638,7 @@ IN OUT PWLSESSION Session) { WNDCLASSEXW swc; + BOOL ret = FALSE; /* register SAS window class. * WARNING! MAKE SURE WE ARE IN THE WINLOGON DESKTOP! */ @@ -619,7 +657,7 @@ if (RegisterClassExW(&swc) == 0) { ERR("WL: Failed to register SAS window class\n"); - return FALSE; + goto cleanup; } /* create invisible SAS window */ @@ -633,17 +671,20 @@ if (!Session->SASWindow) { ERR("WL: Failed to create SAS window\n"); - UninitializeSAS(Session); - return FALSE; + goto cleanup; } /* Register SAS window to receive SAS notifications */ if (!SetLogonNotifyWindow(Session->SASWindow, Session->InteractiveWindowStation)) { + ERR("WL: Failed to register SAS window\n"); + goto cleanup; + } + + ret = TRUE; + +cleanup: + if (!ret) UninitializeSAS(Session); - ERR("WL: Failed to register SAS window\n"); - return FALSE; - } - - return TRUE; -} + return ret; +} Added: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c (added) +++ trunk/reactos/base/system/winlogon/screensaver.c Thu Aug 10 22:37:03 2006 @@ -1,0 +1,269 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/winlogon/screensaver.c + * PURPOSE: Screen saver management + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) + */ + +#include "winlogon.h" + +#define YDEBUG +#include <wine/debug.h> + +static LRESULT CALLBACK +KeyboardActivityProc( + IN INT nCode, + IN WPARAM wParam, + IN LPARAM lParam) +{ + InterlockedExchange(&WLSession->LastActivity, ((PKBDLLHOOKSTRUCT)lParam)->time); + return CallNextHookEx(NULL, nCode, wParam, lParam); +} + +static LRESULT CALLBACK +MouseActivityProc( + IN INT nCode, + IN WPARAM wParam, + IN LPARAM lParam) +{ + InterlockedExchange(&WLSession->LastActivity, ((PMSLLHOOKSTRUCT)lParam)->time); + return CallNextHookEx(NULL, nCode, wParam, lParam); +} + +static VOID +LoadScreenSaverParameters( + OUT LPDWORD Timeout) +{ + BOOL Enabled; + + if (!SystemParametersInfoW(SPI_GETSCREENSAVETIMEOUT, 0, Timeout, 0)) + { + WARN("WL: Unable to get screen saver timeout (error %lu). Disabling it\n", GetLastError()); + *Timeout = INFINITE; + } + else if (!SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &Enabled, 0)) + { + WARN("WL: Unable to check if screen saver is enabled (error %lu). Disabling it\n", GetLastError()); + *Timeout = INFINITE; + } + else if (!Enabled) + { + TRACE("WL: Screen saver is disabled\n"); + *Timeout = INFINITE; + } + else + { + TRACE("WL: Screen saver timeout: %lu seconds\n", *Timeout); + *Timeout *= 1000; + } +} + +static DWORD WINAPI +ScreenSaverThreadMain( + IN LPVOID lpParameter) +{ + PWLSESSION Session = (PWLSESSION)lpParameter; + HANDLE HandleArray[3]; + DWORD LastActivity, TimeToWait; + DWORD Timeout; /* Timeout before screen saver starts, in milliseconds */ + DWORD ret; + + if (!ImpersonateLoggedOnUser(Session->UserToken)) + { + ERR("ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + return 0; + } + + Session->hUserActivity = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!Session->hUserActivity) + { + ERR("WL: Unable to create event (error %lu)\n", GetLastError()); + goto cleanup; + } + + HandleArray[0] = Session->hEndOfScreenSaverThread; + HandleArray[1] = Session->hScreenSaverParametersChanged; + HandleArray[2] = Session->hUserActivity; + + LoadScreenSaverParameters(&Timeout); + + InterlockedExchange((LONG*)&Session->LastActivity, GetTickCount()); + for (;;) + { + /* See the time of last activity and calculate a timeout */ + LastActivity = InterlockedCompareExchange((LONG*)&Session->LastActivity, 0, 0); + TimeToWait = Timeout - (GetTickCount() - LastActivity); + if (TimeToWait > Timeout) + { + /* GetTickCount() got back to 0 */ + TimeToWait = Timeout; + } + + /* Wait for the timeout, or the end of this thread */ + ret = WaitForMultipleObjects(2, HandleArray, FALSE, TimeToWait); + if (ret == WAIT_OBJECT_0) + break; + else if (ret == WAIT_OBJECT_0 + 1) + LoadScreenSaverParameters(&Timeout); + + /* Check if we didn't had recent activity */ + LastActivity = InterlockedCompareExchange(&Session->LastActivity, 0, 0); + if (LastActivity + Timeout > GetTickCount()) + continue; + + /* Run screen saver */ + PostMessageW(Session->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_SCRNSVR_TIMEOUT, 0); + + /* Wait for the end of this thread or of the screen saver */ + ret = WaitForMultipleObjects(3, HandleArray, FALSE, INFINITE); + if (ret == WAIT_OBJECT_0) + break; + else if (ret == WAIT_OBJECT_0 + 1) + LoadScreenSaverParameters(&Timeout); + else if (ret == WAIT_OBJECT_0 + 2) + SystemParametersInfoW(SPI_SETSCREENSAVERRUNNING, FALSE, NULL, 0); + } + +cleanup: + RevertToSelf(); + if (Session->hUserActivity) + CloseHandle(Session->hUserActivity); + if (Session->KeyboardHook) + UnhookWindowsHookEx(Session->KeyboardHook); + if (Session->MouseHook) + UnhookWindowsHookEx(Session->MouseHook); + CloseHandle(Session->hEndOfScreenSaverThread); + CloseHandle(Session->hScreenSaverParametersChanged); + return 0; +} + +BOOL +InitializeScreenSaver( + IN OUT PWLSESSION Session) +{ + HANDLE ScreenSaverThread; + + FIXME("Disabling screen saver due to numerous bugs in ReactOS (see r23540)!\n"); + return TRUE; + + /* Register hooks to detect keyboard and mouse activity */ + Session->KeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardActivityProc, hAppInstance, 0); + if (!Session->KeyboardHook) + { + ERR("WL: Unable to register keyboard hook\n"); + return FALSE; + } + Session->MouseHook = SetWindowsHookEx(WH_MOUSE_LL, MouseActivityProc, hAppInstance, 0); + if (!Session->MouseHook) + { + ERR("WL: Unable to register mouse hook\n"); + return FALSE; + } + + if (!(Session->hScreenSaverParametersChanged = CreateEventW(NULL, FALSE, FALSE, NULL))) + { + WARN("WL: Unable to create screen saver event (error %lu)\n", GetLastError()); + } + else if (!(Session->hEndOfScreenSaverThread = CreateEventW(NULL, FALSE, FALSE, NULL))) + { + WARN("WL: Unable to create screen saver event (error %lu)\n", GetLastError()); + CloseHandle(Session->hScreenSaverParametersChanged); + } + else + { + ScreenSaverThread = CreateThread( + NULL, + 0, + ScreenSaverThreadMain, + Session, + 0, + NULL); + if (ScreenSaverThread) + CloseHandle(ScreenSaverThread); + else + WARN("WL: Unable to start screen saver thread\n"); + } + + return TRUE; +} + +VOID +StartScreenSaver( + IN PWLSESSION Session) +{ + HKEY hKey = NULL; + WCHAR szApplicationName[MAX_PATH]; + WCHAR szCommandLine[MAX_PATH + 3]; + DWORD bufferSize = sizeof(szApplicationName)- 1; + DWORD dwType; + STARTUPINFOW StartupInfo; + PROCESS_INFORMATION ProcessInformation; + LONG rc; + BOOL ret = FALSE; + + if (!ImpersonateLoggedOnUser(Session->UserToken)) + { + ERR("ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + goto cleanup; + } + + rc = RegOpenKeyExW( + HKEY_CURRENT_USER, + L"Control Panel\\Desktop", + 0, + KEY_QUERY_VALUE, + &hKey); + if (rc != ERROR_SUCCESS) + goto cleanup; + + szApplicationName[bufferSize] = 0; /* Terminate the string */ + rc = RegQueryValueExW( + hKey, + L"SCRNSAVE.EXE", + 0, + &dwType, + (LPBYTE)szApplicationName, + &bufferSize); + if (rc != ERROR_SUCCESS || dwType != REG_SZ) + goto cleanup; + + wsprintfW(szCommandLine, L"%s /s", szApplicationName); + TRACE("WL: Executing %S\n", szCommandLine); + + ZeroMemory(&StartupInfo, sizeof(STARTUPINFOW)); + ZeroMemory(&ProcessInformation, sizeof(PROCESS_INFORMATION)); + StartupInfo.cb = sizeof(STARTUPINFOW); + /* FIXME: run the screen saver on the screen saver desktop */ + ret = CreateProcessW( + szApplicationName, + szCommandLine, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); + if (!ret) + { + WARN("WL: Unable to start %S, error %lu\n", szApplicationName, GetLastError()); + goto cleanup; + } + + CloseHandle(ProcessInformation.hProcess); + CloseHandle(ProcessInformation.hThread); + +cleanup: + RevertToSelf(); + if (hKey) + RegCloseKey(hKey); + if (ret) + SystemParametersInfoW(SPI_SETSCREENSAVERRUNNING, TRUE, NULL, 0); + else + { + PostMessageW(Session->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_SCRNSVR_ACTIVITY, 0); + InterlockedExchange((LONG*)&Session->LastActivity, GetTickCount()); + } +} 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 Thu Aug 10 22:37:03 2006 @@ -66,7 +66,7 @@ TRACE("WL: Attempting to open event \"SvcctrlStartEvent_A3725DX\"\n"); ServicesInitEvent = OpenEventW( - EVENT_ALL_ACCESS, //SYNCHRONIZE, + SYNCHRONIZE, FALSE, L"SvcctrlStartEvent_A3725DX"); if (ServicesInitEvent) @@ -481,13 +481,13 @@ /* Display logged out screen */ WLSession->LogonStatus = WKSTA_IS_LOGGED_OFF; RemoveStatusMessage(WLSession); - DispatchSAS(WLSession, WLX_SAS_TYPE_TIMEOUT); + PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_TIMEOUT, 0); /* Message loop for the SAS window */ - while (GetMessage(&Msg, WLSession->SASWindow, 0, 0)) + while (GetMessageW(&Msg, WLSession->SASWindow, 0, 0)) { TranslateMessage(&Msg); - DispatchMessage(&Msg); + DispatchMessageW(&Msg); } /* We never go there */ 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 Thu Aug 10 22:37:03 2006 @@ -87,7 +87,7 @@ PFWLXSHUTDOWN WlxShutdown; /* Functions available if WlxVersion >= WLX_VERSION_1_1 (MS Windows 3.5.1) */ - PFWLXSCREENSAVERNOTIFY WlxScreenSaverNotify; /* optional, not called ATM */ + PFWLXSCREENSAVERNOTIFY WlxScreenSaverNotify; /* optional */ PFWLXSTARTAPPLICATION WlxStartApplication; /* optional, not called ATM */ /* Functions available if WlxVersion >= WLX_VERSION_1_2 (MS Windows NT 4.0) */ @@ -123,7 +123,6 @@ { GINAINSTANCE Gina; DWORD SASAction; - DWORD LogonStatus; BOOL SuppressStatus; BOOL TaskManHotkey; HWND SASWindow; @@ -134,8 +133,16 @@ HDESK ScreenSaverDesktop; LUID LogonId; HANDLE UserToken; - + DWORD LogonStatus; DWORD DialogTimeout; /* Timeout for dialog boxes, in seconds */ + + /* Screen-saver informations */ + HHOOK KeyboardHook; + HHOOK MouseHook; + HANDLE hEndOfScreenSaverThread; + HANDLE hScreenSaverParametersChanged; + HANDLE hUserActivity; + DWORD LastActivity; /* Logon informations */ DWORD Options; @@ -164,13 +171,18 @@ DWORD dwReserved); /* sas.c */ +BOOL +InitializeSAS( + IN OUT PWLSESSION Session); + +/* screensaver.c */ +BOOL +InitializeScreenSaver( + IN OUT PWLSESSION Session); + VOID -DispatchSAS( - IN OUT PWLSESSION Session, - IN DWORD dwSasType); -BOOL -InitializeSAS( - IN OUT PWLSESSION Session); +StartScreenSaver( + IN PWLSESSION Session); /* winlogon.c */ BOOL 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 Thu Aug 10 22:37:03 2006 @@ -11,6 +11,7 @@ <library>userenv</library> <library>secur32</library> <file>sas.c</file> + <file>screensaver.c</file> <file>setup.c</file> <file>winlogon.c</file> <file>wlx.c</file> 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 Thu Aug 10 22:37:03 2006 @@ -86,8 +86,12 @@ HANDLE hWlx, DWORD dwSasType) { + PWLSESSION Session = (PWLSESSION)hWlx; + TRACE("WlxSasNotify(0x%lx)\n", dwSasType); - DispatchSAS((PWLSESSION)hWlx, dwSasType); + + if (dwSasType == WLX_SAS_TYPE_CTRL_ALT_DEL || dwSasType > WLX_SAS_TYPE_MAX_MSFT_VALUE) + PostMessageW(Session->SASWindow, WLX_WM_SAS, dwSasType, 0); } /* @@ -558,6 +562,16 @@ return TRUE; } +static BOOL WINAPI +DefaultWlxScreenSaverNotify( + IN PVOID pWlxContext, + IN OUT BOOL *pSecure) +{ + if (*pSecure) + *pSecure = WLSession->Gina.Functions.WlxIsLogoffOk(pWlxContext); + return TRUE; +} + static BOOL LoadGina( IN OUT PGINAFUNCTIONS Functions, @@ -640,6 +654,10 @@ if (!Functions->WlxRemoveStatusMessage) goto cleanup; } + /* Provide some default functions */ + if (!Functions->WlxScreenSaverNotify) + Functions->WlxScreenSaverNotify = DefaultWlxScreenSaverNotify; + ret = TRUE; cleanup:

1 0

[martinf] 23539: some commentary changes
by martinf＠svn.reactos.org 09 Aug '06

09 Aug '06

Author: martinf Date: Thu Aug 10 01:27:05 2006 New Revision: 23539 URL: http://svn.reactos.org/svn/reactos?rev=23539&view=rev Log: some commentary changes Modified: trunk/reactos/base/shell/explorer/desktop/desktop.h trunk/reactos/base/shell/explorer/explorer-bn.rc trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp trunk/reactos/base/shell/explorer/utility/xmlstorage.h trunk/reactos/base/shell/explorer/utility/xs-native.cpp Modified: trunk/reactos/base/shell/explorer/desktop/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.h (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.h Thu Aug 10 01:27:05 2006 @@ -31,7 +31,7 @@ #define PM_DISPLAY_VERSION (WM_APP+0x24) - /// subclassed Background window behind the visible desktop window + /// subclassed background window behind the visible desktop window struct BackgroundWindow : public SubclassedWindow { typedef SubclassedWindow super; Modified: trunk/reactos/base/shell/explorer/explorer-bn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bn.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-bn.rc Thu Aug 10 01:27:05 2006 @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// Bengali resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 @@ -379,7 +379,7 @@ IDS_TASKBAR "Kvh©Kvix `Û" END -#endif // English (U.S.) resources +#endif // Bengali resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp Thu Aug 10 01:27:05 2006 @@ -1285,7 +1285,7 @@ _tsplitpath_s(path, drv1, COUNTOF(drv1), NULL, 0, NULL, 0, NULL, 0); // search for a already open window for the same drive - for(child_wnd=::GetNextWindow(_hmdiclient,GW_CHILD); child_wnd; child_wnd=::GetNextWindow(child_wnd, GW_HWNDNEXT)) { + for(child_wnd=GetNextWindow(_hmdiclient,GW_CHILD); child_wnd; child_wnd=GetNextWindow(child_wnd, GW_HWNDNEXT)) { FileChildWindow* child = (FileChildWindow*) SendMessage(child_wnd, PM_GET_FILEWND_PTR, 0, 0); if (child) { @@ -1310,7 +1310,7 @@ HWND child_wnd; // search for a already open window of the given file system name - for(child_wnd=::GetNextWindow(_hmdiclient,GW_CHILD); child_wnd; child_wnd=::GetNextWindow(child_wnd, GW_HWNDNEXT)) { + for(child_wnd=GetNextWindow(_hmdiclient,GW_CHILD); child_wnd; child_wnd=GetNextWindow(child_wnd, GW_HWNDNEXT)) { FileChildWindow* child = (FileChildWindow*) SendMessage(child_wnd, PM_GET_FILEWND_PTR, 0, 0); if (child) { Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp Thu Aug 10 01:27:05 2006 @@ -1,11 +1,12 @@ // - // XML storage classes - // - // xmlstorage.cpp + // XML storage classes Version 1.1 // // Copyright (c) 2004, 2005, 2006 Martin Fuchs <martin-fuchs(a)gmx.net> // + + /// \file xmlstorage.cpp + /// XMLStorage implementation file /* @@ -593,7 +594,6 @@ } - void XMLFormat::print_header(std::ostream& out, bool lf) const { out << "<?xml version=\"" << _version << "\" encoding=\"" << _encoding << "\""; Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h Thu Aug 10 01:27:05 2006 @@ -1,11 +1,12 @@ // - // XML storage classes - // - // xmlstorage.h + // XML storage classes Version 1.1 // // Copyright (c) 2004, 2005, 2006 Martin Fuchs <martin-fuchs(a)gmx.net> // + + /// \file xmlstorage.h + /// XMLStorage header file /* @@ -347,14 +348,14 @@ #ifndef XS_STRING_UTF8 // from UTF-8 to XS internal string encoding -inline void assign_utf8(XS_String& s, const char* str, int lutf8) +inline void assign_utf8(XS_String& s, const char* str, size_t lutf8) { #ifdef UNICODE LPTSTR buffer = (LPTSTR)alloca(sizeof(TCHAR)*lutf8); - int l = MultiByteToWideChar(CP_UTF8, 0, str, lutf8, buffer, lutf8); + int l = MultiByteToWideChar(CP_UTF8, 0, str, (int)lutf8, buffer, (int)lutf8); #else LPWSTR wbuffer = (LPWSTR)alloca(sizeof(WCHAR)*lutf8); - int l = MultiByteToWideChar(CP_UTF8, 0, str, lutf8, wbuffer, lutf8); + int l = MultiByteToWideChar(CP_UTF8, 0, str, (int)lutf8, wbuffer, (int)lutf8); int bl=2*l; LPSTR buffer = (LPSTR)alloca(bl); l = WideCharToMultiByte(CP_ACP, 0, wbuffer, l, buffer, bl, 0, 0); @@ -419,6 +420,7 @@ typedef std::filebuf STDIO_FILEBUF; #endif + /// base class for XMLStorage::tifstream and XMLStorage::tofstream struct FileHolder { FileHolder(LPCTSTR path, LPCTSTR mode) @@ -553,6 +555,7 @@ int _error_code; }; + /// list of XMLError entries struct XMLErrorList : public std::list<XMLError> { XS_String str() const; @@ -594,6 +597,7 @@ }; + /// XML Stylesheet entry struct StyleSheet { std::string _href; // CDATA #REQUIRED @@ -616,9 +620,10 @@ void print(std::ostream& out) const; }; + /// list of StyleSheet entries struct StyleSheetList : public std::list<StyleSheet> { - void set(const StyleSheet& stylesheet) + void set(const StyleSheet& stylesheet) { clear(); push_back(stylesheet); @@ -626,6 +631,7 @@ }; + /// XML document type description struct DocType { std::string _name; @@ -683,6 +689,7 @@ struct XMLNode : public XS_String { #if defined(UNICODE) && !defined(XS_STRING_UTF8) + /// map of XML node attributes // optimized read access without temporary A/U conversion when using ASCII attribute names struct AttributeMap : public std::map<XS_String, XS_String> { @@ -718,6 +725,7 @@ } }; #else + /// map of XML node attributes struct AttributeMap : public std::map<XS_String, XS_String> { XS_String get(const char* x, LPXSSTR def=XS_EMPTY_STR) const @@ -2280,6 +2288,7 @@ }; + /// helper structure to read XML messages from strings struct XMLMessageFromString : public XMLMessage { XMLMessageFromString(const std::string& xml_str, const std::string& system_id=std::string()) @@ -2308,6 +2317,7 @@ }; + /// on the fly XML writer struct XMLWriter { XMLWriter(std::ostream& out, const XMLFormat& format=XMLFormat()) @@ -2399,6 +2409,7 @@ typedef XMLNode::AttributeMap AttrMap; + /// container for XMLWriter state information struct StackEntry { XS_String _node_name; AttrMap _attributes; Modified: trunk/reactos/base/shell/explorer/utility/xs-native.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xs-native.cpp (original) +++ trunk/reactos/base/shell/explorer/utility/xs-native.cpp Thu Aug 10 01:27:05 2006 @@ -1,11 +1,12 @@ // - // XML storage classes - // - // xs-native.cpp + // XML storage classes Version 1.1 // // Copyright (c) 2006 Martin Fuchs <martin-fuchs(a)gmx.net> // + + /// \file xs-native.cpp + /// native internal XMLStorage parser /* @@ -70,6 +71,8 @@ } + /// line buffer for XS-native parser + struct Buffer { Buffer()

1 0

[martinf] 23538: refresh shell background in response to system color changes
by martinf＠svn.reactos.org 09 Aug '06

09 Aug '06

Author: martinf Date: Thu Aug 10 00:10:41 2006 New Revision: 23538 URL: http://svn.reactos.org/svn/reactos?rev=23538&view=rev Log: refresh shell background in response to system color changes Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp Thu Aug 10 00:10:41 2006 @@ -457,6 +457,14 @@ } goto def; + case WM_SYSCOLORCHANGE: + // redraw background window + InvalidateRect(g_Globals._hwndShellView, NULL, TRUE); + + // forward message to shell view window to redraw icon backgrounds + SendMessage(g_Globals._hwndShellView, WM_SYSCOLORCHANGE, wparam, lparam); + break; + default: def: return super::WndProc(nmsg, wparam, lparam); } @@ -480,7 +488,7 @@ : super(hwnd), _pShellView(pShellView) { - _hwndListView = ::GetNextWindow(hwnd, GW_CHILD); + _hwndListView = GetNextWindow(hwnd, GW_CHILD); SetWindowStyle(_hwndListView, GetWindowStyle(_hwndListView)&~LVS_ALIGNMASK);//|LVS_ALIGNTOP|LVS_AUTOARRANGE);

1 0

[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 09 Aug '06

09 Aug '06

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 (),

1 0

[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 09 Aug '06

09 Aug '06

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>

1 0

[jimtabor] 23535: Fireball fix for fast interlocks.
by jimtabor＠svn.reactos.org 09 Aug '06

09 Aug '06

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:

1 0

[hpoussin] 23534: Check if logoff succeeded before continuing Check if shutdown succeeded before calling kernel
by hpoussin＠svn.reactos.org 09 Aug '06

09 Aug '06

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(

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