Ros-diffs July 2018

ros-diffs@reactos.org

17 participants
89 discussions

02/03: [ROSTESTS] Add an interactive test for window stations. See also PR #621.
by Hermès Bélusca-Maïto 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67adf7ab786bc43616802… commit 67adf7ab786bc43616802799ce4f3b49034150ab Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 17 21:39:44 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 19:03:17 2018 +0200 [ROSTESTS] Add an interactive test for window stations. See also PR #621. --- modules/rostests/win32/user32/CMakeLists.txt | 1 + .../win32/user32/winstation/CMakeLists.txt | 5 + .../rostests/win32/user32/winstation/resource.h | 2 + .../rostests/win32/user32/winstation/winstation.c | 239 +++++++++++++++++++++ .../rostests/win32/user32/winstation/winstation.rc | 15 ++ 5 files changed, 262 insertions(+) diff --git a/modules/rostests/win32/user32/CMakeLists.txt b/modules/rostests/win32/user32/CMakeLists.txt index 8298a919d3..d1d83974bd 100644 --- a/modules/rostests/win32/user32/CMakeLists.txt +++ b/modules/rostests/win32/user32/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(biditext) add_subdirectory(paintdesktop) add_subdirectory(sysicon) +add_subdirectory(winstation) diff --git a/modules/rostests/win32/user32/winstation/CMakeLists.txt b/modules/rostests/win32/user32/winstation/CMakeLists.txt new file mode 100644 index 0000000000..88d6ea8173 --- /dev/null +++ b/modules/rostests/win32/user32/winstation/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(winstation winstation.c winstation.rc) +set_module_type(winstation win32gui UNICODE) +add_importlibs(winstation user32 msvcrt kernel32) +add_rostests_file(TARGET winstation SUBDIR suppl) diff --git a/modules/rostests/win32/user32/winstation/resource.h b/modules/rostests/win32/user32/winstation/resource.h new file mode 100644 index 0000000000..795deabfbd --- /dev/null +++ b/modules/rostests/win32/user32/winstation/resource.h @@ -0,0 +1,2 @@ +#define IDD_ABOUTBOX 101 +#define IDC_STATIC -1 diff --git a/modules/rostests/win32/user32/winstation/winstation.c b/modules/rostests/win32/user32/winstation/winstation.c new file mode 100644 index 0000000000..f2434dbad0 --- /dev/null +++ b/modules/rostests/win32/user32/winstation/winstation.c @@ -0,0 +1,239 @@ +/* + * PROJECT: ReactOS Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests some aspects of the Window Station API. + * COPYRIGHT: Copyright 2018 Hermes Belusca-Maito + */ + +#include <windef.h> +#include <winbase.h> +#include <wincon.h> +#include <winuser.h> + +#include <strsafe.h> + +#include "resource.h" + + +/* + * Logging facilities + */ + +typedef struct _LOG_FILE +{ + HANDLE hLogFile; + PWCHAR pBuffer; + size_t cbBufferSize; +} LOG_FILE, *PLOG_FILE; + +BOOL +InitLog( + OUT PLOG_FILE LogFile, + IN LPCWSTR LogFileName, + IN PWCHAR pBuffer, + IN size_t cbBufferSize) +{ + HANDLE hLogFile; + + ZeroMemory(LogFile, sizeof(*LogFile)); + + hLogFile = CreateFileW(LogFileName, + GENERIC_WRITE, + FILE_SHARE_READ, + NULL, + OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (hLogFile == INVALID_HANDLE_VALUE) + return FALSE; + + LogFile->hLogFile = hLogFile; + LogFile->pBuffer = pBuffer; + LogFile->cbBufferSize = cbBufferSize; + + return TRUE; +} + +VOID +CloseLog( + IN PLOG_FILE LogFile) +{ + CloseHandle(LogFile->hLogFile); + ZeroMemory(LogFile, sizeof(*LogFile)); +} + +BOOL +WriteToLog( + IN PLOG_FILE LogFile, + IN LPCVOID Buffer, + IN DWORD dwBufferSize) +{ + return WriteFile(LogFile->hLogFile, + Buffer, + dwBufferSize, + &dwBufferSize, NULL); +} + +BOOL +WriteToLogPuts( + IN PLOG_FILE LogFile, + IN LPCWSTR String) +{ + return WriteToLog(LogFile, + String, + wcslen(String) * sizeof(WCHAR)); +} + +BOOL +WriteToLogPrintfV( + IN PLOG_FILE LogFile, + IN LPCWSTR Format, + IN va_list args) +{ + StringCbVPrintfW(LogFile->pBuffer, + LogFile->cbBufferSize, + Format, args); + + return WriteToLog(LogFile, + LogFile->pBuffer, + wcslen(LogFile->pBuffer) * sizeof(WCHAR)); +} + +BOOL +WriteToLogPrintf( + IN PLOG_FILE LogFile, + IN LPCWSTR Format, + ...) +{ + BOOL bRet; + va_list args; + + va_start(args, Format); + bRet = WriteToLogPrintfV(LogFile, Format, args); + va_end(args); + + return bRet; +} + + +/* + * Window Station tests + */ + +BOOL +CALLBACK +EnumDesktopProc( + IN LPWSTR lpszDesktop, + IN LPARAM lParam) +{ + PLOG_FILE LogFile = (PLOG_FILE)lParam; + + WriteToLogPrintf(LogFile, L" :: Found desktop '%s'\r\n", lpszDesktop); + + /* Continue the enumeration */ + return TRUE; +} + +/* + * This test inspects the same window station aspects that are used in the + * Cygwin fhandler_console.cc!fhandler_console::create_invisible_console() + * function, see: + * https://github.com/cygwin/cygwin/blob/7b9bfb4136f23655e243bab89fb62b04bdbac… + */ +VOID DoTest(HWND hWnd) +{ + HWINSTA hWinSta; + LPCWSTR lpszWinSta = L"Test-WinSta"; + BOOL bIsItOk; + LOG_FILE LogFile; + WCHAR szBuffer[2048]; + + bIsItOk = InitLog(&LogFile, L"test_winsta.log", szBuffer, sizeof(szBuffer)); + if (!bIsItOk) + { + MessageBoxW(hWnd, L"Could not create the log file, stopping test now...", L"Error", MB_ICONERROR | MB_OK); + return; + } + + /* Switch output to UTF-16 (little endian) */ + WriteToLog(&LogFile, "\xFF\xFE", 2); + + WriteToLogPrintf(&LogFile, L"Creating Window Station '%s'\r\n", lpszWinSta); + hWinSta = CreateWindowStationW(lpszWinSta, 0, WINSTA_ALL_ACCESS, NULL); + WriteToLogPrintf(&LogFile, L"--> Returned handle 0x%p ; last error: %lu\r\n", hWinSta, GetLastError()); + + if (!hWinSta) + { + WriteToLogPuts(&LogFile, L"\r\nHandle is NULL, cannot proceed further, stopping the test!\r\n\r\n"); + return; + } + + WriteToLogPrintf(&LogFile, L"Enumerate desktops on Window Station '%s' (0x%p) (before process attach)\r\n", lpszWinSta, hWinSta); + bIsItOk = EnumDesktopsW(hWinSta, EnumDesktopProc, (LPARAM)&LogFile); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + WriteToLogPrintf(&LogFile, L"Setting current process to Window Station '%s' (0x%p)\r\n", lpszWinSta, hWinSta); + bIsItOk = SetProcessWindowStation(hWinSta); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + WriteToLogPrintf(&LogFile, L"Enumerate desktops on Window Station '%s' (0x%p) (after process attach, before allocating console)\r\n", lpszWinSta, hWinSta); + bIsItOk = EnumDesktopsW(hWinSta, EnumDesktopProc, (LPARAM)&LogFile); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + WriteToLogPrintf(&LogFile, L"Allocating a new console on Window Station '%s' (0x%p)\r\n", lpszWinSta, hWinSta); + bIsItOk = AllocConsole(); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + WriteToLogPrintf(&LogFile, L"Enumerate desktops on Window Station '%s' (0x%p) (after allocating console)\r\n", lpszWinSta, hWinSta); + bIsItOk = EnumDesktopsW(hWinSta, EnumDesktopProc, (LPARAM)&LogFile); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + WriteToLogPrintf(&LogFile, L"Now closing Window Station '%s' (0x%p)\r\n", lpszWinSta, hWinSta); + bIsItOk = CloseWindowStation(hWinSta); + WriteToLogPrintf(&LogFile, L"--> Returned %s ; last error: %lu\r\n\r\n", + (bIsItOk ? L"success" : L"failure"), GetLastError()); + + CloseLog(&LogFile); +} + +INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + switch (message) + { + case WM_INITDIALOG: + return (INT_PTR)TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + DoTest(hDlg); + EndDialog(hDlg, LOWORD(wParam)); + break; + + case IDCANCEL: + default: + EndDialog(hDlg, LOWORD(wParam)); + break; + } + return (INT_PTR)TRUE; + } + return (INT_PTR)FALSE; +} + +int APIENTRY wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nCmdShow) +{ + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + + return DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_ABOUTBOX), NULL, About); +} diff --git a/modules/rostests/win32/user32/winstation/winstation.rc b/modules/rostests/win32/user32/winstation/winstation.rc new file mode 100644 index 0000000000..0e9e05ffe0 --- /dev/null +++ b/modules/rostests/win32/user32/winstation/winstation.rc @@ -0,0 +1,15 @@ + +#include <windef.h> +#include <winuser.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDD_ABOUTBOX DIALOGEX 0, 0, 170, 62 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Test WindowStation" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CTEXT "Test for WindowStation\nTo start the test, press on the button below.",IDC_STATIC,7,7,156,20,SS_NOPREFIX + DEFPUSHBUTTON "Start!",IDOK,7,32,156,23,WS_GROUP +END

1 0

01/03: [WINLOGON] Allow WinSta0 access only when needed. Also, reset the WinSta0 user as soon as we have logged-off.
by Hermès Bélusca-Maïto 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02eee253b2674f1a88d0d… commit 02eee253b2674f1a88d0dc1fd68e3deae8abbb16 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 17 01:44:00 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 22 19:03:17 2018 +0200 [WINLOGON] Allow WinSta0 access only when needed. Also, reset the WinSta0 user as soon as we have logged-off. --- base/system/winlogon/sas.c | 182 ++++++++++++++++++++-------------------- base/system/winlogon/winlogon.h | 22 ++++- base/system/winlogon/wlx.c | 5 +- 3 files changed, 115 insertions(+), 94 deletions(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index 1a57a4ad6e..0189953cff 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -43,6 +43,8 @@ typedef struct tagLOGOFF_SHUTDOWN_DATA static BOOL ExitReactOSInProgress = FALSE; +LUID LuidNone = {0, 0}; + /* FUNCTIONS ****************************************************************/ static BOOL @@ -425,6 +427,87 @@ PlayLogonSound( CloseHandle(hThread); } +static BOOL +AllowWinstaAccess(PWLSESSION Session) +{ + BOOL bSuccess = FALSE; + DWORD dwIndex; + DWORD dwLength = 0; + PTOKEN_GROUPS ptg = NULL; + PSID psid; + TOKEN_STATISTICS Stats; + DWORD cbStats; + DWORD ret; + + // Get required buffer size and allocate the TOKEN_GROUPS buffer. + + if (!GetTokenInformation(Session->UserToken, + TokenGroups, + ptg, + 0, + &dwLength)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return FALSE; + + ptg = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength); + if (ptg == NULL) + return FALSE; + } + + // Get the token group information from the access token. + if (!GetTokenInformation(Session->UserToken, + TokenGroups, + ptg, + dwLength, + &dwLength)) + { + goto Cleanup; + } + + // Loop through the groups to find the logon SID. + + for (dwIndex = 0; dwIndex < ptg->GroupCount; dwIndex++) + { + if ((ptg->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID) + == SE_GROUP_LOGON_ID) + { + psid = ptg->Groups[dwIndex].Sid; + break; + } + } + + dwLength = GetLengthSid(psid); + + if (!GetTokenInformation(Session->UserToken, + TokenStatistics, + &Stats, + sizeof(TOKEN_STATISTICS), + &cbStats)) + { + WARN("Couldn't get Authentication id from user token!\n"); + goto Cleanup; + } + + AddAceToWindowStation(Session->InteractiveWindowStation, psid); + + ret = SetWindowStationUser(Session->InteractiveWindowStation, + &Stats.AuthenticationId, + psid, + dwLength); + TRACE("SetWindowStationUser returned 0x%x\n", ret); + + bSuccess = TRUE; + +Cleanup: + + // Free the buffer for the token groups. + if (ptg != NULL) + HeapFree(GetProcessHeap(), 0, (LPVOID)ptg); + + return bSuccess; +} + static BOOL HandleLogon( @@ -485,6 +568,8 @@ HandleLogon( goto cleanup; } + AllowWinstaAccess(Session); + if (!StartUserShell(Session)) { //WCHAR StatusMsg[256]; @@ -520,6 +605,8 @@ cleanup: RemoveStatusMessage(Session); if (!ret) { + SetWindowStationUser(Session->InteractiveWindowStation, + &LuidNone, NULL, 0); CloseHandle(Session->UserToken); Session->UserToken = NULL; } @@ -792,6 +879,11 @@ HandleLogoff( SwitchDesktop(Session->WinlogonDesktop); + // TODO: Play logoff sound! + + SetWindowStationUser(Session->InteractiveWindowStation, + &LuidNone, NULL, 0); + // DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOGGINGOFF); // FIXME: Closing network connections! @@ -1045,94 +1137,6 @@ DoGenericAction( } } -DWORD WINAPI SetWindowStationUser(HWINSTA hWinSta, LUID* pluid, PSID psid, DWORD sidSize); - -BOOL -AddAceToWindowStation( - IN HWINSTA WinSta, - IN PSID Sid); - -static -BOOL AllowWinstaAccess(PWLSESSION Session) -{ - BOOL bSuccess = FALSE; - DWORD dwIndex; - DWORD dwLength = 0; - PTOKEN_GROUPS ptg = NULL; - PSID psid; - TOKEN_STATISTICS Stats; - DWORD cbStats; - DWORD ret; - - // Get required buffer size and allocate the TOKEN_GROUPS buffer. - - if (!GetTokenInformation(Session->UserToken, - TokenGroups, - ptg, - 0, - &dwLength)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - return FALSE; - - ptg = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength); - if (ptg == NULL) - return FALSE; - } - - // Get the token group information from the access token. - if (!GetTokenInformation(Session->UserToken, - TokenGroups, - ptg, - dwLength, - &dwLength)) - { - goto Cleanup; - } - - // Loop through the groups to find the logon SID. - - for (dwIndex = 0; dwIndex < ptg->GroupCount; dwIndex++) - { - if ((ptg->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID) - == SE_GROUP_LOGON_ID) - { - psid = ptg->Groups[dwIndex].Sid; - break; - } - } - - dwLength = GetLengthSid(psid); - - if (!GetTokenInformation(Session->UserToken, - TokenStatistics, - &Stats, - sizeof(TOKEN_STATISTICS), - &cbStats)) - { - WARN("Couldn't get Authentication id from user token!\n"); - goto Cleanup; - } - - AddAceToWindowStation(Session->InteractiveWindowStation, psid); - - ret = SetWindowStationUser(Session->InteractiveWindowStation, - &Stats.AuthenticationId, - psid, - dwLength); - TRACE("SetWindowStationUser returned 0x%x\n", ret); - - bSuccess = TRUE; - -Cleanup: - - // Free the buffer for the token groups. - if (ptg != NULL) - HeapFree(GetProcessHeap(), 0, (LPVOID)ptg); - - return bSuccess; -} - static VOID DispatchSAS( @@ -1169,8 +1173,6 @@ DispatchSAS( &Session->UserToken, &Session->MprNotifyInfo, (PVOID*)&Session->Profile); - - AllowWinstaAccess(Session); break; case STATE_LOGGED_OFF_SAS: diff --git a/base/system/winlogon/winlogon.h b/base/system/winlogon/winlogon.h index 37960e2367..f1467c9c5c 100644 --- a/base/system/winlogon/winlogon.h +++ b/base/system/winlogon/winlogon.h @@ -43,6 +43,14 @@ #include <reactos/undocuser.h> +BOOL +WINAPI +SetWindowStationUser( + IN HWINSTA hWindowStation, + IN PLUID pluid, + IN PSID psid OPTIONAL, + IN DWORD size); + #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winlogon); @@ -292,9 +300,15 @@ BOOL StartRpcServer(VOID); /* sas.c */ +extern LUID LuidNone; + BOOL SetDefaultLanguage(IN PWLSESSION Session); +NTSTATUS +HandleShutdown(IN OUT PWLSESSION Session, + IN DWORD wlxAction); + BOOL InitializeSAS(IN OUT PWLSESSION Session); @@ -348,12 +362,14 @@ CloseAllDialogWindows(VOID); BOOL GinaInit(IN OUT PWLSESSION Session); +BOOL +AddAceToWindowStation( + IN HWINSTA WinSta, + IN PSID Sid); + BOOL CreateWindowStationAndDesktops(IN OUT PWLSESSION Session); -NTSTATUS -HandleShutdown(IN OUT PWLSESSION Session, - IN DWORD wlxAction); VOID WINAPI WlxUseCtrlAltDel(HANDLE hWlx); VOID WINAPI WlxSetContextPointer(HANDLE hWlx, PVOID pWlxContext); diff --git a/base/system/winlogon/wlx.c b/base/system/winlogon/wlx.c index 5557e7fbf5..89289c08a9 100644 --- a/base/system/winlogon/wlx.c +++ b/base/system/winlogon/wlx.c @@ -1271,7 +1271,7 @@ CreateWindowStationAndDesktops( NULL, 0, MAXIMUM_ALLOWED, - &DefaultSecurity); + &DefaultSecurity); // FIXME: Must use restricted Winlogon-only security!! if (!Session->WinlogonDesktop) { ERR("WL: Failed to create Winlogon desktop (%lu)\n", GetLastError()); @@ -1304,6 +1304,9 @@ CreateWindowStationAndDesktops( goto cleanup; } + SetWindowStationUser(Session->InteractiveWindowStation, + &LuidNone, NULL, 0); + ret = TRUE; cleanup:

1 0

01/01: [LDR] Release the loader lock the same way it was acquired
by Mark Jansen 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c48edb58c478cf6ab8df… commit 9c48edb58c478cf6ab8df0b6bf4b7cd3edab7983 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 22 17:17:36 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jul 22 17:17:36 2018 +0200 [LDR] Release the loader lock the same way it was acquired --- dll/ntdll/ldr/ldrutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 2542a9a324..5459d4a5d2 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -2626,7 +2626,7 @@ LdrpLoadDll(IN BOOLEAN Redirected, Quickie: /* Release the lock */ - if (!InInit) RtlLeaveCriticalSection(Peb->LoaderLock); + if (!InInit) RtlLeaveCriticalSection(&LdrpLoaderLock); /* Check for success */ if (NT_SUCCESS(Status))

1 0

01/01: [SERVICES] Add a checks for vaild info level to RChangeServiceConfig2A/W and RQueryServiceConfig2A/W
by Eric Kohl 22 Jul '18

22 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91a5ee334d3961157b1b5… commit 91a5ee334d3961157b1b52140911ae1f03b6cc71 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 22 12:45:23 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 22 12:45:23 2018 +0200 [SERVICES] Add a checks for vaild info level to RChangeServiceConfig2A/W and RQueryServiceConfig2A/W CORE-14837 --- base/system/services/rpcserver.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 0d75aae927..2e6e8087f1 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -5104,6 +5104,10 @@ RChangeServiceConfig2A( DPRINT("RChangeServiceConfig2A() called\n"); DPRINT("dwInfoLevel = %lu\n", Info.dwInfoLevel); + if ((Info.dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || + (Info.dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + return ERROR_INVALID_LEVEL; + InfoW.dwInfoLevel = Info.dwInfoLevel; if (InfoW.dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) @@ -5502,6 +5506,10 @@ RChangeServiceConfig2W( if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; + if ((Info.dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || + (Info.dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + return ERROR_INVALID_LEVEL; + hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { @@ -5638,6 +5646,10 @@ RQueryServiceConfig2A( if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; + if ((dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || + (dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + return ERROR_INVALID_LEVEL; + hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { @@ -5876,6 +5888,10 @@ RQueryServiceConfig2W( if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; + if ((dwInfoLevel < SERVICE_CONFIG_DESCRIPTION) || + (dwInfoLevel > SERVICE_CONFIG_FAILURE_ACTIONS)) + return ERROR_INVALID_LEVEL; + hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) {

1 0

01/01: [NET] Add the workstations option to the user command
by Eric Kohl 21 Jul '18

21 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=add1be24a7ee38687218f… commit add1be24a7ee38687218f09e3960bf633d383a07 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 21 22:13:49 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 21 22:13:49 2018 +0200 [NET] Add the workstations option to the user command --- base/applications/network/net/cmdUser.c | 126 +++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index 3e188de932..ec96c8163b 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -387,6 +387,107 @@ GenerateRandomPassword( } +static +NET_API_STATUS +BuildWorkstationsList( + _Out_ PWSTR *pWorkstationsList, + _In_ PWSTR pRaw) +{ + BOOL isLastSep, isSep; + INT i, j; + WCHAR c; + INT nLength = 0; + INT nArgs = 0; + INT nRawLength; + PWSTR pList; + + /* Check for invalid characters in the raw string */ + if (wcspbrk(pRaw, L"/[]=?\\+:.") != NULL) + return 3952; + + /* Count the number of workstations in the list and + * the required buffer size */ + isLastSep = FALSE; + isSep = FALSE; + nRawLength = wcslen(pRaw); + for (i = 0; i < nRawLength; i++) + { + c = pRaw[i]; + if (c == L',' || c == L';') + isSep = TRUE; + + if (isSep == TRUE) + { + if ((isLastSep == FALSE) && (i != 0) && (i != nRawLength - 1)) + nLength++; + } + else + { + nLength++; + + if (isLastSep == TRUE || (isLastSep == FALSE && i == 0)) + nArgs++; + } + + isLastSep = isSep; + isSep = FALSE; + } + + nLength++; + + /* Leave, if there are no workstations in the list */ + if (nArgs == 0) + { + pWorkstationsList = NULL; + return NERR_Success; + } + + /* Fail if there are more than eight workstations in the list */ + if (nArgs > 8) + return 3951; + + /* Allocate the buffer for the clean workstation list */ + pList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(WCHAR)); + if (pList == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + /* Build the clean workstation list */ + isLastSep = FALSE; + isSep = FALSE; + nRawLength = wcslen(pRaw); + for (i = 0, j = 0; i < nRawLength; i++) + { + c = pRaw[i]; + if (c == L',' || c == L';') + isSep = TRUE; + + if (isSep == TRUE) + { + if ((isLastSep == FALSE) && (i != 0) && (i != nRawLength - 1)) + { + pList[j] = L','; + j++; + } + } + else + { + pList[j] = c; + j++; + + if (isLastSep == TRUE || (isLastSep == FALSE && i == 0)) + nArgs++; + } + + isLastSep = isSep; + isSep = FALSE; + } + + *pWorkstationsList = pList; + + return NERR_Success; +} + + INT cmdUser( INT argc, @@ -404,6 +505,7 @@ cmdUser( LPWSTR lpPassword = NULL; PUSER_INFO_4 pUserInfo = NULL; USER_INFO_4 UserInfo; + LPWSTR pWorkstations = NULL; LPWSTR p; LPWSTR endptr; DWORD value; @@ -622,8 +724,25 @@ cmdUser( } else if (_wcsnicmp(argv[j], L"/workstations:", 14) == 0) { - /* FIXME */ - ConResPrintf(StdErr, IDS_ERROR_OPTION_NOT_SUPPORTED, L"/WORKSTATIONS"); + p = &argv[i][14]; + if (wcscmp(p, L"*") == 0 || wcscmp(p, L"") == 0) + { + pUserInfo->usri4_workstations = NULL; + } + else + { + Status = BuildWorkstationsList(&pWorkstations, p); + if (Status == NERR_Success) + { + pUserInfo->usri4_workstations = pWorkstations; + } + else + { + ConPrintf(StdOut, L"Status %lu\n\n", Status); + result = 1; + goto done; + } + } } } @@ -662,6 +781,9 @@ cmdUser( } done: + if (pWorkstations != NULL) + HeapFree(GetProcessHeap(), 0, pWorkstations); + if ((bPasswordAllocated == TRUE) && (lpPassword != NULL)) HeapFree(GetProcessHeap(), 0, lpPassword);

1 0

02/02: [WINLOGON] When starting Setup (which runs with SYSTEM credentials), explicitly specify on which window station and desktop we start it, so as to avoid the default choice of the non-interactive Service-0x0-3e7$ window station. Also, switch to the WinSta0\Default desktop just only before starting Setup, and restore Winlogon setup when it finishes.
by Hermès Bélusca-Maïto 17 Jul '18

17 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcec1fd6c37677d46d689… commit bcec1fd6c37677d46d6890d270bb1e27d17f8f34 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 17 01:49:07 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jul 17 01:59:51 2018 +0200 [WINLOGON] When starting Setup (which runs with SYSTEM credentials), explicitly specify on which window station and desktop we start it, so as to avoid the default choice of the non-interactive Service-0x0-3e7$ window station. Also, switch to the WinSta0\Default desktop just only before starting Setup, and restore Winlogon setup when it finishes. --- base/system/winlogon/setup.c | 9 +++++++-- base/system/winlogon/winlogon.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/base/system/winlogon/setup.c b/base/system/winlogon/setup.c index 7cec968e0e..f5ef367318 100644 --- a/base/system/winlogon/setup.c +++ b/base/system/winlogon/setup.c @@ -96,7 +96,7 @@ RunSetupThreadProc( /* Expand string (if applicable) */ if (dwType == REG_EXPAND_SZ) - ExpandEnvironmentStringsW(Shell, CommandLine, MAX_PATH); + ExpandEnvironmentStringsW(Shell, CommandLine, ARRAYSIZE(CommandLine)); else if (dwType == REG_SZ) wcscpy(CommandLine, Shell); else @@ -104,10 +104,12 @@ RunSetupThreadProc( TRACE("Should run '%s' now\n", debugstr_w(CommandLine)); + SwitchDesktop(WLSession->ApplicationDesktop); + /* Start process */ StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; + StartupInfo.lpDesktop = L"WinSta0\\Default"; StartupInfo.lpTitle = NULL; StartupInfo.dwFlags = 0; StartupInfo.cbReserved2 = 0; @@ -126,6 +128,7 @@ RunSetupThreadProc( if (!Result) { TRACE("Failed to run setup process\n"); + SwitchDesktop(WLSession->WinlogonDesktop); return FALSE; } @@ -138,6 +141,8 @@ RunSetupThreadProc( CloseHandle(ProcessInformation.hThread); CloseHandle(ProcessInformation.hProcess); + SwitchDesktop(WLSession->WinlogonDesktop); + TRACE ("RunSetup() done\n"); return TRUE; diff --git a/base/system/winlogon/winlogon.c b/base/system/winlogon/winlogon.c index 2b2e5303f6..eeba3a2334 100644 --- a/base/system/winlogon/winlogon.c +++ b/base/system/winlogon/winlogon.c @@ -453,14 +453,14 @@ WinMain( /* Check for pending setup */ if (GetSetupType() != 0) { - TRACE("WL: Setup mode detected\n"); - /* Run setup and reboot when done */ - SwitchDesktop(WLSession->ApplicationDesktop); + TRACE("WL: Setup mode detected\n"); RunSetup(); } else + { PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_CTRL_ALT_DEL, 0); + } (void)LoadLibraryW(L"sfc_os.dll");

1 0

01/02: [PSDK] Fix a typo. Has also been caught independently by George Bișoc (#686).
by Hermès Bélusca-Maïto 17 Jul '18

17 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1c7fd08e9ec38e97914f… commit b1c7fd08e9ec38e97914f31127bc6568a851f77a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 15 23:18:32 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jul 17 01:59:51 2018 +0200 [PSDK] Fix a typo. Has also been caught independently by George Bișoc (#686). --- sdk/include/psdk/winuser.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 60a92d6dfc..07613795e4 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -5406,7 +5406,7 @@ BOOL WINAPI GetLayeredWindowAttributes(_In_ HWND, _Out_opt_ COLORREF*, _Out_opt_ #define EDITWORDBREAKPROC EDITWORDBREAKPROCW #define PROPENUMPROC PROPENUMPROCW #define PROPENUMPROCEX PROPENUMPROCEXW -#define DEKSTOPENUMPROC DEKSTOPENUMPROCW +#define DESKTOPENUMPROC DESKTOPENUMPROCW #define WINSTAENUMPROC WINSTAENUMPROCW #define PROPENUMPROC PROPENUMPROCW #define PROPENUMPROCEX PROPENUMPROCEXW @@ -5572,7 +5572,7 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX; #define EDITWORDBREAKPROC EDITWORDBREAKPROCA #define PROPENUMPROC PROPENUMPROCA #define PROPENUMPROCEX PROPENUMPROCEXA -#define DEKSTOPENUMPROC DEKSTOPENUMPROCA +#define DESKTOPENUMPROC DESKTOPENUMPROCA #define WINSTAENUMPROC WINSTAENUMPROCA #define PROPENUMPROC PROPENUMPROCA #define PROPENUMPROCEX PROPENUMPROCEXA

1 0

01/01: [ASM] Fixed ".double" macro in asm.inc. GAS uses ".double" symbol for declaring floating-point constants and ".quad" symbol for declaring 64-bit numbers. This is not compatible with our macro for MASM and introduces bugs. Now 64-bit constants are supposed to be declared using ".quad" macro.
by Victor Perevertkin 15 Jul '18

15 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ae1675208bb05e43c91b… commit 2ae1675208bb05e43c91b5762a10d1292298f420 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sun Jul 15 18:49:49 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 15 23:25:23 2018 +0200 [ASM] Fixed ".double" macro in asm.inc. GAS uses ".double" symbol for declaring floating-point constants and ".quad" symbol for declaring 64-bit numbers. This is not compatible with our macro for MASM and introduces bugs. Now 64-bit constants are supposed to be declared using ".quad" macro. --- boot/freeldr/freeldr/arch/amd64/entry.S | 4 ++-- sdk/include/asm/asm.inc | 6 +++++- sdk/lib/crt/except/amd64/cpp.s | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/arch/amd64/entry.S b/boot/freeldr/freeldr/arch/amd64/entry.S index a5b7fd6770..075778f884 100644 --- a/boot/freeldr/freeldr/arch/amd64/entry.S +++ b/boot/freeldr/freeldr/arch/amd64/entry.S @@ -25,7 +25,7 @@ RealEntryPoint: jmp qword ptr [ContinueAddress] ContinueAddress: - .double offset FrldrStartup + .quad offset FrldrStartup FrldrStartup: @@ -120,7 +120,7 @@ CallRealMode_return: /* 64-bit stack pointer */ stack64: - .double STACKADDR + .quad STACKADDR PUBLIC FrldrBootDrive FrldrBootDrive: diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc index 3b4dfe1458..e94a078445 100644 --- a/sdk/include/asm/asm.inc +++ b/sdk/include/asm/asm.inc @@ -136,10 +136,14 @@ ENDM dd args ENDM -.double MACRO args:VARARG +.quad MACRO args:VARARG dq args ENDM +.double MACRO args:VARARG + real8 args +ENDM + .org MACRO value ORG value ENDM diff --git a/sdk/lib/crt/except/amd64/cpp.s b/sdk/lib/crt/except/amd64/cpp.s index a5ead9508b..3be32c9648 100644 --- a/sdk/lib/crt/except/amd64/cpp.s +++ b/sdk/lib/crt/except/amd64/cpp.s @@ -8,18 +8,18 @@ MACRO(START_VTABLE, shortname, cxxname) EXTERN shortname&_rtti:PROC EXTERN MSVCRT_&shortname&_vector_dtor:PROC - .double shortname&_rtti + .quad shortname&_rtti PUBLIC MSVCRT_&shortname&_vtable MSVCRT_&shortname&_vtable: PUBLIC &cxxname &cxxname: - .double MSVCRT_&shortname&_vector_dtor + .quad MSVCRT_&shortname&_vector_dtor ENDM MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname) START_VTABLE shortname, cxxname EXTERN MSVCRT_what_exception:ABS - .double MSVCRT_what_exception + .quad MSVCRT_what_exception ENDM START_VTABLE type_info, __dummyname_type_info

1 0

01/01: [NTOSKRNL][NDK][UMPNPMGR] Define and use PLUGPLAY_CONTROL_PROPERTY_DATA.Properties values
by Eric Kohl 15 Jul '18

15 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ffa0a2e5525805bb26f2… commit 4ffa0a2e5525805bb26f29cdcb1ffdd0722296bc Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 15 15:57:57 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 15 15:57:57 2018 +0200 [NTOSKRNL][NDK][UMPNPMGR] Define and use PLUGPLAY_CONTROL_PROPERTY_DATA.Properties values NDK: Define PLUGPLAY_CONTROL_PROPERTY_DATA.Properties and PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA.Relations values. NTOSKRNL: Map PLUGPLAY_CONTROL_PROPERTY_DATA.Properties values to IoGetDeviceProperty properties and add (dummy) code for unsupported cases. UMPNPMGR: Use PLUGPLAY_CONTROL_PROPERTY_DATA.Properties values in PNP_GetDeviceRegProp. --- base/services/umpnpmgr/umpnpmgr.c | 35 +++++----- ntoskrnl/io/pnpmgr/plugplay.c | 134 ++++++++++++++++++++++++++++++++++---- sdk/include/ndk/cmtypes.h | 33 +++++++++- 3 files changed, 169 insertions(+), 33 deletions(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index de64057afb..478bcc7825 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -926,61 +926,58 @@ PNP_GetDeviceRegProp( switch (ulProperty) { case CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME: - PlugPlayData.Property = 0xb; // DevicePropertyPhysicalDeviceObjectName; + PlugPlayData.Property = PNP_PROPERTY_PHYSICAL_DEVICE_OBJECT_NAME; break; case CM_DRP_UI_NUMBER: - PlugPlayData.Property = 0x11; // DevicePropertyUINumber; + PlugPlayData.Property = PNP_PROPERTY_UI_NUMBER; break; case CM_DRP_BUSTYPEGUID: - PlugPlayData.Property = 0xc; // DevicePropertyBusTypeGuid; + PlugPlayData.Property = PNP_PROPERTY_BUSTYPEGUID; break; case CM_DRP_LEGACYBUSTYPE: - PlugPlayData.Property = 0xd; // DevicePropertyLegacyBusType; + PlugPlayData.Property = PNP_PROPERTY_LEGACYBUSTYPE; break; case CM_DRP_BUSNUMBER: - PlugPlayData.Property = 0xe; // DevicePropertyBusNumber; + PlugPlayData.Property = PNP_PROPERTY_BUSNUMBER; break; case CM_DRP_ENUMERATOR_NAME: - PlugPlayData.Property = 0xf; // DevicePropertyEnumeratorName; + PlugPlayData.Property = PNP_PROPERTY_ENUMERATOR_NAME; break; case CM_DRP_ADDRESS: - PlugPlayData.Property = 0x10; // DevicePropertyAddress; + PlugPlayData.Property = PNP_PROPERTY_ADDRESS; break; -#if 0 - /* FIXME: This property is not supported by IoGetDeviceProperty */ case CM_DRP_DEVICE_POWER_DATA: -#endif + PlugPlayData.Property = PNP_PROPERTY_POWER_DATA; + break; case CM_DRP_REMOVAL_POLICY: - PlugPlayData.Property = 0x13; // DevicePropertyRemovalPolicy + PlugPlayData.Property = PNP_PROPERTY_REMOVAL_POLICY; break; -#if 0 - /* FIXME: This property is not supported by IoGetDeviceProperty */ case CM_DRP_REMOVAL_POLICY_HW_DEFAULT: -#endif + PlugPlayData.Property = PNP_PROPERTY_REMOVAL_POLICY_HARDWARE_DEFAULT; + break; case CM_DRP_INSTALL_STATE: - PlugPlayData.Property = 0x12; // DevicePropertyInstallState; + PlugPlayData.Property = PNP_PROPERTY_INSTALL_STATE; break; -#if 0 - /* FIXME: This property is not supported by IoGetDeviceProperty */ #if (WINVER >= _WIN32_WINNT_WS03) case CM_DRP_LOCATION_PATHS: -#endif + PlugPlayData.Property = PNP_PROPERTY_LOCATION_PATHS; + break; #endif #if (WINVER >= _WIN32_WINNT_WIN7) case CM_DRP_BASE_CONTAINERID: - PlugPlayData.Property = 0x16; // DevicePropertyContainerID; + PlugPlayData.Property = PNP_PROPERTY_CONTAINERID; break; #endif diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index 9797017e87..4c65792a4a 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -294,11 +294,13 @@ static NTSTATUS IopGetDeviceProperty(PPLUGPLAY_CONTROL_PROPERTY_DATA PropertyData) { PDEVICE_OBJECT DeviceObject = NULL; - NTSTATUS Status; + PDEVICE_NODE DeviceNode; UNICODE_STRING DeviceInstance; ULONG BufferSize; - ULONG Property = 0; + ULONG Property; + DEVICE_REGISTRY_PROPERTY DeviceProperty; PVOID Buffer; + NTSTATUS Status; DPRINT("IopGetDeviceProperty() called\n"); DPRINT("Device name: %wZ\n", &PropertyData->DeviceInstance); @@ -341,14 +343,124 @@ IopGetDeviceProperty(PPLUGPLAY_CONTROL_PROPERTY_DATA PropertyData) Buffer = ExAllocatePool(NonPagedPool, BufferSize); if (Buffer == NULL) { + ObDereferenceObject(DeviceObject); return STATUS_INSUFFICIENT_RESOURCES; } - Status = IoGetDeviceProperty(DeviceObject, - Property, - BufferSize, - Buffer, - &BufferSize); + + DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->DeviceNode; + + if (Property == PNP_PROPERTY_POWER_DATA) + { + if (BufferSize < sizeof(CM_POWER_DATA)) + { + BufferSize = 0; + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { +// DEVICE_CAPABILITIES DeviceCapabilities; + PCM_POWER_DATA PowerData; + +// Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities); + + PowerData = (PCM_POWER_DATA)Buffer; + PowerData->PD_Size = sizeof(CM_POWER_DATA); +/* + PowerData->PD_MostRecentPowerState; + PowerData->PD_Capabilities; + PowerData->PD_D1Latency; + PowerData->PD_D2Latency; + PowerData->PD_D3Latency; + PowerData->PD_PowerStateMapping[POWER_SYSTEM_MAXIMUM]; + PowerData->PD_DeepestSystemWake; +*/ + } + } + else if (Property == PNP_PROPERTY_REMOVAL_POLICY_OVERRIDE) + { + } + else if (Property == PNP_PROPERTY_REMOVAL_POLICY_HARDWARE_DEFAULT) + { + if (BufferSize < sizeof(DeviceNode->HardwareRemovalPolicy)) + { + BufferSize = 0; + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + BufferSize = sizeof(DeviceNode->HardwareRemovalPolicy); + RtlCopyMemory(Buffer, + &DeviceNode->HardwareRemovalPolicy, + BufferSize); + } + } + else + { + switch (Property) + { + case PNP_PROPERTY_UI_NUMBER: + DeviceProperty = DevicePropertyUINumber; + break; + + case PNP_PROPERTY_PHYSICAL_DEVICE_OBJECT_NAME: + DeviceProperty = DevicePropertyPhysicalDeviceObjectName; + break; + + case PNP_PROPERTY_BUSTYPEGUID: + DeviceProperty = DevicePropertyBusTypeGuid; + break; + + case PNP_PROPERTY_LEGACYBUSTYPE: + DeviceProperty = DevicePropertyLegacyBusType; + break; + + case PNP_PROPERTY_BUSNUMBER: + DeviceProperty = DevicePropertyBusNumber; + break; + + case PNP_PROPERTY_REMOVAL_POLICY: + DeviceProperty = DevicePropertyRemovalPolicy; + break; + + case PNP_PROPERTY_ADDRESS: + DeviceProperty = DevicePropertyAddress; + break; + + case PNP_PROPERTY_ENUMERATOR_NAME: + DeviceProperty = DevicePropertyEnumeratorName; + break; + + case PNP_PROPERTY_INSTALL_STATE: + DeviceProperty = DevicePropertyInstallState; + break; + +#if (WINVER >= _WIN32_WINNT_WS03) + case PNP_PROPERTY_LOCATION_PATHS: + break; +#endif + +#if (WINVER >= _WIN32_WINNT_WIN7) + case PNP_PROPERTY_CONTAINERID: + DeviceProperty = DevicePropertyContainerID; + break; +#endif + + default: + BufferSize = 0; + Status = STATUS_INVALID_PARAMETER; + break; + } + + if (Status == STATUS_SUCCESS) + { + Status = IoGetDeviceProperty(DeviceObject, + DeviceProperty, + BufferSize, + Buffer, + &BufferSize); + } + } ObDereferenceObject(DeviceObject); @@ -696,19 +808,19 @@ IopGetDeviceRelations(PPLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA RelationsData) switch (Relations) { - case 0: /* EjectRelations */ + case PNP_EJECT_RELATIONS: Stack.Parameters.QueryDeviceRelations.Type = EjectionRelations; break; - case 1: /* RemovalRelations */ + case PNP_REMOVAL_RELATIONS: Stack.Parameters.QueryDeviceRelations.Type = RemovalRelations; break; - case 2: /* PowerRelations */ + case PNP_POWER_RELATIONS: Stack.Parameters.QueryDeviceRelations.Type = PowerRelations; break; - case 3: /* BusRelations */ + case PNP_BUS_RELATIONS: Stack.Parameters.QueryDeviceRelations.Type = BusRelations; break; diff --git a/sdk/include/ndk/cmtypes.h b/sdk/include/ndk/cmtypes.h index 56fbaa1139..1d58d93b68 100644 --- a/sdk/include/ndk/cmtypes.h +++ b/sdk/include/ndk/cmtypes.h @@ -28,6 +28,24 @@ Author: #define MAX_BUS_NAME 24 +// +// PLUGPLAY_CONTROL_PROPERTY_DATA.Properties +// +#define PNP_PROPERTY_UI_NUMBER 0 +#define PNP_PROPERTY_PHYSICAL_DEVICE_OBJECT_NAME 1 +#define PNP_PROPERTY_BUSTYPEGUID 2 +#define PNP_PROPERTY_LEGACYBUSTYPE 3 +#define PNP_PROPERTY_BUSNUMBER 4 +#define PNP_PROPERTY_POWER_DATA 5 +#define PNP_PROPERTY_REMOVAL_POLICY 6 +#define PNP_PROPERTY_REMOVAL_POLICY_OVERRIDE 7 +#define PNP_PROPERTY_ADDRESS 8 +#define PNP_PROPERTY_ENUMERATOR_NAME 9 +#define PNP_PROPERTY_REMOVAL_POLICY_HARDWARE_DEFAULT 10 +#define PNP_PROPERTY_INSTALL_STATE 11 +#define PNP_PROPERTY_LOCATION_PATHS 12 +#define PNP_PROPERTY_CONTAINERID 13 + // // PLUGPLAY_CONTROL_RELATED_DEVICE_DATA.Relations // @@ -36,12 +54,21 @@ Author: #define PNP_GET_SIBLING_DEVICE 3 // -// PLUGPLAY_CONTROL_STATUS_DATA Operations +// PLUGPLAY_CONTROL_STATUS_DATA.Operation // #define PNP_GET_DEVICE_STATUS 0 #define PNP_SET_DEVICE_STATUS 1 #define PNP_CLEAR_DEVICE_STATUS 2 +// +// PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA.Relations +// +#define PNP_EJECT_RELATIONS 0 +#define PNP_REMOVAL_RELATIONS 1 +#define PNP_POWER_RELATIONS 2 +#define PNP_BUS_RELATIONS 3 + + #ifdef NTOS_MODE_USER // @@ -466,7 +493,7 @@ typedef struct _PLUGPLAY_CONTROL_DEPTH_DATA typedef struct _PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA { UNICODE_STRING DeviceInstance; - ULONG Relations; // 0:EjectRelations, 1:RemovalRelations, 2:PowerRelations, 3:BusRelations + ULONG Relations; ULONG BufferSize; PWCHAR Buffer; } PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA, *PPLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA; @@ -481,7 +508,7 @@ typedef struct _PLUGPLAY_CONTROL_RETRIEVE_DOCK_DATA // Class 0x14 typedef struct _PLUGPLAY_CONTROL_RESET_DEVICE_DATA { - UNICODE_STRING DeviceInstance; + UNICODE_STRING DeviceInstance; } PLUGPLAY_CONTROL_RESET_DEVICE_DATA, *PPLUGPLAY_CONTROL_RESET_DEVICE_DATA; //

1 0

01/01: [NTOSKRNL] Be noisy when deferring writes.
by Pierre Schweitzer 15 Jul '18

15 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0075c2a02d85c2dec953f… commit 0075c2a02d85c2dec953f772301474649fa0c7bc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Jul 15 09:57:16 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Jul 15 09:57:16 2018 +0200 [NTOSKRNL] Be noisy when deferring writes. --- ntoskrnl/cc/copy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index a70e0ab766..a46ed96640 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -779,6 +779,7 @@ CcCanIWrite ( &CcDeferredWriteSpinLock); } + DPRINT1("Actively deferring write for: %p\n", FileObject); /* Now, we'll loop until our event is set. When it is set, it means that caller * can immediately write, and has to */

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2018