Ros-diffs May 2021

ros-diffs@reactos.org

21 participants
183 discussions

[reactos] 01/01: [KDGDB] Implement TIB address retrieval

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9930eeca765ac2520a7bd… commit 9930eeca765ac2520a7bd5dd411915d232cc96c3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu May 6 18:32:44 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue May 11 11:00:49 2021 +0200 [KDGDB] Implement TIB address retrieval --- drivers/base/kdgdb/gdb_input.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/base/kdgdb/gdb_input.c b/drivers/base/kdgdb/gdb_input.c index c10d7750c84..822efb88042 100644 --- a/drivers/base/kdgdb/gdb_input.c +++ b/drivers/base/kdgdb/gdb_input.c @@ -259,6 +259,30 @@ handle_gdb_query(void) return send_gdb_packet("l"); } + if (strncmp(gdb_input, "qGetTIBAddr:", 12) == 0) + { + ULONG_PTR Pid, Tid; + PETHREAD Thread; + +#if MONOPROCESS + Pid = 0; + Tid = hex_to_tid(&gdb_input[12]); + + KDDBGPRINT(" %p.\n", Tid); + + Thread = find_thread(Pid, Tid); +#else + Pid = hex_to_pid(&gdb_input[13]); + Tid = hex_to_tid(strstr(&gdb_input[13], ".") + 1); + + /* We cannot use PsLookupProcessThreadByCid as we could be running at any IRQL. + * So loop. */ + KDDBGPRINT(" p%p.%p.\n", Pid, Tid); + Thread = find_thread(Pid, Tid); +#endif + return send_gdb_memory(&Thread->Tcb.Teb, sizeof(Thread->Tcb.Teb)); + } + if (strncmp(gdb_input, "qThreadExtraInfo,", 17) == 0) { ULONG_PTR Pid, Tid;

3 years, 7 months

[reactos] 01/01: [KMTESTS:SE] Remove erroneous tests regarding impersonation level

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac976626192df5d6bfe83… commit ac976626192df5d6bfe836346065ef1ce4817f62 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat May 8 17:25:33 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue May 11 09:20:28 2021 +0200 [KMTESTS:SE] Remove erroneous tests regarding impersonation level These tests didn't make much sense. The captured token from the subject context is not an impersonation token and both Windows and ReactOS ultimately fail on those tests. --- .../rostests/kmtests/ntos_se/SeQueryInfoToken.c | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c b/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c index 6e4f3b1cf24..97ea924cf76 100644 --- a/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c +++ b/modules/rostests/kmtests/ntos_se/SeQueryInfoToken.c @@ -104,26 +104,13 @@ void TestsSeQueryInformationToken(PACCESS_TOKEN Token) //----------------------------------------------------------------// - // Call SQIT with TokenImpersonationLevel argument - // - // What's up? Why SQIT fails with right arg? - // Because your token has Token->TokenType != TokenImpersonation. -hbelusca + // Call SQIT with TokenImpersonationLevel argument. Although our token + // is not an impersonation token, the call will outright fail. Buffer = NULL; Status = SeQueryInformationToken(Token, TokenImpersonationLevel, &Buffer); - ok(Status == STATUS_SUCCESS, "SQIT with TokenImpersonationLevel fails with status 0x%08X\n", Status); - if (Buffer) ExFreePool(Buffer); - - Buffer = NULL; - Status = SeQueryInformationToken(Token, TokenImpersonationLevel, &Buffer); - ok(Status == STATUS_SUCCESS, "and again: SQIT with TokenImpersonationLevel fails with status 0x%08X\n", Status); - if (Status == STATUS_SUCCESS) - { - ok(Buffer != NULL, "Wrong. SQIT call was successful with TokenImpersonationLevel arg. But Buffer == NULL\n"); - } else { - ok(Buffer == NULL, "Wrong. SQIT call failed. But Buffer != NULL\n"); - } - if (Buffer) ExFreePool(Buffer); + ok(Status == STATUS_INVALID_INFO_CLASS, "SQIT with TokenImpersonationLevel must return STATUS_INVALID_INFO_CLASS but got 0x%08X\n", Status); + ok(Buffer == NULL, "SQIT has failed to query the impersonation level but buffer is not NULL!\n"); //----------------------------------------------------------------// @@ -420,4 +407,4 @@ START_TEST(SeQueryInfoToken) if (SubjectContext) ExFreePool(SubjectContext); if (AuxData) ExFreePool(AuxData); if (AccessState) ExFreePool(AccessState); -} \ No newline at end of file +}

3 years, 7 months

[reactos] 01/01: [CMDUTILS][WHERE] Implement WHERE command (#3642)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55060911e4070ba3aa82a… commit 55060911e4070ba3aa82a88042232786866c7d8a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue May 11 14:37:49 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 11 14:37:49 2021 +0900 [CMDUTILS][WHERE] Implement WHERE command (#3642) WHERE is a Windows command that finds the file location from a executable file name. This PR implements it in ReactOS. CORE-17443 --- base/applications/cmdutils/CMakeLists.txt | 1 + base/applications/cmdutils/where/CMakeLists.txt | 7 + base/applications/cmdutils/where/lang/en-US.rc | 52 +++ base/applications/cmdutils/where/resource.h | 15 + base/applications/cmdutils/where/strlist.h | 66 ++++ base/applications/cmdutils/where/where.c | 486 ++++++++++++++++++++++++ base/applications/cmdutils/where/where.rc | 12 + 7 files changed, 639 insertions(+) diff --git a/base/applications/cmdutils/CMakeLists.txt b/base/applications/cmdutils/CMakeLists.txt index f1cd0b9fd1d..7f8038789c8 100644 --- a/base/applications/cmdutils/CMakeLists.txt +++ b/base/applications/cmdutils/CMakeLists.txt @@ -25,6 +25,7 @@ add_subdirectory(taskkill) add_subdirectory(tasklist) add_subdirectory(timeout) add_subdirectory(tree) +add_subdirectory(where) add_subdirectory(whoami) add_subdirectory(wmic) add_subdirectory(wscript) diff --git a/base/applications/cmdutils/where/CMakeLists.txt b/base/applications/cmdutils/where/CMakeLists.txt new file mode 100644 index 00000000000..790187f06de --- /dev/null +++ b/base/applications/cmdutils/where/CMakeLists.txt @@ -0,0 +1,7 @@ +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) + +add_executable(where where.c where.rc) +set_module_type(where win32cui UNICODE) +target_link_libraries(where conutils ${PSEH_LIB}) +add_importlibs(where msvcrt kernel32) +add_cd_file(TARGET where DESTINATION reactos/system32 FOR all) diff --git a/base/applications/cmdutils/where/lang/en-US.rc b/base/applications/cmdutils/where/lang/en-US.rc new file mode 100644 index 00000000000..ce4144fda77 --- /dev/null +++ b/base/applications/cmdutils/where/lang/en-US.rc @@ -0,0 +1,52 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USAGE "Usage: WHERE [options] pattern...\n\ +\n\ +Description:\n\ + Shows the location of the file(s) specified by the pattern(s).\n\ + By default, this tool searches by using the pattern(s) and the paths\n\ + of the PATH environment variable.\n\ +\n\ +Options:\n\ + /F Displays all matched file(s) in double quotes.\n\ + /Q Quiet mode. Doesn't show any files and messages.\n\ + /R dir Starts searching from the specified directory and recursively\n\ + performs the search.\n\ + /T Shows the file size and last modified date of all matched\n\ + files.\n\ + pattern Specifies the pattern to search files. Wildcards * and ? can\n\ + be used. ""$env:pattern"" and ""path:pattern"" formats can also\n\ + be used, where ""env"" is an environment variable and\n\ + the search is done in the paths of the ""env"" environment\n\ + variable. Don't use these formats with /R. The search is also\n\ + performed by adding the extension of the PATHEXT variable to\n\ + the pattern.\n\ + /? Displays this message.\n\ +\n\ +NOTE: This tool returns an error level of 0 if the search was successful,\n\ + 1 if the file was not found, and 2 if there was an error.\n\ +\n\ +Example:\n\ + WHERE myfile*.exe\n\ + WHERE /F /T mspaint\n\ + WHERE $WINDIR:notepad myfile???\n\ + WHERE C:\\ReactOS;C:\\ReactOS\\system32:exp*.exe\n\ + WHERE /R ""C:\\Program Files"" *.dll\n" + + IDS_BAD_ARG "ERROR: Invalid argument - '%ls'.\n" + IDS_NOT_FOUND "INFO: Could not find files for the given pattern(s).\n" + IDS_FILE_INFO "%10I64u %-12ls %-12ls %ls\n" + IDS_WANT_VALUE "ERROR: Value is needed for '%ls'.\n" + IDS_TYPE_HELP "Type ""WHERE /?"" for usage help.\n" + IDS_ENVPAT_WITH_R "ERROR: ""$env:pattern"" cannot be used with /R.\n" + IDS_PATHPAT_WITH_R "ERROR: ""path:pattern"" format cannot be used with /R.\n" + IDS_BAD_PATHPAT "ERROR: Invalid pattern is specified in ""path:pattern"".\n" + IDS_OUTOFMEMORY "ERROR: Out of memory.\n" + IDS_BAD_ENVVAR "ERROR: Environment variable ""%ls"" is not found.\n" + IDS_CANT_FOUND "ERROR: The system could not find the file specified.\n" + IDS_BAD_DIR "ERROR: Invalid directory is specified.\n" + IDS_BAD_NAME "ERROR: The filename, directory name or volume label syntax is wrong.\n" + IDS_TOO_MANY "ERROR: '%ls' option is not allowed more than '%u' time(s).\n" +END diff --git a/base/applications/cmdutils/where/resource.h b/base/applications/cmdutils/where/resource.h new file mode 100644 index 00000000000..a1dc35e828b --- /dev/null +++ b/base/applications/cmdutils/where/resource.h @@ -0,0 +1,15 @@ +#define IDS_USAGE 100 +#define IDS_BAD_ARG 101 +#define IDS_NOT_FOUND 103 +#define IDS_FILE_INFO 104 +#define IDS_WANT_VALUE 106 +#define IDS_TYPE_HELP 107 +#define IDS_ENVPAT_WITH_R 108 +#define IDS_PATHPAT_WITH_R 109 +#define IDS_BAD_PATHPAT 110 +#define IDS_OUTOFMEMORY 111 +#define IDS_BAD_ENVVAR 112 +#define IDS_CANT_FOUND 113 +#define IDS_BAD_DIR 114 +#define IDS_BAD_NAME 115 +#define IDS_TOO_MANY 116 diff --git a/base/applications/cmdutils/where/strlist.h b/base/applications/cmdutils/where/strlist.h new file mode 100644 index 00000000000..c877ff55863 --- /dev/null +++ b/base/applications/cmdutils/where/strlist.h @@ -0,0 +1,66 @@ +/* + * PROJECT: ReactOS WHERE command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Providing string list + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#define str_clone _wcsdup + +typedef struct strlist_t +{ + LPWSTR *ppsz; + unsigned int count; +} strlist_t; +#define strlist_default { NULL, 0 } + +static inline void strlist_init(strlist_t *plist) +{ + plist->ppsz = NULL; + plist->count = 0; +} + +static inline LPWSTR strlist_get_at(strlist_t *plist, unsigned int i) +{ + return plist->ppsz[i]; +} + +static int strlist_add(strlist_t *plist, LPCWSTR psz) +{ + LPWSTR *ppsz, clone = str_clone(psz); + if (!clone) + return 0; + ppsz = (LPWSTR *)realloc(plist->ppsz, (plist->count + 1) * sizeof(LPWSTR)); + if (!ppsz) + { + free(clone); + return 0; + } + plist->ppsz = ppsz; + plist->ppsz[plist->count] = clone; + ++(plist->count); + return 1; +} + +static void strlist_destroy(strlist_t *plist) +{ + unsigned int i; + for (i = 0; i < plist->count; ++i) + free(plist->ppsz[i]); + plist->count = 0; + free(plist->ppsz); + plist->ppsz = NULL; +} + +static inline int strlist_find_i(strlist_t *plist, LPCWSTR psz) +{ + unsigned int i; + for (i = 0; i < plist->count; ++i) + { + if (_wcsicmp(plist->ppsz[i], psz) == 0) + return i; + } + return -1; +} diff --git a/base/applications/cmdutils/where/where.c b/base/applications/cmdutils/where/where.c new file mode 100644 index 00000000000..f4f68a14944 --- /dev/null +++ b/base/applications/cmdutils/where/where.c @@ -0,0 +1,486 @@ +/* + * PROJECT: ReactOS WHERE command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Search executable files + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <strsafe.h> +#include <conutils.h> +#include "strlist.h" // strlist_... +#include "resource.h" + +#define FLAG_HELP (1 << 0) // "/?" +#define FLAG_R (1 << 1) // recursive directory +#define FLAG_Q (1 << 2) // quiet mode +#define FLAG_F (1 << 3) // double quote +#define FLAG_T (1 << 4) // detailed info + +static DWORD s_dwFlags = 0; +static LPWSTR s_pszRecursiveDir = NULL; +static strlist_t s_patterns = strlist_default; +static strlist_t s_results = strlist_default; +static strlist_t s_pathext = strlist_default; + +// is it either "." or ".."? +#define IS_DOTS(pch) \ + (*(pch) == L'.' && ((pch)[1] == 0 || ((pch)[1] == L'.' && (pch)[2] == 0))) + +#define DEFAULT_PATHEXT L".com;.exe;.bat;.cmd" + +typedef enum WRET // return code of WHERE command +{ + WRET_SUCCESS = 0, + WRET_NOT_FOUND = 1, + WRET_ERROR = 2 +} WRET; + +static VOID WhereError(UINT nID) +{ + if (!(s_dwFlags & FLAG_Q)) // not quiet mode? + ConResPuts(StdErr, nID); +} + +typedef BOOL (CALLBACK *WHERE_CALLBACK)(LPCWSTR pattern, LPCWSTR path, PWIN32_FIND_DATAW data); + +static BOOL +WhereSearchGeneric(LPCWSTR pattern, LPWSTR path, size_t path_len, BOOL bDir, + WHERE_CALLBACK callback) +{ + LPWSTR pch; + size_t cch; + BOOL ret; + WIN32_FIND_DATAW data; + HANDLE hFind = FindFirstFileExW(path, FindExInfoStandard, &data, FindExSearchNameMatch, + NULL, 0); + if (hFind == INVALID_HANDLE_VALUE) + return TRUE; // not found + + pch = wcsrchr(path, L'\\') + 1; + cch = path_len - (pch - path); + do + { + if (bDir != !!(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + if (bDir && IS_DOTS(data.cFileName)) + continue; // ignore "." and ".." + if (data.dwFileAttributes & FILE_ATTRIBUTE_VIRTUAL) + continue; // ignore virtual + + StringCchCopyW(pch, cch, data.cFileName); // build full path + + ret = callback(pattern, path, &data); + if (!ret) // out of memory + break; + } while (FindNextFileW(hFind, &data)); + FindClose(hFind); + return ret; +} + +static BOOL CALLBACK WherePrintPath(LPCWSTR pattern, LPCWSTR path, PWIN32_FIND_DATAW data) +{ + WCHAR szPath[MAX_PATH + 2], szDate[32], szTime[32]; + LARGE_INTEGER FileSize; + FILETIME ftLocal; + SYSTEMTIME st; + + if (strlist_find_i(&s_results, path) >= 0) + return TRUE; // already exists + if (!strlist_add(&s_results, path)) + return FALSE; // out of memory + if (s_dwFlags & FLAG_Q) // quiet mode? + return TRUE; + + if (s_dwFlags & FLAG_T) // print detailed info + { + // convert date/time + FileTimeToLocalFileTime(&data->ftLastWriteTime, &ftLocal); + FileTimeToSystemTime(&ftLocal, &st); + // get date/time strings + GetDateFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, szDate, _countof(szDate)); + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, szTime, _countof(szTime)); + // set size + FileSize.LowPart = data->nFileSizeLow; + FileSize.HighPart = data->nFileSizeHigh; + // print + if (s_dwFlags & FLAG_F) // double quote + StringCchPrintfW(szPath, _countof(szPath), L"\"%s\"", path); + else + StringCchCopyW(szPath, _countof(szPath), path); + ConResPrintf(StdOut, IDS_FILE_INFO, FileSize.QuadPart, szDate, szTime, szPath); + } + else // print path only + { + if (s_dwFlags & FLAG_F) // double quote + ConPrintf(StdOut, L"\"%ls\"\n", path); + else + ConPrintf(StdOut, L"%ls\n", path); + } + return TRUE; // success +} + +static BOOL WhereSearchFiles(LPCWSTR pattern, LPCWSTR dir) +{ + INT iExt; + size_t cch; + WCHAR szPath[MAX_PATH]; + StringCchCopyW(szPath, _countof(szPath), dir); + StringCchCatW(szPath, _countof(szPath), L"\\"); + StringCchCatW(szPath, _countof(szPath), pattern); + cch = wcslen(szPath); + + for (iExt = 0; iExt < s_pathext.count; ++iExt) + { + szPath[cch] = 0; // cut off extension + // append extension + StringCchCatW(szPath, _countof(szPath), strlist_get_at(&s_pathext, iExt)); + + if (!WhereSearchGeneric(pattern, szPath, _countof(szPath), FALSE, WherePrintPath)) + return FALSE; + } + return TRUE; +} + +static BOOL WhereSearchRecursive(LPCWSTR pattern, LPCWSTR dir); + +static BOOL CALLBACK +WhereSearchRecursiveCallback(LPCWSTR pattern, LPCWSTR path, PWIN32_FIND_DATAW data) +{ + return WhereSearchRecursive(pattern, path); +} + +// FIXME: Too slow. Optimize for speed. +static BOOL WhereSearchRecursive(LPCWSTR pattern, LPCWSTR dir) +{ + WCHAR szPath[MAX_PATH]; + if (!WhereSearchFiles(pattern, dir)) + return FALSE; // out of memory + + // build path with wildcard + StringCchCopyW(szPath, _countof(szPath), dir); + StringCchCatW(szPath, _countof(szPath), L"\\*"); + return WhereSearchGeneric(pattern, szPath, _countof(szPath), TRUE, + WhereSearchRecursiveCallback); +} + +static BOOL WhereSearch(LPCWSTR pattern, strlist_t *dirlist) +{ + UINT iDir; + for (iDir = 0; iDir < dirlist->count; ++iDir) + { + if (!WhereSearchFiles(pattern, strlist_get_at(dirlist, iDir))) + return FALSE; + } + return TRUE; +} + +static BOOL WhereGetVariable(LPCWSTR name, LPWSTR *value) +{ + DWORD cch = GetEnvironmentVariableW(name, NULL, 0); + if (cch == 0) // variable not found + { + *value = NULL; + if (!(s_dwFlags & FLAG_Q)) // not quiet mode? + ConResPrintf(StdErr, IDS_BAD_ENVVAR, name); + return TRUE; // it is error, but continue the task + } + + *value = malloc(cch * sizeof(WCHAR)); + if (!*value || !GetEnvironmentVariableW(name, *value, cch)) + { + free(*value); + *value = NULL; + return FALSE; // error + } + return TRUE; +} + +static BOOL WhereDoOption(DWORD flag, LPCWSTR option) +{ + if (s_dwFlags & flag) + { + ConResPrintf(StdErr, IDS_TOO_MANY, option, 1); + ConResPuts(StdErr, IDS_TYPE_HELP); + return FALSE; + } + s_dwFlags |= flag; + return TRUE; +} + +static BOOL WhereParseCommandLine(INT argc, WCHAR** argv) +{ + INT iArg; + for (iArg = 1; iArg < argc; ++iArg) + { + LPWSTR arg = argv[iArg]; + if (arg[0] == L'/' || arg[0] == L'-') + { + if (arg[2] == 0) + { + switch (towupper(arg[1])) + { + case L'?': + if (!WhereDoOption(FLAG_HELP, L"/?")) + return FALSE; + continue; + case L'F': + if (!WhereDoOption(FLAG_F, L"/F")) + return FALSE; + continue; + case L'Q': + if (!WhereDoOption(FLAG_Q, L"/Q")) + return FALSE; + continue; + case L'T': + if (!WhereDoOption(FLAG_T, L"/T")) + return FALSE; + continue; + case L'R': + { + if (!WhereDoOption(FLAG_R, L"/R")) + return FALSE; + if (iArg + 1 < argc) + { + ++iArg; + s_pszRecursiveDir = argv[iArg]; + continue; + } + ConResPrintf(StdErr, IDS_WANT_VALUE, L"/R"); + ConResPuts(StdErr, IDS_TYPE_HELP); + return FALSE; + } + } + } + ConResPrintf(StdErr, IDS_BAD_ARG, argv[iArg]); + ConResPuts(StdErr, IDS_TYPE_HELP); + return FALSE; + } + else // pattern? + { + if (!strlist_add(&s_patterns, argv[iArg])) // append pattern + { + ConResPuts(StdErr, IDS_OUTOFMEMORY); + return FALSE; + } + } + } + + return TRUE; // success +} + +static BOOL WhereGetPathExt(strlist_t *ext_list) +{ + BOOL ret = TRUE; + LPWSTR pszPathExt, ext; + DWORD cchPathExt = GetEnvironmentVariableW(L"PATHEXT", NULL, 0); + + pszPathExt = (cchPathExt ? malloc(cchPathExt * sizeof(WCHAR)) : str_clone(DEFAULT_PATHEXT)); + if (!pszPathExt) + return FALSE; // out of memory + + if (cchPathExt) + GetEnvironmentVariableW(L"PATHEXT", pszPathExt, cchPathExt); + + if (!strlist_add(ext_list, L"")) // add empty extension for normal search + { + strlist_destroy(ext_list); + free(pszPathExt); + return FALSE; + } + + for (ext = wcstok(pszPathExt, L";"); ext; ext = wcstok(NULL, L";")) // for all extensions + { + if (!strlist_add(ext_list, ext)) // add extension to ext_list + { + strlist_destroy(ext_list); + ret = FALSE; + break; + } + } + + free(pszPathExt); + return ret; +} + +static BOOL WhereFindByDirs(LPCWSTR pattern, LPWSTR dirs) +{ + BOOL ret; + size_t cch; + WCHAR szPath[MAX_PATH]; + LPWSTR dir, pch; + strlist_t dirlist = strlist_default; + + GetCurrentDirectoryW(_countof(szPath), szPath); + if (!strlist_add(&dirlist, szPath)) + return FALSE; // out of memory + + for (dir = wcstok(dirs, L";"); dir; dir = wcstok(NULL, L";")) + { + if (*dir == L'"') // began from '"' + { + pch = wcschr(++dir, L'"'); // find '"' + if (*pch) + *pch = 0; // cut off + } + + if (*dir != '\\' && dir[1] != L':') + continue; // relative path + + cch = wcslen(dir); + if (cch > 0 && dir[cch - 1] == L'\\') + dir[cch - 1] = 0; // remove trailing backslash + + if (!strlist_add(&dirlist, dir)) + { + strlist_destroy(&dirlist); + return FALSE; // out of memory + } + } + + ret = WhereSearch(pattern, &dirlist); + strlist_destroy(&dirlist); + return ret; +} + +static BOOL WhereFindByVar(LPCWSTR pattern, LPCWSTR name) +{ + LPWSTR value; + BOOL ret = WhereGetVariable(name, &value); + if (ret && value) + ret = WhereFindByDirs(pattern, value); + free(value); + return ret; +} + +static BOOL WhereIsRecursiveDirOK(LPCWSTR name) +{ + if (wcschr(name, L';') != NULL) + { + WhereError(IDS_BAD_NAME); + return FALSE; + } + else + { + DWORD attrs = GetFileAttributesW(name); + if (attrs == INVALID_FILE_ATTRIBUTES) // file not found + { + WhereError(IDS_CANT_FOUND); + return FALSE; + } + if (!(attrs & FILE_ATTRIBUTE_DIRECTORY)) + { + WhereError(IDS_BAD_DIR); + return FALSE; + } + return TRUE; + } +} + +static BOOL WhereDoPattern(LPWSTR pattern) +{ + BOOL ret; + LPWSTR pch = wcsrchr(pattern, L':'); + if (pch) + { + *pch++ = 0; + if (pattern[0] == L'$') // $env:pattern + { + if (s_dwFlags & FLAG_R) // recursive? + { + WhereError(IDS_ENVPAT_WITH_R); + return FALSE; + } + ret = WhereFindByVar(pch, pattern + 1); + } + else // path:pattern + { + if (s_dwFlags & FLAG_R) // recursive? + { + WhereError(IDS_PATHPAT_WITH_R); + return FALSE; + } + if (wcschr(pch, L'\\') != NULL) // found '\\'? + { + WhereError(IDS_BAD_PATHPAT); + return FALSE; + } + ret = WhereFindByDirs(pch, pattern); + } + } + else if (s_pszRecursiveDir) // recursive + { + WCHAR szPath[MAX_PATH]; + + if (!WhereIsRecursiveDirOK(s_pszRecursiveDir)) + return FALSE; + + GetFullPathNameW(s_pszRecursiveDir, _countof(szPath), szPath, NULL); + + ret = WhereSearchRecursive(pattern, szPath); + } + else // otherwise + { + ret = WhereFindByVar(pattern, L"PATH"); + } + + if (!ret) + WhereError(IDS_OUTOFMEMORY); + return ret; +} + +INT wmain(INT argc, WCHAR **argv) +{ + typedef BOOL (WINAPI *FN_DISABLE_WOW)(PVOID *); + HANDLE hKernel32 = GetModuleHandleA("kernel32"); + FN_DISABLE_WOW DisableWOW = + (FN_DISABLE_WOW)GetProcAddress(hKernel32, "Wow64DisableWow64FsRedirection"); + DWORD iPattern; + WRET ret = WRET_ERROR; + PVOID dummy; + + ConInitStdStreams(); // Initialize the Console Standard Streams + + if (!WhereParseCommandLine(argc, argv)) + goto quit; + + if ((s_dwFlags & FLAG_HELP) || !s_patterns.count) + { + ConResPuts(StdOut, IDS_USAGE); + goto quit; + } + + if (DisableWOW) + DisableWOW(&dummy); + + if (!WhereGetPathExt(&s_pathext)) + { + WhereError(IDS_OUTOFMEMORY); + goto quit; + } + + ret = WRET_SUCCESS; + for (iPattern = 0; iPattern < s_patterns.count; ++iPattern) + { + if (!WhereDoPattern(strlist_get_at(&s_patterns, iPattern))) + { + ret = WRET_ERROR; + goto quit; + } + } + + if (!s_results.count) + { + WhereError(IDS_NOT_FOUND); + ret = WRET_NOT_FOUND; + } + +quit: + strlist_destroy(&s_results); + strlist_destroy(&s_patterns); + strlist_destroy(&s_pathext); + return ret; +} diff --git a/base/applications/cmdutils/where/where.rc b/base/applications/cmdutils/where/where.rc new file mode 100644 index 00000000000..24452c476b5 --- /dev/null +++ b/base/applications/cmdutils/where/where.rc @@ -0,0 +1,12 @@ +#include <windef.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS WHERE Command" +#define REACTOS_STR_INTERNAL_NAME "where" +#define REACTOS_STR_ORIGINAL_FILENAME "where.exe" +#include <reactos/version.rc> + +#pragma code_page(65001) /* UTF-8 */ +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif

3 years, 7 months

[reactos] 01/01: [NTOS:PS] Use KD routine to safely read memory from thread stack

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04e92516123dd094bcfa3… commit 04e92516123dd094bcfa3fd14b4d0d59c8e4eaf0 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon May 10 19:09:53 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon May 10 19:11:21 2021 +0200 [NTOS:PS] Use KD routine to safely read memory from thread stack Should fix a crash when hitting TAB+(Whatever I typed that triggerred this) --- ntoskrnl/ps/debug.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ps/debug.c b/ntoskrnl/ps/debug.c index b7ea2db32eb..0a2f3e05517 100644 --- a/ntoskrnl/ps/debug.c +++ b/ntoskrnl/ps/debug.c @@ -70,9 +70,24 @@ PspDumpThreads(BOOLEAN IncludeSystem) /* Walk it */ while(Ebp != 0 && Ebp >= (PULONG)Thread->Tcb.StackLimit) { - /* Print what's on the stack */ - DbgPrint("%.8X %.8X%s", Ebp[0], Ebp[1], (i % 8) == 7 ? "\n" : " "); - Ebp = (PULONG)Ebp[0]; + ULONG EbpContent[2]; + ULONG MemoryCopied; + NTSTATUS Status; + + /* Get stack frame content */ + Status = KdpCopyMemoryChunks((ULONG64)(ULONG_PTR)Ebp, + EbpContent, + sizeof(EbpContent), + sizeof(EbpContent), + MMDBG_COPY_UNSAFE, + &MemoryCopied); + if (!NT_SUCCESS(Status) || (MemoryCopied < sizeof(EbpContent))) + { + break; + } + + DbgPrint("%.8X %.8X%s", EbpContent[0], EbpContent[1], (i % 8) == 7 ? "\n" : " "); + Ebp = (PULONG)EbpContent[0]; i++; }

3 years, 7 months

[reactos] 02/02: [PCIIDE] Make the resource section not discardable. CORE-17401 (#3594) [PCIX] Make the resource section not discardable.

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fb3c1e91e6b21bbdf51d… commit 0fb3c1e91e6b21bbdf51d0fc604bff680e7fabd8 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu Apr 8 19:43:30 2021 +0600 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 10 00:36:38 2021 +0200 [PCIIDE] Make the resource section not discardable. CORE-17401 (#3594) [PCIX] Make the resource section not discardable. These drivers need to be able to access their message resources at any time. --- drivers/bus/pcix/CMakeLists.txt | 8 ++++++++ drivers/storage/ide/pciide/CMakeLists.txt | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/drivers/bus/pcix/CMakeLists.txt b/drivers/bus/pcix/CMakeLists.txt index 4a27ae9c084..839d49e73dd 100644 --- a/drivers/bus/pcix/CMakeLists.txt +++ b/drivers/bus/pcix/CMakeLists.txt @@ -48,6 +48,14 @@ add_library(pcix MODULE set_module_type(pcix kernelmodedriver) target_link_libraries(pcix arbiter) +if(MSVC) + target_link_options(pcix PRIVATE /SECTION:.rsrc,!D) +else() + add_custom_command( + TARGET pcix POST_BUILD + COMMAND native-pefixup --section:.rsrc,!D $<TARGET_FILE:pcix> + VERBATIM) +endif() add_importlibs(pcix ntoskrnl hal) add_pch(pcix pci.h "${PCH_SKIP_SOURCE}") add_dependencies(pcix pciclass) diff --git a/drivers/storage/ide/pciide/CMakeLists.txt b/drivers/storage/ide/pciide/CMakeLists.txt index a0eab2c2069..863f37cca6f 100644 --- a/drivers/storage/ide/pciide/CMakeLists.txt +++ b/drivers/storage/ide/pciide/CMakeLists.txt @@ -1,5 +1,13 @@ add_library(pciide MODULE pciide.c pciide.rc) set_module_type(pciide kernelmodedriver) +if(MSVC) + target_link_options(pciide PRIVATE /SECTION:.rsrc,!D) +else() + add_custom_command( + TARGET pciide POST_BUILD + COMMAND native-pefixup --section:.rsrc,!D $<TARGET_FILE:pciide> + VERBATIM) +endif() add_importlibs(pciide pciidex ntoskrnl) add_cd_file(TARGET pciide DESTINATION reactos/system32/drivers NO_CAB FOR all)

3 years, 7 months

[reactos] 01/02: [PEFIXUP] Fixup of resource sections in GCC builds. (#3594)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e33c8ffd32b6d1080f77… commit 6e33c8ffd32b6d1080f7717ca7f45e6c43efd972 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu Apr 8 20:50:51 2021 +0600 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 10 00:36:38 2021 +0200 [PEFIXUP] Fixup of resource sections in GCC builds. (#3594) Make resource sections discardable for kernel-mode drivers and DLLs. --- sdk/cmake/gcc.cmake | 2 +- sdk/tools/pefixup.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 298a867bb45..1ab10b6f97a 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -307,7 +307,7 @@ function(set_module_type_toolchain MODULE TYPE) # Fixup section characteristics # - Remove flags that LD overzealously puts (alignment flag, Initialized flags for code sections) # - INIT section is made discardable - # - .rsrc is made read-only + # - .rsrc is made read-only and discardable # - PAGE & .edata sections are made pageable. add_custom_command(TARGET ${MODULE} POST_BUILD COMMAND native-pefixup --${TYPE} $<TARGET_FILE:${MODULE}>) diff --git a/sdk/tools/pefixup.c b/sdk/tools/pefixup.c index 4d064b8574d..ac02a707769 100644 --- a/sdk/tools/pefixup.c +++ b/sdk/tools/pefixup.c @@ -142,9 +142,15 @@ static int driver_fixup(enum fixup_mode mode, unsigned char *buffer, PIMAGE_NT_H if (Section->Characteristics & IMAGE_SCN_CNT_CODE) Section->Characteristics &= ~IMAGE_SCN_CNT_INITIALIZED_DATA; - /* For some reason, .rsrc is made writable by windres */ if (strncmp((char*)Section->Name, ".rsrc", 5) == 0) { + /* .rsrc is discardable for driver images, WDM drivers and Kernel-Mode DLLs */ + if (mode == MODE_KERNELDRIVER || mode == MODE_WDMDRIVER || mode == MODE_KERNELDLL) + { + Section->Characteristics |= IMAGE_SCN_MEM_DISCARDABLE; + } + + /* For some reason, .rsrc is made writable by windres */ Section->Characteristics &= ~IMAGE_SCN_MEM_WRITE; continue; } @@ -356,10 +362,10 @@ print_usage(void) printf("Usage: %s <options> <filename>\n\n", g_ApplicationName); printf("<options> can be one of the following options:\n" " --loadconfig Fix the LOAD_CONFIG directory entry;\n" - " --kernelmodedriver Fix code and data sections for driver images;\n" - " --wdmdriver Fix code and data sections for WDM drivers;\n" - " --kerneldll Fix code and data sections for Kernel-Mode DLLs;\n" - " --kernel Fix code and data sections for kernels;\n" + " --kernelmodedriver Fix code, data and resource sections for driver images;\n" + " --wdmdriver Fix code, data and resource sections for WDM drivers;\n" + " --kerneldll Fix code, data and resource sections for Kernel-Mode DLLs;\n" + " --kernel Fix code, data and resource sections for kernels;\n" "\n" "and/or a combination of the following ones:\n" " --section:name[=newname][,[[!]{CDEIKOMPRSUW}][A{1248PTSX}]]\n"

3 years, 7 months

[reactos] 01/01: [NDK][NTOS:SE] Fix the member offsets in TOKEN, again...

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fe7fdbdeaccf00607d93… commit 0fe7fdbdeaccf00607d93c7cdb6ee4b1e7a345cb Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun May 9 18:17:53 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 9 18:17:53 2021 +0200 [NDK][NTOS:SE] Fix the member offsets in TOKEN, again... The member offsets in comments were wrong again, whoops.... --- sdk/include/ndk/setypes.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/include/ndk/setypes.h b/sdk/include/ndk/setypes.h index b74787ae245..b89dff14417 100644 --- a/sdk/include/ndk/setypes.h +++ b/sdk/include/ndk/setypes.h @@ -221,12 +221,12 @@ typedef struct _TOKEN TOKEN_TYPE TokenType; /* 0x80 */ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; /* 0x84 */ ULONG TokenFlags; /* 0x88 */ - BOOLEAN TokenInUse; /* 0x89 */ - PSECURITY_TOKEN_PROXY_DATA ProxyData; /* 0x8C */ - PSECURITY_TOKEN_AUDIT_DATA AuditData; /* 0x90 */ - PSEP_LOGON_SESSION_REFERENCES LogonSession; /* 0x94 */ - LUID OriginatingLogonSession; /* 0x98 */ - ULONG VariablePart; /* 0xA0 */ + BOOLEAN TokenInUse; /* 0x8C */ + PSECURITY_TOKEN_PROXY_DATA ProxyData; /* 0x90 */ + PSECURITY_TOKEN_AUDIT_DATA AuditData; /* 0x94 */ + PSEP_LOGON_SESSION_REFERENCES LogonSession; /* 0x98 */ + LUID OriginatingLogonSession; /* 0x9C */ + ULONG VariablePart; /* 0xA4 */ } TOKEN, *PTOKEN; typedef struct _AUX_ACCESS_DATA

3 years, 7 months

[reactos] 01/01: [NDK][NTOS:SE] Add the missing "LogonSession" member to TOKEN structure

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5dc1c77b5803c35f7cc6… commit f5dc1c77b5803c35f7cc60ea53806d74d29ec3a7 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun May 9 17:34:02 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 9 17:34:02 2021 +0200 [NDK][NTOS:SE] Add the missing "LogonSession" member to TOKEN structure And also fix the wrong member offsets in comments. The said offset values are based upon the ones retrieved with WinDBG. --- ntoskrnl/se/srm.c | 10 ---------- sdk/include/ndk/setypes.h | 22 ++++++++++++++++++---- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ntoskrnl/se/srm.c b/ntoskrnl/se/srm.c index 468b724f2da..ffd5547fa32 100644 --- a/ntoskrnl/se/srm.c +++ b/ntoskrnl/se/srm.c @@ -22,16 +22,6 @@ extern LUID SeAnonymousAuthenticationId; #define SEP_LOGON_SESSION_TAG 'sLeS' #define SEP_LOGON_NOTIFICATION_TAG 'nLeS' -typedef struct _SEP_LOGON_SESSION_REFERENCES -{ - struct _SEP_LOGON_SESSION_REFERENCES *Next; - LUID LogonId; - ULONG ReferenceCount; - ULONG Flags; - PDEVICE_MAP pDeviceMap; - LIST_ENTRY TokenList; -} SEP_LOGON_SESSION_REFERENCES, *PSEP_LOGON_SESSION_REFERENCES; - typedef struct _SEP_LOGON_SESSION_TERMINATED_NOTIFICATION { struct _SEP_LOGON_SESSION_TERMINATED_NOTIFICATION *Next; diff --git a/sdk/include/ndk/setypes.h b/sdk/include/ndk/setypes.h index 7071ce8ab11..b74787ae245 100644 --- a/sdk/include/ndk/setypes.h +++ b/sdk/include/ndk/setypes.h @@ -151,6 +151,19 @@ typedef struct _SEP_AUDIT_POLICY }; } SEP_AUDIT_POLICY, *PSEP_AUDIT_POLICY; +// +// Security Logon Session References +// +typedef struct _SEP_LOGON_SESSION_REFERENCES +{ + struct _SEP_LOGON_SESSION_REFERENCES *Next; + LUID LogonId; + ULONG ReferenceCount; + ULONG Flags; + PDEVICE_MAP pDeviceMap; + LIST_ENTRY TokenList; +} SEP_LOGON_SESSION_REFERENCES, *PSEP_LOGON_SESSION_REFERENCES; + typedef struct _SE_AUDIT_PROCESS_CREATION_INFO { POBJECT_NAME_INFORMATION ImageFileName; @@ -189,7 +202,7 @@ typedef struct _TOKEN LUID ParentTokenId; /* 0x20 */ LARGE_INTEGER ExpirationTime; /* 0x28 */ PERESOURCE TokenLock; /* 0x30 */ - SEP_AUDIT_POLICY AuditPolicy; /* 0x38 */ + SEP_AUDIT_POLICY AuditPolicy; /* 0x38 */ LUID ModifiedId; /* 0x40 */ ULONG SessionId; /* 0x48 */ ULONG UserAndGroupCount; /* 0x4C */ @@ -208,9 +221,10 @@ typedef struct _TOKEN TOKEN_TYPE TokenType; /* 0x80 */ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; /* 0x84 */ ULONG TokenFlags; /* 0x88 */ - BOOLEAN TokenInUse; /* 0x8C */ - PSECURITY_TOKEN_PROXY_DATA ProxyData; /* 0x90 */ - PSECURITY_TOKEN_AUDIT_DATA AuditData; /* 0x94 */ + BOOLEAN TokenInUse; /* 0x89 */ + PSECURITY_TOKEN_PROXY_DATA ProxyData; /* 0x8C */ + PSECURITY_TOKEN_AUDIT_DATA AuditData; /* 0x90 */ + PSEP_LOGON_SESSION_REFERENCES LogonSession; /* 0x94 */ LUID OriginatingLogonSession; /* 0x98 */ ULONG VariablePart; /* 0xA0 */ } TOKEN, *PTOKEN;

3 years, 7 months

[reactos] 01/01: [PEFIXUP] Add support for overriding the attributes of specific PE sections. (#3598)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e0a3cdf6cf61c66cae05… commit 9e0a3cdf6cf61c66cae05f0538c38b1d644ca7d6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 11 02:30:15 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 9 01:39:21 2021 +0200 [PEFIXUP] Add support for overriding the attributes of specific PE sections. (#3598) Use a syntax identical to the one from the EDITBIN tool: --section:name[=newname][,[[!]{CDEIKOMPRSUW}][A{1248PTSX}]] https://docs.microsoft.com/en-us/cpp/build/reference/section-editbin?view=m… --- sdk/tools/pefixup.c | 313 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 271 insertions(+), 42 deletions(-) diff --git a/sdk/tools/pefixup.c b/sdk/tools/pefixup.c index 22c0f6eb6e4..4d064b8574d 100644 --- a/sdk/tools/pefixup.c +++ b/sdk/tools/pefixup.c @@ -26,6 +26,7 @@ static const char* g_Target; enum fixup_mode { + MODE_NONE = 0, MODE_LOADCONFIG, MODE_KERNELDRIVER, MODE_WDMDRIVER, @@ -127,7 +128,7 @@ static int add_loadconfig(unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) return 1; } -static int driver_fixup(int mode, unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) +static int driver_fixup(enum fixup_mode mode, unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) { /* GNU LD just doesn't know what a driver is, and has notably no idea of paged vs non-paged sections */ for (unsigned int i = 0; i < nt_header->FileHeader.NumberOfSections; i++) @@ -174,23 +175,203 @@ static int driver_fixup(int mode, unsigned char *buffer, PIMAGE_NT_HEADERS nt_he return 0; } +/* NOTE: This function tokenizes its parameter in place. + * Its format is: name[=newname][,[[!]{CDEIKOMPRSUW}][A{1248PTSX}]] */ +static int change_section_attribs(char* section_attribs, unsigned char* buffer, PIMAGE_NT_HEADERS nt_header) +{ + char *sectionName, *newSectionName; + char *attribsSpec, *alignSpec; + char *ptr; + DWORD dwAttribs[2]; /* Attributes to [0]: set; [1]: filter */ + unsigned int i; + PIMAGE_SECTION_HEADER SectionTable, Section; + + if (!section_attribs || !*section_attribs) + { + error("Section attributes specification is empty.\n"); + return 1; + } + + sectionName = section_attribs; + + /* Find the optional new section name and attributes specifications */ + newSectionName = strchr(section_attribs, '='); + attribsSpec = strchr(section_attribs, ','); + if (newSectionName && attribsSpec) + { + /* The attributes specification must be after the new name */ + if (!(newSectionName < attribsSpec)) + { + error("Invalid section attributes specification.\n"); + return 1; + } + } + if (newSectionName) + *newSectionName++ = 0; + if (attribsSpec) + *attribsSpec++ = 0; + + /* An original section name must be specified */ + if (!*sectionName) + { + error("Invalid section attributes specification.\n"); + return 1; + } + /* If a new section name begins, it must be not empty */ + if (newSectionName && !*newSectionName) + { + error("Invalid section attributes specification.\n"); + return 1; + } + + /* The alignment specification is inside the attributes specification */ + alignSpec = NULL; + if (attribsSpec) + { + /* Check for the first occurrence of the 'A' separator, case-insensitive */ + for (ptr = attribsSpec; *ptr; ++ptr) + { + if (toupper(*ptr) == 'A') + { + alignSpec = ptr; + break; + } + } + } + if (alignSpec) + *alignSpec++ = 0; + + /* But it's not supported at the moment! */ + if (alignSpec && *alignSpec) + { + fprintf(stdout, "%s WARNING: '%s': %s", g_ApplicationName, g_Target, + "Section alignment specification not currently supported! Ignoring.\n"); + } + + /* Parse the attributes specification */ + dwAttribs[0] = dwAttribs[1] = 0; + if (attribsSpec && *attribsSpec) + { + for (i = 0, ptr = attribsSpec; *ptr; ++ptr) + { + if (*ptr == '!') + { + /* The next attribute needs to be removed. + * Any successive '!' gets collapsed. */ + i = 1; + continue; + } + + switch (toupper(*ptr)) + { + case 'C': + dwAttribs[i%2] |= IMAGE_SCN_CNT_CODE; + break; + case 'D': + dwAttribs[i%2] |= IMAGE_SCN_MEM_DISCARDABLE; + break; + case 'E': + dwAttribs[i%2] |= IMAGE_SCN_MEM_EXECUTE; + break; + case 'I': + dwAttribs[i%2] |= IMAGE_SCN_CNT_INITIALIZED_DATA; + break; + case 'K': /* Remove the not-cached attribute */ + dwAttribs[(i+1)%2] |= IMAGE_SCN_MEM_NOT_CACHED; + break; + case 'M': + dwAttribs[i%2] |= IMAGE_SCN_LNK_REMOVE; + break; + case 'O': + dwAttribs[i%2] |= IMAGE_SCN_LNK_INFO; + break; + case 'P': /* Remove the not-paged attribute */ + dwAttribs[(i+1)%2] |= IMAGE_SCN_MEM_NOT_PAGED; + break; + case 'R': + dwAttribs[i%2] |= IMAGE_SCN_MEM_READ; + break; + case 'S': + dwAttribs[i%2] |= IMAGE_SCN_MEM_SHARED; + break; + case 'U': + dwAttribs[i%2] |= IMAGE_SCN_CNT_UNINITIALIZED_DATA; + break; + case 'W': + dwAttribs[i%2] |= IMAGE_SCN_MEM_WRITE; + break; + + default: + error("Invalid section attributes specification.\n"); + return 1; + } + + /* Got an attribute; reset the state */ + i = 0; + } + /* If the state was not reset, the attributes specification is invalid */ + if (i != 0) + { + error("Invalid section attributes specification.\n"); + return 1; + } + } + + /* Find all sections with the given name, rename them and change their attributes */ + Section = NULL; + SectionTable = IMAGE_FIRST_SECTION(nt_header); + for (i = 0; i < nt_header->FileHeader.NumberOfSections; ++i) + { + if (strncmp((char*)SectionTable[i].Name, sectionName, ARRAY_SIZE(SectionTable[i].Name)) != 0) + continue; + + Section = &SectionTable[i]; + + if (newSectionName && *newSectionName) + { + memset(Section->Name, 0, sizeof(Section->Name)); + strncpy((char*)Section->Name, newSectionName, ARRAY_SIZE(Section->Name)); + } + + /* First filter attributes out, then add the new ones. + * The new attributes override any removed ones. */ + Section->Characteristics &= ~dwAttribs[1]; + Section->Characteristics |= dwAttribs[0]; + } + + /* If no section was found, return an error */ + if (!Section) + { + error("Section '%s' does not exist.\n", sectionName); + return 1; + } + + return 0; +} + static void print_usage(void) { - printf("Usage: %s <mode> <filename>\n", g_ApplicationName); - printf("Where <mode> is on of the following:\n"); - printf(" --loadconfig Fix the LOAD_CONFIG directory entry\n"); - printf(" --kernelmodedriver Fix code and data sections for driver images\n"); - printf(" --wdmdriver Fix code and data sections for WDM drivers\n"); - printf(" --kerneldll Fix code and data sections for Kernel-Mode DLLs\n"); - printf(" --kernel Fix code and data sections for kernels\n"); + printf("Usage: %s <options> <filename>\n\n", g_ApplicationName); + printf("<options> can be one of the following options:\n" + " --loadconfig Fix the LOAD_CONFIG directory entry;\n" + " --kernelmodedriver Fix code and data sections for driver images;\n" + " --wdmdriver Fix code and data sections for WDM drivers;\n" + " --kerneldll Fix code and data sections for Kernel-Mode DLLs;\n" + " --kernel Fix code and data sections for kernels;\n" + "\n" + "and/or a combination of the following ones:\n" + " --section:name[=newname][,[[!]{CDEIKOMPRSUW}][A{1248PTSX}]]\n" + " Overrides the attributes of a section, optionally\n" + " changing its name and its alignment.\n"); } int main(int argc, char **argv) { int result = 1; - enum fixup_mode mode; + enum fixup_mode mode = MODE_NONE; + int i; FILE* file; size_t len; unsigned char *buffer; @@ -199,41 +380,71 @@ int main(int argc, char **argv) g_ApplicationName = argv[0]; - if (argc != 3) + /* Check for options */ + for (i = 1; i < argc; ++i) { - print_usage(); - return 1; - } + if (!(argv[i][0] == '-' && argv[i][1] == '-')) + { + /* We are out of options (they come first before + * anything else, and cannot come after). */ + break; + } - if (strcmp(argv[1], "--loadconfig") == 0) - { - mode = MODE_LOADCONFIG; - } - else if (strcmp(argv[1], "--kernelmodedriver") == 0) - { - mode = MODE_KERNELDRIVER; - } - else if (strcmp(argv[1], "--wdmdriver") == 0) - { - mode = MODE_WDMDRIVER; - } - else if (strcmp(argv[1], "--kerneldll") == 0) - { - mode = MODE_KERNELDLL; - } - else if (strcmp(argv[1], "--kernel") == 0) - { - mode = MODE_KERNEL; + if (strcmp(&argv[i][2], "loadconfig") == 0) + { + if (mode != MODE_NONE) + goto mode_error; + mode = MODE_LOADCONFIG; + } + else if (strcmp(&argv[i][2], "kernelmodedriver") == 0) + { + if (mode != MODE_NONE) + goto mode_error; + mode = MODE_KERNELDRIVER; + } + else if (strcmp(&argv[i][2], "wdmdriver") == 0) + { + if (mode != MODE_NONE) + goto mode_error; + mode = MODE_WDMDRIVER; + } + else if (strcmp(&argv[i][2], "kerneldll") == 0) + { + if (mode != MODE_NONE) + goto mode_error; + mode = MODE_KERNELDLL; + } + else if (strcmp(&argv[i][2], "kernel") == 0) + { + if (mode != MODE_NONE) + goto mode_error; + mode = MODE_KERNEL; + } + else if (strncmp(&argv[i][2], "section:", 8) == 0) + { + /* Section attributes override, will be handled later */ + } + else + { + fprintf(stderr, "%s ERROR: Unknown option: '%s'.\n", g_ApplicationName, argv[i]); + goto failure; + mode_error: + fprintf(stderr, "%s ERROR: Specific mode already set.\n", g_ApplicationName); + failure: + print_usage(); + return 1; + } } - else + /* Stop now if we don't have any option or file */ + if ((i <= 1) || (i >= argc)) { print_usage(); return 1; } - g_Target = argv[2]; + g_Target = argv[i]; - /* Read the whole file to memory. */ + /* Read the whole file to memory */ file = fopen(g_Target, "r+b"); if (!file) { @@ -251,12 +462,12 @@ int main(int argc, char **argv) } /* Add one byte extra for the case where the input file size is odd. - We rely on this in our crc calculation */ + We rely on this in our checksum calculation. */ buffer = calloc(len + 1, 1); if (buffer == NULL) { fclose(file); - error("Not enough memory available: (Needed %lu bytes).\n", len + 1); + error("Not enough memory available (Needed %lu bytes).\n", len + 1); return 1; } @@ -264,7 +475,7 @@ int main(int argc, char **argv) fseek(file, 0, SEEK_SET); fread(buffer, 1, len, file); - /* Check the headers and save pointers to them. */ + /* Check the headers and save pointers to them */ dos_header = (PIMAGE_DOS_HEADER)buffer; if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) { @@ -279,10 +490,28 @@ int main(int argc, char **argv) goto Quit; } - if (mode == MODE_LOADCONFIG) - result = add_loadconfig(buffer, nt_header); - else - result = driver_fixup(mode, buffer, nt_header); + result = 0; + + /* Apply mode fixups */ + if (mode != MODE_NONE) + { + if (mode == MODE_LOADCONFIG) + result = add_loadconfig(buffer, nt_header); + else + result = driver_fixup(mode, buffer, nt_header); + } + + /* Apply any section attributes override */ + for (i = 1; (i < argc) && (result == 0); ++i) + { + /* Ignore anything but the section specifications */ + if (!(argv[i][0] == '-' && argv[i][1] == '-')) + break; + if (strncmp(&argv[i][2], "section:", 8) != 0) + continue; + + result = change_section_attribs(&argv[i][10], buffer, nt_header); + } if (!result) {

3 years, 7 months

[reactos] 01/01: [RAPPS] Restore event logging of install/uninstall actions

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae426744a9f75c4fdd019… commit ae426744a9f75c4fdd019b1feabc1007f8561e07 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 25 21:19:06 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat May 8 19:25:16 2021 +0200 [RAPPS] Restore event logging of install/uninstall actions --- base/applications/rapps/installed.cpp | 3 +++ base/applications/rapps/loaddlg.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index 5296c3fc6ae..6561ab38ee9 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -138,6 +138,9 @@ BOOL CInstalledApplicationInfo::RetrieveIcon(ATL::CStringW& IconLocation) BOOL CInstalledApplicationInfo::UninstallApplication(BOOL bModify) { + if (!bModify) + WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_REMOVE, szDisplayName); + return StartProcess(bModify ? szModifyPath : szUninstallString, TRUE); } diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 836bb150ab0..35383607da8 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -944,6 +944,9 @@ run: shExInfo.lpParameters = L""; shExInfo.nShow = SW_SHOW; + /* FIXME: Do we want to log installer status? */ + WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_INSTALL, InfoArray[iAppId].szName); + if (ShellExecuteExW(&shExInfo)) { //reflect installation progress in the titlebar

3 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2021