Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

01/01: [WINLOGON] Clean up part 2 - Replace the UNICODE_STRING usMessage by a PWSTR pszMessage. - Use the "%02d:%02d:%02d" time format and get rid of the safe string printf because the string will NEVER be longer than 8 characters. - Rename the timer id constant because it is NOT a resource id. - Rename variables according to the coding style.
by Eric Kohl 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ae45852502a588f9a3b1… commit 2ae45852502a588f9a3b1be69da388bbc587567e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 2 12:47:15 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 2 12:47:15 2018 +0200 [WINLOGON] Clean up part 2 - Replace the UNICODE_STRING usMessage by a PWSTR pszMessage. - Use the "%02d:%02d:%02d" time format and get rid of the safe string printf because the string will NEVER be longer than 8 characters. - Rename the timer id constant because it is NOT a resource id. - Rename variables according to the coding style. --- base/system/winlogon/shutdown.c | 68 +++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index 71b1f6052b..8a8a0c9fbd 100644 --- a/base/system/winlogon/shutdown.c +++ b/base/system/winlogon/shutdown.c @@ -10,19 +10,19 @@ #include "winlogon.h" -#include <ntstrsafe.h> #include <rpc.h> #include <winreg_s.h> /* DEFINES *******************************************************************/ -#define IDT_SYSSHUTDOWN 2000 +#define SHUTDOWN_TIMER_ID 2000 + /* STRUCTS *******************************************************************/ typedef struct _SYS_SHUTDOWN_PARAMS { - UNICODE_STRING usMessage; + PWSTR pszMessage; ULONG dwTimeout; BOOLEAN bRebootAfterShutdown; BOOLEAN bForceAppsClosed; @@ -32,10 +32,12 @@ typedef struct _SYS_SHUTDOWN_PARAMS BOOLEAN bShuttingDown; } SYS_SHUTDOWN_PARAMS, *PSYS_SHUTDOWN_PARAMS; + /* GLOBALS *******************************************************************/ SYS_SHUTDOWN_PARAMS g_ShutdownParams; + /* FUNCTIONS *****************************************************************/ static @@ -44,17 +46,17 @@ OnTimer( HWND hwndDlg, PSYS_SHUTDOWN_PARAMS pShutdownParams) { - WCHAR strbuf[34]; - INT seconds, minutes, hours; + WCHAR szBuffer[10]; + INT iSeconds, iMinutes, iHours; - seconds = (INT)pShutdownParams->dwTimeout; - hours = seconds / 3600; - seconds -= hours * 3600; - minutes = seconds / 60; - seconds -= minutes * 60; + iSeconds = (INT)pShutdownParams->dwTimeout; + iHours = iSeconds / 3600; + iSeconds -= iHours * 3600; + iMinutes = iSeconds / 60; + iSeconds -= iMinutes * 60; - RtlStringCbPrintfW(strbuf, sizeof(strbuf), L"%d:%d:%d", hours, minutes, seconds); - SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, strbuf); + swprintf(szBuffer, L"%02d:%02d:%02d", iHours, iMinutes, iSeconds); + SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, szBuffer); if (pShutdownParams->dwTimeout == 0) { @@ -89,28 +91,30 @@ ShutdownDialogProc( pShutdownParams->hShutdownDialog = hwndDlg; - if (pShutdownParams->usMessage.Length) + if (pShutdownParams->pszMessage) { SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNCOMMENT, - pShutdownParams->usMessage.Buffer); + pShutdownParams->pszMessage); } + RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + PostMessage(hwndDlg, WM_TIMER, 0, 0); - SetTimer(hwndDlg, IDT_SYSSHUTDOWN, 1000, NULL); + SetTimer(hwndDlg, SHUTDOWN_TIMER_ID, 1000, NULL); break; case WM_CLOSE: pShutdownParams->hShutdownDialog = NULL; pShutdownParams->bShuttingDown = FALSE; - KillTimer(hwndDlg, IDT_SYSSHUTDOWN); + KillTimer(hwndDlg, SHUTDOWN_TIMER_ID); - if (pShutdownParams->usMessage.Buffer) + if (pShutdownParams->pszMessage) { - HeapFree(GetProcessHeap(), 0, pShutdownParams->usMessage.Buffer); - RtlInitEmptyUnicodeString(&pShutdownParams->usMessage, NULL, 0); + HeapFree(GetProcessHeap(), 0, pShutdownParams->pszMessage); + pShutdownParams->pszMessage = NULL; } EndDialog(hwndDlg, 0); @@ -149,11 +153,12 @@ InitiateSystemShutdownThread( return ERROR_SUCCESS; } - if (pShutdownParams->usMessage.Buffer) + if (pShutdownParams->pszMessage) { - HeapFree(GetProcessHeap(), 0, pShutdownParams->usMessage.Buffer); - RtlInitEmptyUnicodeString(&pShutdownParams->usMessage, NULL, 0); + HeapFree(GetProcessHeap(), 0, pShutdownParams->pszMessage); + pShutdownParams->pszMessage = NULL; } + pShutdownParams->bShuttingDown = FALSE; return GetLastError(); @@ -185,19 +190,22 @@ StartSystemShutdown( if (lpMessage && lpMessage->Length && lpMessage->Buffer) { - g_ShutdownParams.usMessage.Buffer = HeapAlloc(GetProcessHeap(), 0, lpMessage->Length + sizeof(UNICODE_NULL)); - if (g_ShutdownParams.usMessage.Buffer == NULL) + g_ShutdownParams.pszMessage = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + lpMessage->Length + sizeof(UNICODE_NULL)); + if (g_ShutdownParams.pszMessage == NULL) { g_ShutdownParams.bShuttingDown = FALSE; return GetLastError(); } - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, g_ShutdownParams.usMessage.Buffer, lpMessage->Length + sizeof(UNICODE_NULL)); - RtlCopyUnicodeString(&(g_ShutdownParams.usMessage), (PUNICODE_STRING)lpMessage); + wcsncpy(g_ShutdownParams.pszMessage, + lpMessage->Buffer, + lpMessage->Length / sizeof(WCHAR)); } else { - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); + g_ShutdownParams.pszMessage = NULL; } g_ShutdownParams.dwTimeout = dwTimeout; @@ -212,10 +220,10 @@ StartSystemShutdown( return ERROR_SUCCESS; } - if (g_ShutdownParams.usMessage.Buffer) + if (g_ShutdownParams.pszMessage) { - HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); + HeapFree(GetProcessHeap(), 0, g_ShutdownParams.pszMessage); + g_ShutdownParams.pszMessage = NULL; } g_ShutdownParams.bShuttingDown = FALSE;

1 0

01/01: [CMAKE] Avoid generator expresisons in install()'s RENAME argument. CORE-14509
by Thomas Faber 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e6f3ef12b07fe0ddfcf6… commit 9e6f3ef12b07fe0ddfcf6618b7aacb7089bd83e3 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Apr 2 09:57:51 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Apr 2 10:07:38 2018 +0200 [CMAKE] Avoid generator expresisons in install()'s RENAME argument. CORE-14509 This fixes rostests_install, and thus hopefully WHS-Testbot. --- sdk/cmake/CMakeMacros.cmake | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index c2b3f37da0..020ccc47ad 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -855,14 +855,15 @@ function(add_rostests_file) message(FATAL_ERROR "You must provide a target or a file to install!") endif() + set(_ROSTESTS_NAME_ON_CD "${_ROSTESTS_RENAME}") if(NOT _ROSTESTS_FILE) set(_ROSTESTS_FILE "$<TARGET_FILE:${_ROSTESTS_TARGET}>") if(NOT _ROSTESTS_RENAME) - set(_ROSTESTS_RENAME "$<TARGET_FILE_NAME:${_ROSTESTS_TARGET}>") + set(_ROSTESTS_NAME_ON_CD "$<TARGET_FILE_NAME:${_ROSTESTS_TARGET}>") endif() else() if(NOT _ROSTESTS_RENAME) - get_filename_component(_ROSTESTS_RENAME ${_ROSTESTS_FILE} NAME) + get_filename_component(_ROSTESTS_NAME_ON_CD ${_ROSTESTS_FILE} NAME) endif() endif() @@ -871,12 +872,16 @@ function(add_rostests_file) endif() if(_ROSTESTS_TARGET) - add_cd_file(TARGET ${_ROSTESTS_TARGET} FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" NAME_ON_CD ${_ROSTESTS_RENAME} FOR all) + add_cd_file(TARGET ${_ROSTESTS_TARGET} FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" NAME_ON_CD ${_ROSTESTS_NAME_ON_CD} FOR all) else() - add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" NAME_ON_CD ${_ROSTESTS_RENAME} FOR all) + add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" NAME_ON_CD ${_ROSTESTS_NAME_ON_CD} FOR all) endif() if(DEFINED ENV{ROSTESTS_INSTALL}) - install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests RENAME ${_ROSTESTS_RENAME}) + if(_ROSTESTS_RENAME) + install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests RENAME ${_ROSTESTS_RENAME}) + else() + install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests) + endif() endif() endfunction()

1 0

01/01: [ADVAPI32_WINETEST] Revert service.c changes from 3c1b7834e1 to avoid testbot hangs. CORE-14521 CORE-14434
by Thomas Faber 02 Apr '18

02 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a67df65c4f5337f140437… commit a67df65c4f5337f14043709ae758361f0b0a3b31 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Apr 2 10:01:29 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Apr 2 10:03:46 2018 +0200 [ADVAPI32_WINETEST] Revert service.c changes from 3c1b7834e1 to avoid testbot hangs. CORE-14521 CORE-14434 --- modules/rostests/winetests/advapi32/service.c | 205 +++++--------------------- 1 file changed, 33 insertions(+), 172 deletions(-) diff --git a/modules/rostests/winetests/advapi32/service.c b/modules/rostests/winetests/advapi32/service.c index 8c13fbb2c6..a85bdf8863 100644 --- a/modules/rostests/winetests/advapi32/service.c +++ b/modules/rostests/winetests/advapi32/service.c @@ -36,7 +36,6 @@ static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms static CHAR selfname[MAX_PATH]; static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); -static BOOL (WINAPI *pChangeServiceConfig2W)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pEnumServicesStatusExA)(SC_HANDLE, SC_ENUM_TYPE, DWORD, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD, LPDWORD, LPCSTR); @@ -58,7 +57,6 @@ static void init_function_pointers(void) HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); pChangeServiceConfig2A = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2A"); - pChangeServiceConfig2W = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2W"); pEnumServicesStatusExA= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExA"); pEnumServicesStatusExW= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExW"); pGetSecurityInfo = (void *)GetProcAddress(hadvapi32, "GetSecurityInfo"); @@ -1956,7 +1954,6 @@ static void test_queryconfig2(void) DWORD expected, needed; BYTE buffer[MAX_PATH]; LPSERVICE_DESCRIPTIONA pConfig = (LPSERVICE_DESCRIPTIONA)buffer; - LPSERVICE_DESCRIPTIONW pConfigW = (LPSERVICE_DESCRIPTIONW)buffer; SERVICE_PRESHUTDOWN_INFO preshutdown_info; static const CHAR servicename [] = "Winetest"; static const CHAR displayname [] = "Winetest dummy service"; @@ -1964,9 +1961,6 @@ static void test_queryconfig2(void) static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0"; static const CHAR password [] = ""; static const CHAR description [] = "Description"; - static const CHAR description_empty[] = ""; - static const WCHAR descriptionW [] = {'D','e','s','c','r','i','p','t','i','o','n','W',0}; - static const WCHAR descriptionW_empty[] = {0}; if(!pQueryServiceConfig2A) { @@ -2127,66 +2121,6 @@ static void test_queryconfig2(void) ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer, needed,&needed); ok(ret, "expected QueryServiceConfig2W to succeed\n"); - pConfig->lpDescription = (LPSTR)description; - ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); - ok(ret, "expected ChangeServiceConfig2A to succeed\n"); - - pConfig->lpDescription = NULL; - ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); - ok(ret, "expected QueryServiceConfig2A to succeed\n"); - ok(pConfig->lpDescription && !strcmp(description, pConfig->lpDescription), - "expected lpDescription to be %s, got %s\n", description, pConfig->lpDescription); - - pConfig->lpDescription = NULL; - ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); - ok(ret, "expected ChangeServiceConfig2A to succeed\n"); - - pConfig->lpDescription = NULL; - ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); - ok(ret, "expected QueryServiceConfig2A to succeed\n"); - ok(pConfig->lpDescription && !strcmp(description, pConfig->lpDescription), - "expected lpDescription to be %s, got %s\n", description, pConfig->lpDescription); - - pConfig->lpDescription = (LPSTR)description_empty; - ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); - ok(ret, "expected ChangeServiceConfig2A to succeed\n"); - - pConfig->lpDescription = (void*)0xdeadbeef; - ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); - ok(ret, "expected QueryServiceConfig2A to succeed\n"); - ok(!pConfig->lpDescription, - "expected lpDescription to be null, got %s\n", pConfig->lpDescription); - - pConfigW->lpDescription = (LPWSTR)descriptionW; - ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); - ok(ret, "expected ChangeServiceConfig2W to succeed\n"); - - pConfigW->lpDescription = NULL; - ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); - ok(ret, "expected QueryServiceConfig2A to succeed\n"); - ok(pConfigW->lpDescription && !lstrcmpW(descriptionW, pConfigW->lpDescription), - "expected lpDescription to be %s, got %s\n", wine_dbgstr_w(descriptionW), wine_dbgstr_w(pConfigW->lpDescription)); - - pConfigW->lpDescription = NULL; - ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); - ok(ret, "expected ChangeServiceConfig2W to succeed\n"); - - pConfigW->lpDescription = NULL; - ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); - ok(ret, "expected QueryServiceConfig2A to succeed\n"); - ok(pConfigW->lpDescription && !lstrcmpW(descriptionW, pConfigW->lpDescription), - "expected lpDescription to be %s, got %s\n", wine_dbgstr_w(descriptionW), wine_dbgstr_w(pConfigW->lpDescription)); - - pConfigW->lpDescription = (LPWSTR)descriptionW_empty; - ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); - ok(ret, "expected ChangeServiceConfig2W to succeed\n"); - - pConfigW->lpDescription = (void*)0xdeadbeef; - ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); - ok(ret, "expected QueryServiceConfig2A to succeed\n"); - ok(!pConfigW->lpDescription, - "expected lpDescription to be null, got %s\n", wine_dbgstr_w(pConfigW->lpDescription)); - SetLastError(0xdeadbeef); ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, (LPBYTE)&preshutdown_info, sizeof(preshutdown_info), &needed); @@ -2266,146 +2200,73 @@ static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, DWORD is_nt4 return le1; } -#define PHASE_STOPPED 1 -#define PHASE_RUNNING 2 - struct notify_data { SERVICE_NOTIFYW notify; SC_HANDLE svc; - BOOL was_called; - DWORD phase; }; -static void CALLBACK notify_cb(void *user) +static void CALLBACK cb_stopped(void *user) { struct notify_data *data = user; - switch (data->phase) - { - case PHASE_STOPPED: - ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, - "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); - ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_STOPPED, - "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); - ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_STOPPED, - "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); - break; + BOOL br; - case PHASE_RUNNING: - ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, - "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); - ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_RUNNING, - "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); - ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_RUNNING, - "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); - break; - } + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_STOPPED, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_STOPPED, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); - data->was_called = TRUE; + br = StartServiceA(data->svc, 0, NULL); + ok(br, "StartService failed: %u\n", GetLastError()); } -static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) +static void CALLBACK cb_running(void *user) { - DWORD dr, dr2; - struct notify_data data; - struct notify_data data2; + struct notify_data *data = user; BOOL br; SERVICE_STATUS status; - HANDLE svc, svc2; + + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_RUNNING, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_RUNNING, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + + br = ControlService(data->svc, SERVICE_CONTROL_STOP, &status); + ok(br, "ControlService failed: %u\n", GetLastError()); +} + +static void test_servicenotify(SC_HANDLE svc) +{ + DWORD dr; + struct notify_data data; if(!pNotifyServiceStatusChangeW){ win_skip("No NotifyServiceStatusChangeW\n"); return; } - svc = OpenServiceA(scm_handle, servicename, GENERIC_ALL); - svc2 = OpenServiceA(scm_handle, servicename, GENERIC_ALL); - ok(svc != NULL && svc2 != NULL, "Failed to open service\n"); - if(!svc || !svc2) - return; - - /* receive stopped notification, then start service */ memset(&data.notify, 0, sizeof(data.notify)); data.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; - data.notify.pfnNotifyCallback = &notify_cb; + data.notify.pfnNotifyCallback = &cb_stopped; data.notify.pContext = &data; data.svc = svc; - data.phase = PHASE_STOPPED; - data.was_called = FALSE; - - dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); - ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); - - dr = SleepEx(100, TRUE); - ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); - ok(data.was_called == TRUE, "APC wasn't called\n"); - - br = StartServiceA(svc, 0, NULL); - ok(br, "StartService failed: %u\n", GetLastError()); - - /* receive running notification */ - data.phase = PHASE_RUNNING; - data.was_called = FALSE; - - dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); - ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); - - dr = SleepEx(100, TRUE); - ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); - ok(data.was_called == TRUE, "APC wasn't called\n"); - - /* cannot register two notifications */ - data.phase = PHASE_STOPPED; - data.was_called = FALSE; dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); - memset(&data2.notify, 0, sizeof(data2.notify)); - data2.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; - data2.notify.pfnNotifyCallback = &notify_cb; - data2.notify.pContext = &data2; - - dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data2.notify); - ok(dr == ERROR_SUCCESS || /* win8+ */ - dr == ERROR_ALREADY_REGISTERED, "NotifyServiceStatusChangeW gave wrong result: %u\n", dr); - - /* should receive no notification because status has not changed. - * on win8+, SleepEx quits early but the callback is still not invoked. */ - dr2 = SleepEx(100, TRUE); - ok((dr == ERROR_SUCCESS && dr2 == WAIT_IO_COMPLETION) || /* win8+ */ - (dr == ERROR_ALREADY_REGISTERED && dr2 == 0), "Got wrong SleepEx result: %u\n", dr); - ok(data.was_called == FALSE, "APC should not have been called\n"); - - /* stop service and receive notifiction */ - br = ControlService(svc, SERVICE_CONTROL_STOP, &status); - ok(br, "ControlService failed: %u\n", GetLastError()); - dr = SleepEx(100, TRUE); - ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); - ok(data.was_called == TRUE, "APC wasn't called\n"); + ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); - /* test cancelation: create notify on svc that will block until service - * start; close svc; start service on svc2; verify that notification does - * not happen */ + data.notify.pfnNotifyCallback = &cb_running; - data.phase = PHASE_RUNNING; - data.was_called = FALSE; dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); - CloseServiceHandle(svc); - - br = StartServiceA(svc2, 0, NULL); - ok(br, "StartService failed: %u\n", GetLastError()); - dr = SleepEx(100, TRUE); - ok(dr == 0, "Got wrong SleepEx result: %u\n", dr); - ok(data.was_called == FALSE, "APC should not have been called\n"); - - br = ControlService(svc2, SERVICE_CONTROL_STOP, &status); - ok(br, "ControlService failed: %u\n", GetLastError()); - - CloseServiceHandle(svc2); + ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); } static void test_start_stop(void) @@ -2491,7 +2352,7 @@ static void test_start_stop(void) displayname = "Winetest Service"; ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - test_servicenotify(scm_handle, servicename); + test_servicenotify(svc_handle); cleanup: if (svc_handle)

1 0

01/01: [WINLOGON] Clean up part 1 - Add empty lines to separate logical blocks of code. - Add spaces according to our coding style. - Move g_hShutdownDialog and g_bShuttingDown into the shutdown parameters struct. - Pass a pointer to the shutdown parameters to the shutdown thread and the shutdown dialog and use the pointer instead of the global variables. - Move the timer code into a separate function because it requires local variables.
by Eric Kohl 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72dc17315853145c6c978… commit 72dc17315853145c6c9786f57943da432e0ccd0c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 2 01:37:50 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 2 01:37:50 2018 +0200 [WINLOGON] Clean up part 1 - Add empty lines to separate logical blocks of code. - Add spaces according to our coding style. - Move g_hShutdownDialog and g_bShuttingDown into the shutdown parameters struct. - Pass a pointer to the shutdown parameters to the shutdown thread and the shutdown dialog and use the pointer instead of the global variables. - Move the timer code into a separate function because it requires local variables. --- base/system/winlogon/shutdown.c | 169 ++++++++++++++++++++++++---------------- 1 file changed, 103 insertions(+), 66 deletions(-) diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index 0472bdc269..71b1f6052b 100644 --- a/base/system/winlogon/shutdown.c +++ b/base/system/winlogon/shutdown.c @@ -27,78 +27,103 @@ typedef struct _SYS_SHUTDOWN_PARAMS BOOLEAN bRebootAfterShutdown; BOOLEAN bForceAppsClosed; DWORD dwReason; + + HWND hShutdownDialog; + BOOLEAN bShuttingDown; } SYS_SHUTDOWN_PARAMS, *PSYS_SHUTDOWN_PARAMS; /* GLOBALS *******************************************************************/ -HWND g_hShutdownDialog = NULL; -BOOLEAN g_bShuttingDown = FALSE; SYS_SHUTDOWN_PARAMS g_ShutdownParams; /* FUNCTIONS *****************************************************************/ +static +VOID +OnTimer( + HWND hwndDlg, + PSYS_SHUTDOWN_PARAMS pShutdownParams) +{ + WCHAR strbuf[34]; + INT seconds, minutes, hours; + + seconds = (INT)pShutdownParams->dwTimeout; + hours = seconds / 3600; + seconds -= hours * 3600; + minutes = seconds / 60; + seconds -= minutes * 60; + + RtlStringCbPrintfW(strbuf, sizeof(strbuf), L"%d:%d:%d", hours, minutes, seconds); + SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, strbuf); + + if (pShutdownParams->dwTimeout == 0) + { + PostMessage(hwndDlg, WM_CLOSE, 0, 0); + ExitWindowsEx((pShutdownParams->bRebootAfterShutdown ? EWX_REBOOT : EWX_SHUTDOWN) | + (pShutdownParams->bForceAppsClosed ? EWX_FORCE : 0), + pShutdownParams->dwReason); + } + + pShutdownParams->dwTimeout--; +} + + static INT_PTR CALLBACK -ShutdownDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +ShutdownDialogProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { + PSYS_SHUTDOWN_PARAMS pShutdownParams; + + pShutdownParams = (PSYS_SHUTDOWN_PARAMS)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: - { - g_hShutdownDialog = hwndDlg; - if (g_ShutdownParams.usMessage.Length) + pShutdownParams = (PSYS_SHUTDOWN_PARAMS)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pShutdownParams); + + pShutdownParams->hShutdownDialog = hwndDlg; + + if (pShutdownParams->usMessage.Length) { SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNCOMMENT, - g_ShutdownParams.usMessage.Buffer); + pShutdownParams->usMessage.Buffer); } RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); PostMessage(hwndDlg, WM_TIMER, 0, 0); SetTimer(hwndDlg, IDT_SYSSHUTDOWN, 1000, NULL); - break; - } + break; + case WM_CLOSE: - { - g_hShutdownDialog = NULL; - g_bShuttingDown = FALSE; + pShutdownParams->hShutdownDialog = NULL; + pShutdownParams->bShuttingDown = FALSE; + KillTimer(hwndDlg, IDT_SYSSHUTDOWN); - if (g_ShutdownParams.usMessage.Buffer) + + if (pShutdownParams->usMessage.Buffer) { - HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); + HeapFree(GetProcessHeap(), 0, pShutdownParams->usMessage.Buffer); + RtlInitEmptyUnicodeString(&pShutdownParams->usMessage, NULL, 0); } + EndDialog(hwndDlg, 0); - DestroyWindow(hwndDlg); - break; - } + break; + case WM_TIMER: - { - WCHAR strbuf[34]; - int seconds, minutes, hours; - seconds = (int)(g_ShutdownParams.dwTimeout); - hours = seconds/3600; - seconds -= hours*3600; - minutes = seconds/60; - seconds -= minutes*60; - ZeroMemory(strbuf, sizeof(strbuf)); - //FIXME: Show time remaining according to the locale's format - RtlStringCbPrintfW(strbuf, sizeof(strbuf), L"%d:%d:%d", hours, minutes, seconds); - SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, strbuf); - if (g_ShutdownParams.dwTimeout == 0) - { - PostMessage(hwndDlg, WM_CLOSE, 0, 0); - ExitWindowsEx((g_ShutdownParams.bRebootAfterShutdown ? EWX_REBOOT : EWX_SHUTDOWN) | - (g_ShutdownParams.bForceAppsClosed ? EWX_FORCE : 0), - g_ShutdownParams.dwReason); - } - g_ShutdownParams.dwTimeout--; - break; - } + OnTimer(hwndDlg, pShutdownParams); + break; + default: return FALSE; } + return TRUE; } @@ -106,34 +131,42 @@ ShutdownDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) static DWORD WINAPI -InitiateSystemShutdownThread(LPVOID lpParameter) +InitiateSystemShutdownThread( + LPVOID lpParameter) { + PSYS_SHUTDOWN_PARAMS pShutdownParams; INT_PTR status; - status = DialogBoxW(hAppInstance, MAKEINTRESOURCEW(IDD_SYSSHUTDOWN), - NULL, ShutdownDialogProc); + + pShutdownParams = (PSYS_SHUTDOWN_PARAMS)lpParameter; + + status = DialogBoxParamW(hAppInstance, + MAKEINTRESOURCEW(IDD_SYSSHUTDOWN), + NULL, + ShutdownDialogProc, + (LPARAM)pShutdownParams); if (status >= 0) { return ERROR_SUCCESS; } - else + + if (pShutdownParams->usMessage.Buffer) { - if (g_ShutdownParams.usMessage.Buffer) - { - HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); - } - g_bShuttingDown = FALSE; - return GetLastError(); + HeapFree(GetProcessHeap(), 0, pShutdownParams->usMessage.Buffer); + RtlInitEmptyUnicodeString(&pShutdownParams->usMessage, NULL, 0); } + pShutdownParams->bShuttingDown = FALSE; + + return GetLastError(); } DWORD TerminateSystemShutdown(VOID) { - if (g_bShuttingDown == FALSE) + if (g_ShutdownParams.bShuttingDown == FALSE) return ERROR_NO_SHUTDOWN_IN_PROGRESS; - return PostMessage(g_hShutdownDialog, WM_CLOSE, 0, 0) ? ERROR_SUCCESS : GetLastError(); + + return PostMessage(g_ShutdownParams.hShutdownDialog, WM_CLOSE, 0, 0) ? ERROR_SUCCESS : GetLastError(); } @@ -147,43 +180,47 @@ StartSystemShutdown( { HANDLE hThread; - if (_InterlockedCompareExchange8((volatile char*)&g_bShuttingDown, TRUE, FALSE) == TRUE) + if (_InterlockedCompareExchange8((volatile char*)&g_ShutdownParams.bShuttingDown, TRUE, FALSE) == TRUE) return ERROR_SHUTDOWN_IN_PROGRESS; + if (lpMessage && lpMessage->Length && lpMessage->Buffer) { - g_ShutdownParams.usMessage.Buffer = HeapAlloc(GetProcessHeap(), 0, lpMessage->Length+sizeof(UNICODE_NULL)); + g_ShutdownParams.usMessage.Buffer = HeapAlloc(GetProcessHeap(), 0, lpMessage->Length + sizeof(UNICODE_NULL)); if (g_ShutdownParams.usMessage.Buffer == NULL) { - g_bShuttingDown = FALSE; + g_ShutdownParams.bShuttingDown = FALSE; return GetLastError(); } - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, g_ShutdownParams.usMessage.Buffer, lpMessage->Length+sizeof(UNICODE_NULL)); + + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, g_ShutdownParams.usMessage.Buffer, lpMessage->Length + sizeof(UNICODE_NULL)); RtlCopyUnicodeString(&(g_ShutdownParams.usMessage), (PUNICODE_STRING)lpMessage); } else { RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); } + g_ShutdownParams.dwTimeout = dwTimeout; g_ShutdownParams.bForceAppsClosed = bForceAppsClosed; g_ShutdownParams.bRebootAfterShutdown = bRebootAfterShutdown; g_ShutdownParams.dwReason = dwReason; - hThread = CreateThread(NULL, 0, InitiateSystemShutdownThread, NULL, 0, NULL); + + hThread = CreateThread(NULL, 0, InitiateSystemShutdownThread, (PVOID)&g_ShutdownParams, 0, NULL); if (hThread) { CloseHandle(hThread); return ERROR_SUCCESS; } - else + + if (g_ShutdownParams.usMessage.Buffer) { - if (g_ShutdownParams.usMessage.Buffer) - { - HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); - } - g_bShuttingDown = FALSE; - return GetLastError(); + HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); } + + g_ShutdownParams.bShuttingDown = FALSE; + + return GetLastError(); } /* EOF */

1 0

01/01: [WINLOGON] Missed this file
by Eric Kohl 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fac4b068fc580994de3f… commit 1fac4b068fc580994de3f6bf16c310a58e4e7c1f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 2 00:42:15 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 2 00:42:15 2018 +0200 [WINLOGON] Missed this file --- base/system/winlogon/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/base/system/winlogon/CMakeLists.txt b/base/system/winlogon/CMakeLists.txt index 35df3d7bd7..8610bbfc91 100644 --- a/base/system/winlogon/CMakeLists.txt +++ b/base/system/winlogon/CMakeLists.txt @@ -12,6 +12,7 @@ list(APPEND SOURCE sas.c screensaver.c setup.c + shutdown.c winlogon.c wlx.c winlogon.h

1 0

01/01: [WINLOGON] Move the system shutdown code into a separate file
by Eric Kohl 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f50d7749d0209a3335867… commit f50d7749d0209a333586724e1a270ce7328a3297 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 2 00:38:18 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 2 00:38:52 2018 +0200 [WINLOGON] Move the system shutdown code into a separate file --- base/system/winlogon/rpcserver.c | 157 ++------------------------------ base/system/winlogon/shutdown.c | 189 +++++++++++++++++++++++++++++++++++++++ base/system/winlogon/winlogon.h | 12 +++ 3 files changed, 208 insertions(+), 150 deletions(-) diff --git a/base/system/winlogon/rpcserver.c b/base/system/winlogon/rpcserver.c index bbf8e54aa6..1fc6c0dfad 100644 --- a/base/system/winlogon/rpcserver.c +++ b/base/system/winlogon/rpcserver.c @@ -10,31 +10,9 @@ #include "winlogon.h" -#include <ntstrsafe.h> #include <rpc.h> #include <winreg_s.h> -/* DEFINES *******************************************************************/ - -#define IDT_SYSSHUTDOWN 2000 - -/* STRUCTS *******************************************************************/ - -typedef struct _SYS_SHUTDOWN_PARAMS -{ - UNICODE_STRING usMessage; - ULONG dwTimeout; - BOOLEAN bRebootAfterShutdown; - BOOLEAN bForceAppsClosed; - DWORD dwReason; -} SYS_SHUTDOWN_PARAMS, *PSYS_SHUTDOWN_PARAMS; - -/* GLOBALS *******************************************************************/ - -HWND g_hShutdownDialog = NULL; -BOOLEAN g_bShuttingDown = FALSE; -SYS_SHUTDOWN_PARAMS g_ShutdownParams; - /* FUNCTIONS *****************************************************************/ BOOL @@ -455,9 +433,7 @@ BaseAbortSystemShutdown( //FIXME: Verify that the caller actually has the correct privileges - if (g_bShuttingDown == FALSE) - return ERROR_NO_SHUTDOWN_IN_PROGRESS; - return PostMessage(g_hShutdownDialog, WM_CLOSE, 0, 0) ? ERROR_SUCCESS : GetLastError(); + return TerminateSystemShutdown(); } @@ -511,92 +487,6 @@ BaseRegQueryMultipleValues( return ERROR_SUCCESS; } -INT_PTR -CALLBACK -ShutdownDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - switch (uMsg) - { - case WM_INITDIALOG: - { - g_hShutdownDialog = hwndDlg; - if (g_ShutdownParams.usMessage.Length) - { - SetDlgItemTextW(hwndDlg, - IDC_SHUTDOWNCOMMENT, - g_ShutdownParams.usMessage.Buffer); - } - RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); - SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); - PostMessage(hwndDlg, WM_TIMER, 0, 0); - SetTimer(hwndDlg, IDT_SYSSHUTDOWN, 1000, NULL); - break; - } - case WM_CLOSE: - { - g_hShutdownDialog = NULL; - g_bShuttingDown = FALSE; - KillTimer(hwndDlg, IDT_SYSSHUTDOWN); - if (g_ShutdownParams.usMessage.Buffer) - { - HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); - } - EndDialog(hwndDlg, 0); - DestroyWindow(hwndDlg); - break; - } - case WM_TIMER: - { - WCHAR strbuf[34]; - int seconds, minutes, hours; - seconds = (int)(g_ShutdownParams.dwTimeout); - hours = seconds/3600; - seconds -= hours*3600; - minutes = seconds/60; - seconds -= minutes*60; - ZeroMemory(strbuf, sizeof(strbuf)); - //FIXME: Show time remaining according to the locale's format - RtlStringCbPrintfW(strbuf, sizeof(strbuf), L"%d:%d:%d", hours, minutes, seconds); - SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, strbuf); - if (g_ShutdownParams.dwTimeout == 0) - { - PostMessage(hwndDlg, WM_CLOSE, 0, 0); - ExitWindowsEx((g_ShutdownParams.bRebootAfterShutdown ? EWX_REBOOT : EWX_SHUTDOWN) | - (g_ShutdownParams.bForceAppsClosed ? EWX_FORCE : 0), - g_ShutdownParams.dwReason); - } - g_ShutdownParams.dwTimeout--; - break; - } - default: - return FALSE; - } - return TRUE; -} - -DWORD -WINAPI -InitiateSystemShutdownThread(LPVOID lpParameter) -{ - INT_PTR status; - status = DialogBoxW(hAppInstance, MAKEINTRESOURCEW(IDD_SYSSHUTDOWN), - NULL, ShutdownDialogProc); - if (status >= 0) - { - return ERROR_SUCCESS; - } - else - { - if (g_ShutdownParams.usMessage.Buffer) - { - HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); - } - g_bShuttingDown = FALSE; - return GetLastError(); - } -} /* Function 30 */ ULONG @@ -609,8 +499,6 @@ BaseInitiateSystemShutdownEx( BOOLEAN bRebootAfterShutdown, ULONG dwReason) { - HANDLE hThread; - TRACE("BaseInitiateSystemShutdownEx()\n"); TRACE(" Message: %wZ\n", lpMessage); TRACE(" Timeout: %lu\n", dwTimeout); @@ -620,45 +508,14 @@ BaseInitiateSystemShutdownEx( //FIXME: Verify that the caller actually has the correct privileges - if (_InterlockedCompareExchange8((volatile char*)&g_bShuttingDown, TRUE, FALSE) == TRUE) - return ERROR_SHUTDOWN_IN_PROGRESS; - if (lpMessage && lpMessage->Length && lpMessage->Buffer) - { - g_ShutdownParams.usMessage.Buffer = HeapAlloc(GetProcessHeap(), 0, lpMessage->Length+sizeof(UNICODE_NULL)); - if (g_ShutdownParams.usMessage.Buffer == NULL) - { - g_bShuttingDown = FALSE; - return GetLastError(); - } - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, g_ShutdownParams.usMessage.Buffer, lpMessage->Length+sizeof(UNICODE_NULL)); - RtlCopyUnicodeString(&(g_ShutdownParams.usMessage), (PUNICODE_STRING)lpMessage); - } - else - { - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); - } - g_ShutdownParams.dwTimeout = dwTimeout; - g_ShutdownParams.bForceAppsClosed = bForceAppsClosed; - g_ShutdownParams.bRebootAfterShutdown = bRebootAfterShutdown; - g_ShutdownParams.dwReason = dwReason; - hThread = CreateThread(NULL, 0, InitiateSystemShutdownThread, NULL, 0, NULL); - if (hThread) - { - CloseHandle(hThread); - return ERROR_SUCCESS; - } - else - { - if (g_ShutdownParams.usMessage.Buffer) - { - HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); - RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); - } - g_bShuttingDown = FALSE; - return GetLastError(); - } + return StartSystemShutdown((PUNICODE_STRING)lpMessage, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown, + dwReason); } + /* Function 31 */ error_status_t __stdcall diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c new file mode 100644 index 0000000000..0472bdc269 --- /dev/null +++ b/base/system/winlogon/shutdown.c @@ -0,0 +1,189 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Winlogon + * FILE: base/system/winlogon/shutdown.c + * PURPOSE: System shutdown dialog + * PROGRAMMERS: alpha5056 <alpha5056(a)users.noreply.github.com> + */ + +/* INCLUDES ******************************************************************/ + +#include "winlogon.h" + +#include <ntstrsafe.h> +#include <rpc.h> +#include <winreg_s.h> + +/* DEFINES *******************************************************************/ + +#define IDT_SYSSHUTDOWN 2000 + +/* STRUCTS *******************************************************************/ + +typedef struct _SYS_SHUTDOWN_PARAMS +{ + UNICODE_STRING usMessage; + ULONG dwTimeout; + BOOLEAN bRebootAfterShutdown; + BOOLEAN bForceAppsClosed; + DWORD dwReason; +} SYS_SHUTDOWN_PARAMS, *PSYS_SHUTDOWN_PARAMS; + +/* GLOBALS *******************************************************************/ + +HWND g_hShutdownDialog = NULL; +BOOLEAN g_bShuttingDown = FALSE; +SYS_SHUTDOWN_PARAMS g_ShutdownParams; + +/* FUNCTIONS *****************************************************************/ + +static +INT_PTR +CALLBACK +ShutdownDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + g_hShutdownDialog = hwndDlg; + if (g_ShutdownParams.usMessage.Length) + { + SetDlgItemTextW(hwndDlg, + IDC_SHUTDOWNCOMMENT, + g_ShutdownParams.usMessage.Buffer); + } + RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); + SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + PostMessage(hwndDlg, WM_TIMER, 0, 0); + SetTimer(hwndDlg, IDT_SYSSHUTDOWN, 1000, NULL); + break; + } + case WM_CLOSE: + { + g_hShutdownDialog = NULL; + g_bShuttingDown = FALSE; + KillTimer(hwndDlg, IDT_SYSSHUTDOWN); + if (g_ShutdownParams.usMessage.Buffer) + { + HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); + } + EndDialog(hwndDlg, 0); + DestroyWindow(hwndDlg); + break; + } + case WM_TIMER: + { + WCHAR strbuf[34]; + int seconds, minutes, hours; + seconds = (int)(g_ShutdownParams.dwTimeout); + hours = seconds/3600; + seconds -= hours*3600; + minutes = seconds/60; + seconds -= minutes*60; + ZeroMemory(strbuf, sizeof(strbuf)); + //FIXME: Show time remaining according to the locale's format + RtlStringCbPrintfW(strbuf, sizeof(strbuf), L"%d:%d:%d", hours, minutes, seconds); + SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, strbuf); + if (g_ShutdownParams.dwTimeout == 0) + { + PostMessage(hwndDlg, WM_CLOSE, 0, 0); + ExitWindowsEx((g_ShutdownParams.bRebootAfterShutdown ? EWX_REBOOT : EWX_SHUTDOWN) | + (g_ShutdownParams.bForceAppsClosed ? EWX_FORCE : 0), + g_ShutdownParams.dwReason); + } + g_ShutdownParams.dwTimeout--; + break; + } + default: + return FALSE; + } + return TRUE; +} + + +static +DWORD +WINAPI +InitiateSystemShutdownThread(LPVOID lpParameter) +{ + INT_PTR status; + status = DialogBoxW(hAppInstance, MAKEINTRESOURCEW(IDD_SYSSHUTDOWN), + NULL, ShutdownDialogProc); + if (status >= 0) + { + return ERROR_SUCCESS; + } + else + { + if (g_ShutdownParams.usMessage.Buffer) + { + HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); + } + g_bShuttingDown = FALSE; + return GetLastError(); + } +} + + +DWORD +TerminateSystemShutdown(VOID) +{ + if (g_bShuttingDown == FALSE) + return ERROR_NO_SHUTDOWN_IN_PROGRESS; + return PostMessage(g_hShutdownDialog, WM_CLOSE, 0, 0) ? ERROR_SUCCESS : GetLastError(); +} + + +DWORD +StartSystemShutdown( + PUNICODE_STRING lpMessage, + ULONG dwTimeout, + BOOLEAN bForceAppsClosed, + BOOLEAN bRebootAfterShutdown, + ULONG dwReason) +{ + HANDLE hThread; + + if (_InterlockedCompareExchange8((volatile char*)&g_bShuttingDown, TRUE, FALSE) == TRUE) + return ERROR_SHUTDOWN_IN_PROGRESS; + if (lpMessage && lpMessage->Length && lpMessage->Buffer) + { + g_ShutdownParams.usMessage.Buffer = HeapAlloc(GetProcessHeap(), 0, lpMessage->Length+sizeof(UNICODE_NULL)); + if (g_ShutdownParams.usMessage.Buffer == NULL) + { + g_bShuttingDown = FALSE; + return GetLastError(); + } + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, g_ShutdownParams.usMessage.Buffer, lpMessage->Length+sizeof(UNICODE_NULL)); + RtlCopyUnicodeString(&(g_ShutdownParams.usMessage), (PUNICODE_STRING)lpMessage); + } + else + { + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); + } + g_ShutdownParams.dwTimeout = dwTimeout; + g_ShutdownParams.bForceAppsClosed = bForceAppsClosed; + g_ShutdownParams.bRebootAfterShutdown = bRebootAfterShutdown; + g_ShutdownParams.dwReason = dwReason; + hThread = CreateThread(NULL, 0, InitiateSystemShutdownThread, NULL, 0, NULL); + if (hThread) + { + CloseHandle(hThread); + return ERROR_SUCCESS; + } + else + { + if (g_ShutdownParams.usMessage.Buffer) + { + HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); + } + g_bShuttingDown = FALSE; + return GetLastError(); + } +} + +/* EOF */ diff --git a/base/system/winlogon/winlogon.h b/base/system/winlogon/winlogon.h index f54ac7a091..a27f1ed9f2 100644 --- a/base/system/winlogon/winlogon.h +++ b/base/system/winlogon/winlogon.h @@ -312,6 +312,18 @@ GetSetupType(VOID); BOOL RunSetup(VOID); +/* shutdown.h*/ +DWORD +TerminateSystemShutdown(VOID); + +DWORD +StartSystemShutdown( + PUNICODE_STRING lpMessage, + ULONG dwTimeout, + BOOLEAN bForceAppsClosed, + BOOLEAN bRebootAfterShutdown, + ULONG dwReason); + /* winlogon.c */ BOOL PlaySoundRoutine(IN LPCWSTR FileName,

1 0

08/08: [NTOSKRNL] Formatting fix only.
by Hermès Bélusca-Maïto 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c54aaacc8ee9b4d93ab36… commit c54aaacc8ee9b4d93ab36378e773de15f45c5f78 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 1 22:34:17 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 22:51:24 2018 +0200 [NTOSKRNL] Formatting fix only. --- ntoskrnl/ex/harderr.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index e8e233d81f..10b6682e65 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -14,7 +14,7 @@ #define TAG_ERR ' rrE' -/* GLOBALS ****************************************************************/ +/* GLOBALS ******************************************************************/ BOOLEAN ExReadyForErrors = FALSE; PVOID ExpDefaultErrorPort = NULL; @@ -247,9 +247,12 @@ ExpRaiseHardError(IN NTSTATUS ErrorStatus, KeQuerySystemTime(&Message->ErrorTime); /* Copy the parameters */ - if (Parameters) RtlMoveMemory(&Message->Parameters, - Parameters, - sizeof(ULONG_PTR) * NumberOfParameters); + if (Parameters) + { + RtlMoveMemory(&Message->Parameters, + Parameters, + sizeof(ULONG_PTR) * NumberOfParameters); + } /* Send the LPC Message */ Status = LpcRequestWaitReplyPort(PortHandle,

1 0

07/08: [NTOSKRNL] Simplify NtRaiseHardError() by merging the terminating blocks.
by Hermès Bélusca-Maïto 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cefd1242d0ab72ca3cb5… commit 6cefd1242d0ab72ca3cb5e5f0dde0a3953f4b80e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 1 17:59:31 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 22:50:56 2018 +0200 [NTOSKRNL] Simplify NtRaiseHardError() by merging the terminating blocks. - Return the status codes provided by the Ex(p)RaiseHardError() calls. - Fix the return values in case of failure. --- ntoskrnl/ex/harderr.c | 67 +++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index 63fa05032f..e8e233d81f 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -394,7 +394,7 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, PVOID UserData = NULL; PHARDERROR_USER_PARAMETERS UserParams; PWSTR BufferBase; - ULONG SafeResponse; + ULONG SafeResponse = ResponseNotHandled; PAGED_CODE(); @@ -430,7 +430,12 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + /* Return failure */ + *Response = ResponseNotHandled; + return Status; + } /* Set the pointers to our data */ UserParams = UserData; @@ -551,12 +556,14 @@ NtRaiseHardError(IN NTSTATUS ErrorStatus, { NTSTATUS Status = STATUS_SUCCESS; PULONG_PTR SafeParams = NULL; - ULONG SafeResponse; + ULONG SafeResponse = ResponseNotHandled; UNICODE_STRING SafeString; ULONG i; ULONG ParamSize = 0; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + /* Validate parameter count */ if (NumberOfParameters > MAXIMUM_HARDERROR_PARAMETERS) { @@ -662,37 +669,17 @@ NtRaiseHardError(IN NTSTATUS ErrorStatus, _SEH2_END; /* Call the system function directly, because we probed */ - ExpRaiseHardError(ErrorStatus, - NumberOfParameters, - UnicodeStringParameterMask, - SafeParams, - ValidResponseOptions, - &SafeResponse); - } - else - { - /* Reuse variable */ - SafeParams = Parameters; - - /* - * Call the Executive Function. It will probe and copy pointers to - * user-mode - */ - ExRaiseHardError(ErrorStatus, - NumberOfParameters, - UnicodeStringParameterMask, - SafeParams, - ValidResponseOptions, - &SafeResponse); - } - - /* Check if we were called in user-mode */ - if (PreviousMode != KernelMode) - { - /* That means we have a buffer to free */ + Status = ExpRaiseHardError(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + SafeParams, + ValidResponseOptions, + &SafeResponse); + + /* Free captured buffer */ if (SafeParams) ExFreePoolWithTag(SafeParams, TAG_ERR); - /* Enter SEH Block for return */ + /* Enter SEH Block to return the response */ _SEH2_TRY { /* Return the response */ @@ -707,6 +694,20 @@ NtRaiseHardError(IN NTSTATUS ErrorStatus, } else { + /* Reuse variable */ + SafeParams = Parameters; + + /* + * Call the Executive Function. It will probe + * and copy pointers to user-mode. + */ + Status = ExRaiseHardError(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + SafeParams, + ValidResponseOptions, + &SafeResponse); + /* Return the response */ *Response = SafeResponse; } @@ -740,6 +741,8 @@ NtSetDefaultHardErrorPort(IN HANDLE PortHandle) KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_UNSUCCESSFUL; + PAGED_CODE(); + /* Check if we have the privileges */ if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) {

1 0

06/08: [NTOSKRNL] ExRaiseHardError(): Protect strings copy to user-mode space inside a SEH block.
by Hermès Bélusca-Maïto 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea390c2b3f1f520fd1748… commit ea390c2b3f1f520fd1748b6bf3fc9f7b8f9b84ea Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 1 17:52:10 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 22:50:44 2018 +0200 [NTOSKRNL] ExRaiseHardError(): Protect strings copy to user-mode space inside a SEH block. --- ntoskrnl/ex/harderr.c | 56 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index 185d43537e..63fa05032f 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -387,6 +387,7 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, IN ULONG ValidResponseOptions, OUT PULONG Response) { + NTSTATUS Status; SIZE_T Size; UNICODE_STRING CapturedParams[MAXIMUM_HARDERROR_PARAMETERS]; ULONG i; @@ -394,7 +395,7 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, PHARDERROR_USER_PARAMETERS UserParams; PWSTR BufferBase; ULONG SafeResponse; - NTSTATUS Status; + PAGED_CODE(); /* Check if we have parameters */ @@ -435,35 +436,46 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, UserParams = UserData; BufferBase = UserParams->Buffer; - /* Loop parameters again */ - for (i = 0; i < NumberOfParameters; i++) + /* Enter SEH block as we are writing to user-mode space */ + _SEH2_TRY { - /* Check if we're in the mask */ - if (UnicodeStringParameterMask & (1 << i)) + /* Loop parameters again */ + for (i = 0; i < NumberOfParameters; i++) { - /* Update the base */ - UserParams->Parameters[i] = (ULONG_PTR)&UserParams->Strings[i]; + /* Check if we are in the mask */ + if (UnicodeStringParameterMask & (1 << i)) + { + /* Update the base */ + UserParams->Parameters[i] = (ULONG_PTR)&UserParams->Strings[i]; - /* Copy the string buffer */ - RtlMoveMemory(BufferBase, - CapturedParams[i].Buffer, - CapturedParams[i].MaximumLength); + /* Copy the string buffer */ + RtlMoveMemory(BufferBase, + CapturedParams[i].Buffer, + CapturedParams[i].MaximumLength); - /* Set buffer */ - CapturedParams[i].Buffer = BufferBase; + /* Set buffer */ + CapturedParams[i].Buffer = BufferBase; - /* Copy the string structure */ - UserParams->Strings[i] = CapturedParams[i]; + /* Copy the string structure */ + UserParams->Strings[i] = CapturedParams[i]; - /* Update the pointer */ - BufferBase += CapturedParams[i].MaximumLength; - } - else - { - /* No need to copy any strings */ - UserParams->Parameters[i] = Parameters[i]; + /* Update the pointer */ + BufferBase += CapturedParams[i].MaximumLength; + } + else + { + /* No need to copy any strings */ + UserParams->Parameters[i] = Parameters[i]; + } } } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + DPRINT1("ExRaiseHardError - Exception when writing data to user-mode, Status 0x%08lx\n", Status); + } + _SEH2_END; } else {

1 0

05/08: [NTOSKRNL] Don't emit hard errors for the calling thread if hard errors have been disabled for this thread on user-mode side.
by Hermès Bélusca-Maïto 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=842605e3ef6c3673d8846… commit 842605e3ef6c3673d8846181787c1f671a2e8c24 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 1 15:53:49 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 22:50:33 2018 +0200 [NTOSKRNL] Don't emit hard errors for the calling thread if hard errors have been disabled for this thread on user-mode side. --- ntoskrnl/ex/harderr.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index 82d22f4926..185d43537e 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -105,13 +105,14 @@ ExpRaiseHardError(IN NTSTATUS ErrorStatus, IN ULONG ValidResponseOptions, OUT PULONG Response) { + NTSTATUS Status; PEPROCESS Process = PsGetCurrentProcess(); PETHREAD Thread = PsGetCurrentThread(); UCHAR Buffer[PORT_MAXIMUM_MESSAGE_LENGTH]; PHARDERROR_MSG Message = (PHARDERROR_MSG)Buffer; - NTSTATUS Status; HANDLE PortHandle; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + PAGED_CODE(); /* Check if this error will shutdown the system */ @@ -182,6 +183,31 @@ ExpRaiseHardError(IN NTSTATUS ErrorStatus, /* If hard errors are disabled, do nothing */ if (Thread->HardErrorsAreDisabled) PortHandle = NULL; + /* + * If this is not the system thread, check whether hard errors are + * disabled for this thread on user-mode side, and if so, do nothing. + */ + if (!Thread->SystemThread && (PortHandle != NULL)) + { + /* Check if we have a TEB */ + PTEB Teb = PsGetCurrentThread()->Tcb.Teb; + if (Teb) + { + _SEH2_TRY + { + if (Teb->HardErrorMode & RTL_SEM_FAILCRITICALERRORS) + { + PortHandle = NULL; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + NOTHING; + } + _SEH2_END; + } + } + /* Now check if we have a port */ if (PortHandle == NULL) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2018