Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[janderwald] 23547: * put application name in quotes when lpCommandLine is != NULL
by janderwald＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: janderwald Date: Sat Aug 12 18:10:31 2006 New Revision: 23547 URL: http://svn.reactos.org/svn/reactos?rev=23547&view=rev Log: * put application name in quotes when lpCommandLine is != NULL Modified: trunk/reactos/dll/win32/kernel32/process/create.c Modified: trunk/reactos/dll/win32/kernel32/process/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/create.c (original) +++ trunk/reactos/dll/win32/kernel32/process/create.c Sat Aug 12 18:10:31 2006 @@ -673,7 +673,7 @@ * key (see http://blogs.msdn.com/oldnewthing/archive/2005/12/19/505449.aspx) */ - DPRINT("CreateProcessW: lpApplicationName: %S lpCommandLine: %S" + DPRINT1("CreateProcessW: lpApplicationName: %S lpCommandLine: %S" " lpEnvironment: %p lpCurrentDirectory: %S dwCreationFlags: %lx\n", lpApplicationName, lpCommandLine, lpEnvironment, lpCurrentDirectory, dwCreationFlags); @@ -1226,6 +1226,64 @@ } DPRINT("Quoted CmdLine: %S\n", QuotedCmdLine); + } + else if(lpApplicationName && lpCommandLine) + { + int len; + int Size = 0; + WCHAR * AppName; + + AppName = wcsrchr(lpApplicationName, L'\\'); + if (AppName) + { + AppName++; + } + else + { + AppName = (WCHAR*)lpApplicationName; + } + + len = wcslen(AppName); + if (!_wcsnicmp(AppName, lpCommandLine, len-4) && lpCommandLine[len-4] == L' ') + { + /* remove application name */ + NullBuffer = wcschr(lpCommandLine, L' '); + } + else + { + NullBuffer = (WCHAR*)lpCommandLine; + } + + if (NullBuffer) + { + Size = wcslen(NullBuffer) + 1; + } + + /* Allocate a buffer */ + QuotedCmdLine = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (Size + wcslen(lpApplicationName) + 2 + 1) * + sizeof(WCHAR)); + if (QuotedCmdLine == NULL) + { + DPRINT1("Cannot allocate memory for quoted command line\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto Cleanup; + } + + /* Copy the first quote */ + wcscpy(QuotedCmdLine, L"\""); + + /* Add the command line and the finishing quote */ + wcscat(QuotedCmdLine, lpApplicationName); + wcscat(QuotedCmdLine, L"\""); + + if (Size) + { + wcscat(QuotedCmdLine, L" "); + wcscat(QuotedCmdLine, NullBuffer); + } + lpCommandLine = QuotedCmdLine; } if (Escape)

1 0

[gedmurphy] 23546: [AUDIT] packet.dll 3rd party lib from winpcap
by gedmurphy＠svn.reactos.org 12 Aug '06

12 Aug '06

Author: gedmurphy Date: Sat Aug 12 15:01:41 2006 New Revision: 23546 URL: http://svn.reactos.org/svn/reactos?rev=23546&view=rev Log: [AUDIT] packet.dll 3rd party lib from winpcap Modified: trunk/reactos/dll/win32/packet/Packet32.c (props changed) trunk/reactos/dll/win32/packet/include/packet32.h (props changed) trunk/reactos/dll/win32/packet/packet.def (props changed) trunk/reactos/dll/win32/packet/packet.rc (props changed) trunk/reactos/dll/win32/packet/resource.h (props changed) trunk/reactos/dll/win32/packet/trace.c (props changed) trunk/reactos/dll/win32/packet/trace.h (props changed) Propchange: trunk/reactos/dll/win32/packet/Packet32.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/packet/include/packet32.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/packet/packet.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/packet/packet.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/packet/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/packet/trace.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/packet/trace.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 23545: - Remove non-needed checks from GetClassInfoA/W, because they are performed in GetClassInfoExA/W or not performed in Windows at all - So now GetClassInfoA/W implementations are correct and all hacks are moved to GetClassInfoExA/W. This doesn't fix Abiword, but might fix direct calls to GetClassInfoExA/W which might fail due to not set "cbSize" member of WNDCLASS struct. I marked this as HACKHACK for further investigation and removal.
by fireball＠svn.reactos.org 11 Aug '06

11 Aug '06

Author: fireball Date: Sat Aug 12 01:24:11 2006 New Revision: 23545 URL: http://svn.reactos.org/svn/reactos?rev=23545&view=rev Log: - Remove non-needed checks from GetClassInfoA/W, because they are performed in GetClassInfoExA/W or not performed in Windows at all - So now GetClassInfoA/W implementations are correct and all hacks are moved to GetClassInfoExA/W. This doesn't fix Abiword, but might fix direct calls to GetClassInfoExA/W which might fail due to not set "cbSize" member of WNDCLASS struct. I marked this as HACKHACK for further investigation and removal. Modified: trunk/reactos/dll/win32/user32/windows/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c (original) +++ trunk/reactos/dll/win32/user32/windows/class.c Sat Aug 12 01:24:11 2006 @@ -21,17 +21,25 @@ BOOL STDCALL GetClassInfoExA( - HINSTANCE hinst, + HINSTANCE hInstance, LPCSTR lpszClass, LPWNDCLASSEXA lpwcx) { UNICODE_STRING ClassName = {0}; BOOL Ret; - TRACE("%p class/atom: %s/%04x %p\n", hinst, + TRACE("%p class/atom: %s/%04x %p\n", hInstance, IS_ATOM(lpszClass) ? NULL : lpszClass, IS_ATOM(lpszClass) ? lpszClass : 0, lpwcx); + + //HACKHACK: This is ROS-specific and should go away + lpwcx->cbSize = sizeof(*lpwcx); + + if (hInstance == User32Instance) + { + hInstance = NULL; + } if (lpszClass == NULL) { @@ -59,7 +67,7 @@ ControlsInitialized = ControlsInit(ClassName.Buffer); } - Ret = NtUserGetClassInfo(hinst, + Ret = NtUserGetClassInfo(hInstance, &ClassName, (LPWNDCLASSEXW)lpwcx, TRUE); @@ -79,17 +87,25 @@ BOOL STDCALL GetClassInfoExW( - HINSTANCE hinst, + HINSTANCE hInstance, LPCWSTR lpszClass, LPWNDCLASSEXW lpwcx) { UNICODE_STRING ClassName = {0}; - TRACE("%p class/atom: %S/%04x %p\n", hinst, + TRACE("%p class/atom: %S/%04x %p\n", hInstance, IS_ATOM(lpszClass) ? NULL : lpszClass, IS_ATOM(lpszClass) ? lpszClass : 0, lpwcx); + //HACKHACK: This is ROS-specific and should go away + lpwcx->cbSize = sizeof(*lpwcx); + + if (hInstance == User32Instance) + { + hInstance = NULL; + } + if (lpszClass == NULL) { SetLastError(ERROR_INVALID_PARAMETER); @@ -112,7 +128,7 @@ ControlsInitialized = ControlsInit(ClassName.Buffer); } - return NtUserGetClassInfo(hinst, + return NtUserGetClassInfo(hInstance, &ClassName, lpwcx, FALSE); @@ -129,27 +145,25 @@ LPCSTR lpClassName, LPWNDCLASSA lpWndClass) { - WNDCLASSEXA w; - BOOL retval; - - if ( !lpClassName || !lpWndClass ) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if ( hInstance == User32Instance ) - { - hInstance = NULL; - } - - w.cbSize = sizeof(w); - retval = GetClassInfoExA(hInstance,lpClassName,&w); - if (retval) - { - RtlCopyMemory ( lpWndClass, &w.style, sizeof(WNDCLASSA) ); - } - return retval; + WNDCLASSEXA wcex; + BOOL retval; + + retval = GetClassInfoExA(hInstance, lpClassName, &wcex); + if (retval) + { + lpWndClass->style = wcex.style; + lpWndClass->lpfnWndProc = wcex.lpfnWndProc; + lpWndClass->cbClsExtra = wcex.cbClsExtra; + lpWndClass->cbWndExtra = wcex.cbWndExtra; + lpWndClass->hInstance = wcex.hInstance; + lpWndClass->hIcon = wcex.hIcon; + lpWndClass->hCursor = wcex.hCursor; + lpWndClass->hbrBackground = wcex.hbrBackground; + lpWndClass->lpszMenuName = wcex.lpszMenuName; + lpWndClass->lpszClassName = wcex.lpszClassName; + } + + return retval; } /* @@ -162,29 +176,25 @@ LPCWSTR lpClassName, LPWNDCLASSW lpWndClass) { - WNDCLASSEXW w; - BOOL retval; - - if(!lpClassName || !lpWndClass) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if ( hInstance == User32Instance ) - { - hInstance = NULL; - } - - w.cbSize = sizeof(w); - retval = GetClassInfoExW(hInstance,lpClassName,&w); - if (retval) - { - RtlCopyMemory (lpWndClass,&w.style,sizeof(WNDCLASSW)); - } - return retval; -} - + WNDCLASSEXW wcex; + BOOL retval; + + retval = GetClassInfoExW(hInstance, lpClassName, &wcex); + if (retval) + { + lpWndClass->style = wcex.style; + lpWndClass->lpfnWndProc = wcex.lpfnWndProc; + lpWndClass->cbClsExtra = wcex.cbClsExtra; + lpWndClass->cbWndExtra = wcex.cbWndExtra; + lpWndClass->hInstance = wcex.hInstance; + lpWndClass->hIcon = wcex.hIcon; + lpWndClass->hCursor = wcex.hCursor; + lpWndClass->hbrBackground = wcex.hbrBackground; + lpWndClass->lpszMenuName = wcex.lpszMenuName; + lpWndClass->lpszClassName = wcex.lpszClassName; + } + return retval; +} /* * @implemented

1 0

[fireball] 23544: Computer name must always be uppercased, even despite it is an example
by fireball＠svn.reactos.org 11 Aug '06

11 Aug '06

Author: fireball Date: Fri Aug 11 13:05:24 2006 New Revision: 23544 URL: http://svn.reactos.org/svn/reactos?rev=23544&view=rev Log: Computer name must always be uppercased, even despite it is an example Modified: trunk/reactos/boot/bootdata/unattend.inf.sample Modified: trunk/reactos/boot/bootdata/unattend.inf.sample URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/unattend.inf… ============================================================================== --- trunk/reactos/boot/bootdata/unattend.inf.sample (original) +++ trunk/reactos/boot/bootdata/unattend.inf.sample Fri Aug 11 13:05:24 2006 @@ -10,7 +10,7 @@ MBRInstallType=2 FullName="MyName" ;OrgName="MyOrg" -ComputerName="MyComputerName"; +ComputerName="MYCOMPUTERNAME"; AdminPassword="MyPassword" ; TimeZone is set GMT as default TimeZoneIndex=85

1 0

[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

← Newer
1
...
28
29
30
31
32
33
34
...
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