Ros-diffs May 2021

ros-diffs@reactos.org

21 participants
183 discussions

[reactos] 01/06: [NTOS/MM] Implement Mi(Un)lockWorkingSetShared

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd085ac12ffcc013729d4… commit cd085ac12ffcc013729d4c23c251b24764236a12 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Oct 22 15:24:33 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue May 4 12:02:41 2021 +0200 [NTOS/MM] Implement Mi(Un)lockWorkingSetShared Also fix checks when exclusively locking --- ntoskrnl/mm/ARM3/miarm.h | 95 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index 025cd6f6561..7de6227f5a1 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -1276,6 +1276,48 @@ MiLockWorkingSet(IN PETHREAD Thread, } } +FORCEINLINE +VOID +MiLockWorkingSetShared( + _In_ PETHREAD Thread, + _In_ PMMSUPPORT WorkingSet) +{ + /* Block APCs */ + KeEnterGuardedRegion(); + + /* Working set should be in global memory */ + ASSERT(MI_IS_SESSION_ADDRESS((PVOID)WorkingSet) == FALSE); + + /* Thread shouldn't already be owning something */ + ASSERT(!MM_ANY_WS_LOCK_HELD(Thread)); + + /* Lock this working set */ + ExAcquirePushLockShared(&WorkingSet->WorkingSetMutex); + + /* Which working set is this? */ + if (WorkingSet == &MmSystemCacheWs) + { + /* Own the system working set */ + ASSERT((Thread->OwnsSystemWorkingSetExclusive == FALSE) && + (Thread->OwnsSystemWorkingSetShared == FALSE)); + Thread->OwnsSystemWorkingSetShared = TRUE; + } + else if (WorkingSet->Flags.SessionSpace) + { + /* Own the session working set */ + ASSERT((Thread->OwnsSessionWorkingSetExclusive == FALSE) && + (Thread->OwnsSessionWorkingSetShared == FALSE)); + Thread->OwnsSessionWorkingSetShared = TRUE; + } + else + { + /* Own the process working set */ + ASSERT((Thread->OwnsProcessWorkingSetExclusive == FALSE) && + (Thread->OwnsProcessWorkingSetShared == FALSE)); + Thread->OwnsProcessWorkingSetShared = TRUE; + } +} + // // Unlocks the working set // @@ -1291,22 +1333,22 @@ MiUnlockWorkingSet(IN PETHREAD Thread, if (WorkingSet == &MmSystemCacheWs) { /* Release the system working set */ - ASSERT((Thread->OwnsSystemWorkingSetExclusive == TRUE) || - (Thread->OwnsSystemWorkingSetShared == TRUE)); + ASSERT((Thread->OwnsSystemWorkingSetExclusive == TRUE) && + (Thread->OwnsSystemWorkingSetShared == FALSE)); Thread->OwnsSystemWorkingSetExclusive = FALSE; } else if (WorkingSet->Flags.SessionSpace) { /* Release the session working set */ - ASSERT((Thread->OwnsSessionWorkingSetExclusive == TRUE) || - (Thread->OwnsSessionWorkingSetShared == TRUE)); - Thread->OwnsSessionWorkingSetExclusive = 0; + ASSERT((Thread->OwnsSessionWorkingSetExclusive == TRUE) && + (Thread->OwnsSessionWorkingSetShared == FALSE)); + Thread->OwnsSessionWorkingSetExclusive = FALSE; } else { /* Release the process working set */ - ASSERT((Thread->OwnsProcessWorkingSetExclusive) || - (Thread->OwnsProcessWorkingSetShared)); + ASSERT((Thread->OwnsProcessWorkingSetExclusive == TRUE) && + (Thread->OwnsProcessWorkingSetShared == FALSE)); Thread->OwnsProcessWorkingSetExclusive = FALSE; } @@ -1317,6 +1359,45 @@ MiUnlockWorkingSet(IN PETHREAD Thread, KeLeaveGuardedRegion(); } +FORCEINLINE +VOID +MiUnlockWorkingSetShared( + _In_ PETHREAD Thread, + _In_ PMMSUPPORT WorkingSet) +{ + /* Working set should be in global memory */ + ASSERT(MI_IS_SESSION_ADDRESS((PVOID)WorkingSet) == FALSE); + + /* Which working set is this? */ + if (WorkingSet == &MmSystemCacheWs) + { + /* Release the system working set */ + ASSERT((Thread->OwnsSystemWorkingSetExclusive == FALSE) && + (Thread->OwnsSystemWorkingSetShared == TRUE)); + Thread->OwnsSystemWorkingSetShared = FALSE; + } + else if (WorkingSet->Flags.SessionSpace) + { + /* Release the session working set */ + ASSERT((Thread->OwnsSessionWorkingSetExclusive == FALSE) && + (Thread->OwnsSessionWorkingSetShared == TRUE)); + Thread->OwnsSessionWorkingSetShared = FALSE; + } + else + { + /* Release the process working set */ + ASSERT((Thread->OwnsProcessWorkingSetExclusive == FALSE) && + (Thread->OwnsProcessWorkingSetShared == TRUE)); + Thread->OwnsProcessWorkingSetShared = FALSE; + } + + /* Release the working set lock */ + ExReleasePushLockShared(&WorkingSet->WorkingSetMutex); + + /* Unblock APCs */ + KeLeaveGuardedRegion(); +} + FORCEINLINE VOID MiUnlockProcessWorkingSetForFault(IN PEPROCESS Process,

3 years, 7 months

[reactos] 01/01: [CMDUTILS][FC] Implement text file comparison (#3625)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2c47132ad3d7c39e88e1… commit d2c47132ad3d7c39e88e117c0273623726732015 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue May 4 18:05:57 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 4 18:05:57 2021 +0900 [CMDUTILS][FC] Implement text file comparison (#3625) Implement text file comparison by using file mappings (both Unicode and ANSI). CORE-17500 --- base/applications/cmdutils/fc/CMakeLists.txt | 6 +- base/applications/cmdutils/fc/fc.c | 381 ++++++++-------- base/applications/cmdutils/fc/fc.h | 97 +++++ base/applications/cmdutils/fc/text.h | 620 +++++++++++++++++++++++++++ base/applications/cmdutils/fc/texta.c | 6 + base/applications/cmdutils/fc/textw.c | 8 + 6 files changed, 910 insertions(+), 208 deletions(-) diff --git a/base/applications/cmdutils/fc/CMakeLists.txt b/base/applications/cmdutils/fc/CMakeLists.txt index fec64446ae1..4da877ca403 100644 --- a/base/applications/cmdutils/fc/CMakeLists.txt +++ b/base/applications/cmdutils/fc/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) -add_executable(fc fc.c fc.rc) +add_executable(fc fc.c texta.c textw.c fc.rc) set_module_type(fc win32cui UNICODE) -target_link_libraries(fc conutils ${PSEH_LIB}) -add_importlibs(fc msvcrt user32 kernel32) +target_link_libraries(fc conutils wine ${PSEH_LIB}) +add_importlibs(fc msvcrt user32 kernel32 ntdll) add_cd_file(TARGET fc DESTINATION reactos/system32 FOR all) diff --git a/base/applications/cmdutils/fc/fc.c b/base/applications/cmdutils/fc/fc.c index e9ec950bc2d..9350bc1a957 100644 --- a/base/applications/cmdutils/fc/fc.c +++ b/base/applications/cmdutils/fc/fc.c @@ -4,87 +4,116 @@ * PURPOSE: Comparing files * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ -#include <stdlib.h> -#include <string.h> -#include <ctype.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winnls.h> -#include <conutils.h> -#include "resource.h" - -// See also: https://stackoverflow.com/questions/33125766/compare-files-with-a-cmd -typedef enum FCRET { // return code of FC command - FCRET_INVALID = -1, - FCRET_IDENTICAL = 0, - FCRET_DIFFERENT = 1, - FCRET_CANT_FIND = 2 -} FCRET; - -#ifdef _WIN64 - #define MAX_VIEW_SIZE (256 * 1024 * 1024) // 256 MB +#include "fc.h" + +#ifdef __REACTOS__ + #include <conutils.h> #else - #define MAX_VIEW_SIZE (64 * 1024 * 1024) // 64 MB + #include <stdio.h> + #define ConInitStdStreams() /* empty */ + #define StdOut stdout + #define StdErr stderr + void ConPuts(FILE *fp, LPCWSTR psz) + { + fputws(psz, fp); + } + void ConPrintf(FILE *fp, LPCWSTR psz, ...) + { + va_list va; + va_start(va, psz); + vfwprintf(fp, psz, va); + va_end(va); + } + void ConResPuts(FILE *fp, UINT nID) + { + WCHAR sz[MAX_PATH]; + LoadStringW(NULL, nID, sz, _countof(sz)); + fputws(sz, fp); + } + void ConResPrintf(FILE *fp, UINT nID, ...) + { + va_list va; + WCHAR sz[MAX_PATH]; + va_start(va, nID); + LoadStringW(NULL, nID, sz, _countof(sz)); + vfwprintf(fp, sz, va); + va_end(va); + } #endif -#define FLAG_A (1 << 0) -#define FLAG_B (1 << 1) -#define FLAG_C (1 << 2) -#define FLAG_L (1 << 3) -#define FLAG_LBn (1 << 4) -#define FLAG_N (1 << 5) -#define FLAG_OFFLINE (1 << 6) -#define FLAG_T (1 << 7) -#define FLAG_U (1 << 8) -#define FLAG_W (1 << 9) -#define FLAG_nnnn (1 << 10) -#define FLAG_HELP (1 << 11) - -typedef struct FILECOMPARE -{ - DWORD dwFlags; // FLAG_... - INT n, nnnn; - LPCWSTR file1, file2; -} FILECOMPARE; - -static FCRET NoDifference(VOID) +FCRET NoDifference(VOID) { ConResPuts(StdOut, IDS_NO_DIFFERENCE); return FCRET_IDENTICAL; } -static FCRET Different(LPCWSTR file1, LPCWSTR file2) +FCRET Different(LPCWSTR file0, LPCWSTR file1) { - ConResPrintf(StdOut, IDS_DIFFERENT, file1, file2); + ConResPrintf(StdOut, IDS_DIFFERENT, file0, file1); return FCRET_DIFFERENT; } -static FCRET LongerThan(LPCWSTR file1, LPCWSTR file2) +FCRET LongerThan(LPCWSTR file0, LPCWSTR file1) { - ConResPrintf(StdOut, IDS_LONGER_THAN, file1, file2); + ConResPrintf(StdOut, IDS_LONGER_THAN, file0, file1); return FCRET_DIFFERENT; } -static FCRET OutOfMemory(VOID) +FCRET OutOfMemory(VOID) { ConResPuts(StdErr, IDS_OUT_OF_MEMORY); return FCRET_INVALID; } -static FCRET CannotRead(LPCWSTR file) +FCRET CannotRead(LPCWSTR file) { ConResPrintf(StdErr, IDS_CANNOT_READ, file); return FCRET_INVALID; } -static FCRET InvalidSwitch(VOID) +FCRET InvalidSwitch(VOID) { ConResPuts(StdErr, IDS_INVALID_SWITCH); return FCRET_INVALID; } -static HANDLE DoOpenFileForInput(LPCWSTR file) +FCRET ResyncFailed(VOID) +{ + ConResPuts(StdOut, IDS_RESYNC_FAILED); + return FCRET_DIFFERENT; +} + +VOID PrintCaption(LPCWSTR file) +{ + ConPrintf(StdOut, L"***** %ls\n", file); +} + +VOID PrintEndOfDiff(VOID) +{ + ConPuts(StdOut, L"*****\n\n"); +} + +VOID PrintDots(VOID) +{ + ConPuts(StdOut, L"...\n"); +} + +VOID PrintLineW(const FILECOMPARE *pFC, DWORD lineno, LPCWSTR psz) +{ + if (pFC->dwFlags & FLAG_N) + ConPrintf(StdOut, L"%5d: %ls\n", lineno, psz); + else + ConPrintf(StdOut, L"%ls\n", psz); +} +VOID PrintLineA(const FILECOMPARE *pFC, DWORD lineno, LPCSTR psz) +{ + if (pFC->dwFlags & FLAG_N) + ConPrintf(StdOut, L"%5d: %hs\n", lineno, psz); + else + ConPrintf(StdOut, L"%hs\n", psz); +} + +HANDLE DoOpenFileForInput(LPCWSTR file) { HANDLE hFile = CreateFileW(file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) @@ -97,54 +126,54 @@ static HANDLE DoOpenFileForInput(LPCWSTR file) static FCRET BinaryFileCompare(FILECOMPARE *pFC) { FCRET ret; - HANDLE hFile1, hFile2, hMapping1 = NULL, hMapping2 = NULL; - LPBYTE pb1 = NULL, pb2 = NULL; - LARGE_INTEGER ib, cb1, cb2, cbCommon; + HANDLE hFile0, hFile1, hMapping0 = NULL, hMapping1 = NULL; + LPBYTE pb0 = NULL, pb1 = NULL; + LARGE_INTEGER ib, cb0, cb1, cbCommon; DWORD cbView, ibView; BOOL fDifferent = FALSE; - hFile1 = DoOpenFileForInput(pFC->file1); - if (hFile1 == INVALID_HANDLE_VALUE) + hFile0 = DoOpenFileForInput(pFC->file[0]); + if (hFile0 == INVALID_HANDLE_VALUE) return FCRET_CANT_FIND; - hFile2 = DoOpenFileForInput(pFC->file2); - if (hFile2 == INVALID_HANDLE_VALUE) + hFile1 = DoOpenFileForInput(pFC->file[1]); + if (hFile1 == INVALID_HANDLE_VALUE) { - CloseHandle(hFile1); + CloseHandle(hFile0); return FCRET_CANT_FIND; } do { - if (_wcsicmp(pFC->file1, pFC->file2) == 0) + if (_wcsicmp(pFC->file[0], pFC->file[1]) == 0) { ret = NoDifference(); break; } - if (!GetFileSizeEx(hFile1, &cb1)) + if (!GetFileSizeEx(hFile0, &cb0)) { - ret = CannotRead(pFC->file1); + ret = CannotRead(pFC->file[0]); break; } - if (!GetFileSizeEx(hFile2, &cb2)) + if (!GetFileSizeEx(hFile1, &cb1)) { - ret = CannotRead(pFC->file2); + ret = CannotRead(pFC->file[1]); break; } - cbCommon.QuadPart = min(cb1.QuadPart, cb2.QuadPart); + cbCommon.QuadPart = min(cb0.QuadPart, cb1.QuadPart); if (cbCommon.QuadPart > 0) { - hMapping1 = CreateFileMappingW(hFile1, NULL, PAGE_READONLY, - cb1.HighPart, cb1.LowPart, NULL); - if (hMapping1 == NULL) + hMapping0 = CreateFileMappingW(hFile0, NULL, PAGE_READONLY, + cb0.HighPart, cb0.LowPart, NULL); + if (hMapping0 == NULL) { - ret = CannotRead(pFC->file1); + ret = CannotRead(pFC->file[0]); break; } - hMapping2 = CreateFileMappingW(hFile2, NULL, PAGE_READONLY, - cb2.HighPart, cb2.LowPart, NULL); - if (hMapping2 == NULL) + hMapping1 = CreateFileMappingW(hFile1, NULL, PAGE_READONLY, + cb1.HighPart, cb1.LowPart, NULL); + if (hMapping1 == NULL) { - ret = CannotRead(pFC->file2); + ret = CannotRead(pFC->file[1]); break; } @@ -152,197 +181,121 @@ static FCRET BinaryFileCompare(FILECOMPARE *pFC) for (ib.QuadPart = 0; ib.QuadPart < cbCommon.QuadPart; ) { cbView = (DWORD)min(cbCommon.QuadPart - ib.QuadPart, MAX_VIEW_SIZE); + pb0 = MapViewOfFile(hMapping0, FILE_MAP_READ, ib.HighPart, ib.LowPart, cbView); pb1 = MapViewOfFile(hMapping1, FILE_MAP_READ, ib.HighPart, ib.LowPart, cbView); - pb2 = MapViewOfFile(hMapping2, FILE_MAP_READ, ib.HighPart, ib.LowPart, cbView); - if (!pb1 || !pb2) + if (!pb0 || !pb1) { ret = OutOfMemory(); break; } for (ibView = 0; ibView < cbView; ++ib.QuadPart, ++ibView) { - if (pb1[ibView] == pb2[ibView]) + if (pb0[ibView] == pb1[ibView]) continue; fDifferent = TRUE; if (cbCommon.QuadPart > MAXDWORD) { ConPrintf(StdOut, L"%016I64X: %02X %02X\n", ib.QuadPart, - pb1[ibView], pb2[ibView]); + pb0[ibView], pb1[ibView]); } else { ConPrintf(StdOut, L"%08lX: %02X %02X\n", ib.LowPart, - pb1[ibView], pb2[ibView]); + pb0[ibView], pb1[ibView]); } } + UnmapViewOfFile(pb0); UnmapViewOfFile(pb1); - UnmapViewOfFile(pb2); - pb1 = pb2 = NULL; + pb0 = pb1 = NULL; } if (ret != FCRET_IDENTICAL) break; } - if (cb1.QuadPart < cb2.QuadPart) - ret = LongerThan(pFC->file2, pFC->file1); - else if (cb1.QuadPart > cb2.QuadPart) - ret = LongerThan(pFC->file1, pFC->file2); + if (cb0.QuadPart < cb1.QuadPart) + ret = LongerThan(pFC->file[1], pFC->file[0]); + else if (cb0.QuadPart > cb1.QuadPart) + ret = LongerThan(pFC->file[0], pFC->file[1]); else if (fDifferent) - ret = Different(pFC->file1, pFC->file2); + ret = Different(pFC->file[0], pFC->file[1]); else ret = NoDifference(); } while (0); + UnmapViewOfFile(pb0); UnmapViewOfFile(pb1); - UnmapViewOfFile(pb2); + CloseHandle(hMapping0); CloseHandle(hMapping1); - CloseHandle(hMapping2); + CloseHandle(hFile0); CloseHandle(hFile1); - CloseHandle(hFile2); - return ret; -} - -static FCRET -UnicodeTextCompare(FILECOMPARE *pFC, HANDLE hMapping1, const LARGE_INTEGER *pcb1, - HANDLE hMapping2, const LARGE_INTEGER *pcb2) -{ - FCRET ret; - BOOL fIgnoreCase = !!(pFC->dwFlags & FLAG_C); - DWORD dwCmpFlags = (fIgnoreCase ? NORM_IGNORECASE : 0); - LPCWSTR psz1, psz2; - LARGE_INTEGER cch1 = { .QuadPart = pcb1->QuadPart / sizeof(WCHAR) }; - LARGE_INTEGER cch2 = { .QuadPart = pcb1->QuadPart / sizeof(WCHAR) }; - - do - { - psz1 = MapViewOfFile(hMapping1, FILE_MAP_READ, 0, 0, pcb1->LowPart); - psz2 = MapViewOfFile(hMapping2, FILE_MAP_READ, 0, 0, pcb2->LowPart); - if (!psz1 || !psz2) - { - ret = OutOfMemory(); - break; - } - if (cch1.QuadPart < MAXLONG && cch2.QuadPart < MAXLONG) - { - if (CompareStringW(0, dwCmpFlags, psz1, cch1.LowPart, - psz2, cch2.LowPart) == CSTR_EQUAL) - { - ret = NoDifference(); - break; - } - } - // TODO: compare each lines - // TODO: large file support - ret = Different(pFC->file1, pFC->file2); - } while (0); - - UnmapViewOfFile(psz1); - UnmapViewOfFile(psz2); - return ret; -} - -static FCRET -AnsiTextCompare(FILECOMPARE *pFC, HANDLE hMapping1, const LARGE_INTEGER *pcb1, - HANDLE hMapping2, const LARGE_INTEGER *pcb2) -{ - FCRET ret; - BOOL fIgnoreCase = !!(pFC->dwFlags & FLAG_C); - DWORD dwCmpFlags = (fIgnoreCase ? NORM_IGNORECASE : 0); - LPSTR psz1, psz2; - - do - { - psz1 = MapViewOfFile(hMapping1, FILE_MAP_READ, 0, 0, pcb1->LowPart); - psz2 = MapViewOfFile(hMapping2, FILE_MAP_READ, 0, 0, pcb2->LowPart); - if (!psz1 || !psz2) - { - ret = OutOfMemory(); - break; - } - if (pcb1->QuadPart < MAXLONG && pcb2->QuadPart < MAXLONG) - { - if (CompareStringA(0, dwCmpFlags, psz1, pcb1->LowPart, - psz2, pcb2->LowPart) == CSTR_EQUAL) - { - ret = NoDifference(); - break; - } - } - // TODO: compare each lines - // TODO: large file support - ret = Different(pFC->file1, pFC->file2); - } while (0); - - UnmapViewOfFile(psz1); - UnmapViewOfFile(psz2); return ret; } static FCRET TextFileCompare(FILECOMPARE *pFC) { FCRET ret; - HANDLE hFile1, hFile2, hMapping1 = NULL, hMapping2 = NULL; - LARGE_INTEGER cb1, cb2; + HANDLE hFile0, hFile1, hMapping0 = NULL, hMapping1 = NULL; + LARGE_INTEGER cb0, cb1; BOOL fUnicode = !!(pFC->dwFlags & FLAG_U); - hFile1 = DoOpenFileForInput(pFC->file1); - if (hFile1 == INVALID_HANDLE_VALUE) + hFile0 = DoOpenFileForInput(pFC->file[0]); + if (hFile0 == INVALID_HANDLE_VALUE) return FCRET_CANT_FIND; - hFile2 = DoOpenFileForInput(pFC->file2); - if (hFile2 == INVALID_HANDLE_VALUE) + hFile1 = DoOpenFileForInput(pFC->file[1]); + if (hFile1 == INVALID_HANDLE_VALUE) { - CloseHandle(hFile1); + CloseHandle(hFile0); return FCRET_CANT_FIND; } do { - if (_wcsicmp(pFC->file1, pFC->file2) == 0) + if (_wcsicmp(pFC->file[0], pFC->file[1]) == 0) { ret = NoDifference(); break; } - if (!GetFileSizeEx(hFile1, &cb1)) + if (!GetFileSizeEx(hFile0, &cb0)) { - ret = CannotRead(pFC->file1); + ret = CannotRead(pFC->file[0]); break; } - if (!GetFileSizeEx(hFile2, &cb2)) + if (!GetFileSizeEx(hFile1, &cb1)) { - ret = CannotRead(pFC->file2); + ret = CannotRead(pFC->file[1]); break; } - if (cb1.QuadPart == 0 && cb2.QuadPart == 0) + if (cb0.QuadPart == 0 && cb1.QuadPart == 0) { ret = NoDifference(); break; } - hMapping1 = CreateFileMappingW(hFile1, NULL, PAGE_READONLY, - cb1.HighPart, cb1.LowPart, NULL); - if (hMapping1 == NULL) + hMapping0 = CreateFileMappingW(hFile0, NULL, PAGE_READONLY, + cb0.HighPart, cb0.LowPart, NULL); + if (hMapping0 == NULL) { - ret = CannotRead(pFC->file1); + ret = CannotRead(pFC->file[0]); break; } - hMapping2 = CreateFileMappingW(hFile2, NULL, PAGE_READONLY, - cb2.HighPart, cb2.LowPart, NULL); - if (hMapping2 == NULL) + hMapping1 = CreateFileMappingW(hFile1, NULL, PAGE_READONLY, + cb1.HighPart, cb1.LowPart, NULL); + if (hMapping1 == NULL) { - ret = CannotRead(pFC->file2); + ret = CannotRead(pFC->file[1]); break; } if (fUnicode) - ret = UnicodeTextCompare(pFC, hMapping1, &cb1, hMapping2, &cb2); + ret = TextCompareW(pFC, &hMapping0, &cb0, &hMapping1, &cb1); else - ret = AnsiTextCompare(pFC, hMapping1, &cb1, hMapping2, &cb2); + ret = TextCompareA(pFC, &hMapping0, &cb0, &hMapping1, &cb1); } while (0); + CloseHandle(hMapping0); CloseHandle(hMapping1); - CloseHandle(hMapping2); + CloseHandle(hFile0); CloseHandle(hFile1); - CloseHandle(hFile2); return ret; } @@ -352,17 +305,17 @@ static BOOL IsBinaryExt(LPCWSTR filename) // See also: https://docs.microsoft.com/en-us/windows-server/administration/windows-comm… static const LPCWSTR s_exts[] = { L"EXE", L"COM", L"SYS", L"OBJ", L"LIB", L"BIN" }; size_t iext; - LPCWSTR pch, ext, pch1 = wcsrchr(filename, L'\\'), pch2 = wcsrchr(filename, L'/'); - if (!pch1 && !pch2) + LPCWSTR pch, ext, pch0 = wcsrchr(filename, L'\\'), pch1 = wcsrchr(filename, L'/'); + if (!pch0 && !pch1) pch = filename; - else if (!pch1 && pch2) - pch = pch2; - else if (pch1 && !pch2) + else if (!pch0 && pch1) pch = pch1; - else if (pch1 < pch2) - pch = pch2; - else + else if (pch0 && !pch1) + pch = pch0; + else if (pch0 < pch1) pch = pch1; + else + pch = pch0; ext = wcsrchr(pch, L'.'); if (ext) @@ -382,10 +335,10 @@ static BOOL IsBinaryExt(LPCWSTR filename) static FCRET FileCompare(FILECOMPARE *pFC) { - ConResPrintf(StdOut, IDS_COMPARING, pFC->file1, pFC->file2); + ConResPrintf(StdOut, IDS_COMPARING, pFC->file[0], pFC->file[1]); if (!(pFC->dwFlags & FLAG_L) && - ((pFC->dwFlags & FLAG_B) || IsBinaryExt(pFC->file1) || IsBinaryExt(pFC->file2))) + ((pFC->dwFlags & FLAG_B) || IsBinaryExt(pFC->file[0]) || IsBinaryExt(pFC->file[1]))) { return BinaryFileCompare(pFC); } @@ -394,25 +347,29 @@ static FCRET FileCompare(FILECOMPARE *pFC) static FCRET WildcardFileCompare(FILECOMPARE *pFC) { + FCRET ret; + if (pFC->dwFlags & FLAG_HELP) { ConResPuts(StdOut, IDS_USAGE); return FCRET_INVALID; } - if (!pFC->file1 || !pFC->file2) + if (!pFC->file[0] || !pFC->file[1]) { ConResPuts(StdErr, IDS_NEEDS_FILES); return FCRET_INVALID; } - if (HasWildcard(pFC->file1) || HasWildcard(pFC->file2)) + if (HasWildcard(pFC->file[0]) || HasWildcard(pFC->file[1])) { // TODO: wildcard ConResPuts(StdErr, IDS_CANT_USE_WILDCARD); } - return FileCompare(pFC); + ret = FileCompare(pFC); + ConPuts(StdOut, L"\n"); + return ret; } int wmain(int argc, WCHAR **argv) @@ -428,10 +385,10 @@ int wmain(int argc, WCHAR **argv) { if (argv[i][0] != L'/') { - if (!fc.file1) - fc.file1 = argv[i]; - else if (!fc.file2) - fc.file2 = argv[i]; + if (!fc.file[0]) + fc.file[0] = argv[i]; + else if (!fc.file[1]) + fc.file[1] = argv[i]; else return InvalidSwitch(); continue; @@ -479,6 +436,9 @@ int wmain(int argc, WCHAR **argv) case L'T': fc.dwFlags |= FLAG_T; break; + case L'U': + fc.dwFlags |= FLAG_U; + break; case L'W': fc.dwFlags |= FLAG_W; break; @@ -498,3 +458,14 @@ int wmain(int argc, WCHAR **argv) } return WildcardFileCompare(&fc); } + +#ifndef __REACTOS__ +int main(int argc, char **argv) +{ + INT my_argc; + LPWSTR *my_argv = CommandLineToArgvW(GetCommandLineW(), &my_argc); + INT ret = wmain(my_argc, my_argv); + LocalFree(my_argv); + return ret; +} +#endif diff --git a/base/applications/cmdutils/fc/fc.h b/base/applications/cmdutils/fc/fc.h new file mode 100644 index 00000000000..3d8772e78c7 --- /dev/null +++ b/base/applications/cmdutils/fc/fc.h @@ -0,0 +1,97 @@ +/* + * PROJECT: ReactOS FC Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Comparing files + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#pragma once +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#ifdef __REACTOS__ + #include <windef.h> + #include <winbase.h> + #include <winuser.h> + #include <winnls.h> +#else + #include <windows.h> +#endif +#include <wine/list.h> +#include "resource.h" + +// See also: https://stackoverflow.com/questions/33125766/compare-files-with-a-cmd +typedef enum FCRET // return code of FC command +{ + FCRET_INVALID = -1, + FCRET_IDENTICAL = 0, + FCRET_DIFFERENT = 1, + FCRET_CANT_FIND = 2, + FCRET_NO_MORE_DATA = 3 // (extension) +} FCRET; + +typedef struct NODE_W +{ + struct list entry; + LPWSTR pszLine; + LPWSTR pszComp; // compressed + DWORD lineno; + DWORD hash; +} NODE_W; +typedef struct NODE_A +{ + struct list entry; + LPSTR pszLine; + LPSTR pszComp; // compressed + DWORD lineno; + DWORD hash; +} NODE_A; + +#define FLAG_A (1 << 0) // abbreviation +#define FLAG_B (1 << 1) // binary +#define FLAG_C (1 << 2) // ignore cases +#define FLAG_L (1 << 3) // ASCII mode +#define FLAG_LBn (1 << 4) // line buffers +#define FLAG_N (1 << 5) // show line numbers +#define FLAG_OFFLINE (1 << 6) // ??? +#define FLAG_T (1 << 7) // prevent fc from converting tabs to spaces +#define FLAG_U (1 << 8) // Unicode +#define FLAG_W (1 << 9) // compress white space +#define FLAG_nnnn (1 << 10) // ??? +#define FLAG_HELP (1 << 11) // show usage + +typedef struct FILECOMPARE +{ + DWORD dwFlags; // FLAG_... + INT n; // # of line buffers + INT nnnn; // retry count before resynch + LPCWSTR file[2]; + struct list list[2]; +} FILECOMPARE; + +// text.h +FCRET TextCompareW(FILECOMPARE *pFC, + HANDLE *phMapping0, const LARGE_INTEGER *pcb0, + HANDLE *phMapping1, const LARGE_INTEGER *pcb1); +FCRET TextCompareA(FILECOMPARE *pFC, + HANDLE *phMapping0, const LARGE_INTEGER *pcb0, + HANDLE *phMapping1, const LARGE_INTEGER *pcb1); +// fc.c +VOID PrintLineW(const FILECOMPARE *pFC, DWORD lineno, LPCWSTR psz); +VOID PrintLineA(const FILECOMPARE *pFC, DWORD lineno, LPCSTR psz); +VOID PrintCaption(LPCWSTR file); +VOID PrintEndOfDiff(VOID); +VOID PrintDots(VOID); +FCRET NoDifference(VOID); +FCRET Different(LPCWSTR file0, LPCWSTR file1); +FCRET LongerThan(LPCWSTR file0, LPCWSTR file1); +FCRET OutOfMemory(VOID); +FCRET CannotRead(LPCWSTR file); +FCRET InvalidSwitch(VOID); +FCRET ResyncFailed(VOID); +HANDLE DoOpenFileForInput(LPCWSTR file); + +#ifdef _WIN64 + #define MAX_VIEW_SIZE (256 * 1024 * 1024) // 256 MB +#else + #define MAX_VIEW_SIZE (64 * 1024 * 1024) // 64 MB +#endif diff --git a/base/applications/cmdutils/fc/text.h b/base/applications/cmdutils/fc/text.h new file mode 100644 index 00000000000..d0f2363f6f9 --- /dev/null +++ b/base/applications/cmdutils/fc/text.h @@ -0,0 +1,620 @@ +/* + * PROJECT: ReactOS FC Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Comparing text files + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#include "fc.h" +#include <stdio.h> + +#ifdef __REACTOS__ + #include <wine/debug.h> + WINE_DEFAULT_DEBUG_CHANNEL(fc); +#else + #define ERR /*empty*/ + #define WARN /*empty*/ + #define TRACE /*empty*/ +#endif + +#define IS_SPACE(ch) ((ch) == TEXT(' ') || (ch) == TEXT('\t')) + +#ifdef UNICODE + #define NODE NODE_W + #define PrintLine PrintLineW + #define TextCompare TextCompareW +#else + #define NODE NODE_A + #define PrintLine PrintLineA + #define TextCompare TextCompareA +#endif + +static LPTSTR AllocLine(LPCTSTR pch, DWORD cch) +{ + LPTSTR pszNew = malloc((cch + 1) * sizeof(TCHAR)); + if (!pszNew) + return NULL; + memcpy(pszNew, pch, cch * sizeof(TCHAR)); + pszNew[cch] = 0; + return pszNew; +} + +static NODE *AllocNode(LPTSTR psz, DWORD lineno) +{ + NODE *node; + if (!psz) + return NULL; + node = calloc(1, sizeof(NODE)); + if (!node) + { + free(psz); + return NULL; + } + node->pszLine = psz; + node->lineno = lineno; + return node; +} + +static __inline VOID DeleteNode(NODE *node) +{ + if (node) + { + free(node->pszLine); + free(node->pszComp); + free(node); + } +} + +static VOID DeleteList(struct list *list) +{ + struct list *ptr; + NODE *node; + while ((ptr = list_head(list)) != NULL) + { + list_remove(ptr); + node = LIST_ENTRY(ptr, NODE, entry); + DeleteNode(node); + } +} + +static __inline LPCTSTR SkipSpace(LPCTSTR pch) +{ + while (IS_SPACE(*pch)) + ++pch; + return pch; +} + +static __inline LPCTSTR FindLastNonSpace(LPCTSTR pch) +{ + LPCTSTR pchLast = NULL; + while (*pch) + { + if (!IS_SPACE(*pch)) + pchLast = pch; + ++pch; + } + return pchLast; +} + +static VOID DeleteDuplicateSpaces(LPTSTR psz) +{ + LPTSTR pch0, pch1; + for (pch0 = pch1 = psz; *pch0; ++pch0) + { + *pch1++ = *pch0; + if (IS_SPACE(*pch0)) + { + do + { + ++pch0; + } while (IS_SPACE(*pch0)); + --pch0; + } + } + *pch1 = 0; +} + +static LPTSTR CompressSpace(LPCTSTR line) +{ + LPTSTR pszNew; + LPCTSTR pchLast; + + line = SkipSpace(line); + pchLast = FindLastNonSpace(line); + if (pchLast == NULL) + return AllocLine(NULL, 0); + + pszNew = AllocLine(line, (DWORD)(pchLast - line) + 1); + if (!pszNew) + return NULL; + + DeleteDuplicateSpaces(pszNew); + return pszNew; +} + +#define TAB_WIDTH 8 + +static INT ExpandTabLength(LPCTSTR line) +{ + LPCTSTR pch; + INT cch = 0; + for (pch = line; *pch; ++pch) + { + if (*pch == TEXT('\t')) + cch += TAB_WIDTH - (cch % TAB_WIDTH); + else + ++cch; + } + return cch; +} + +static LPTSTR ExpandTab(LPCTSTR line) +{ + INT spaces, cch = ExpandTabLength(line), ich; + LPTSTR pszNew = malloc((cch + 1) * sizeof(TCHAR)); + LPCTSTR pch; + if (!pszNew) + return NULL; + ich = 0; + for (pch = line; *pch; ++pch) + { + if (*pch == TEXT('\t')) + { + spaces = TAB_WIDTH - (ich % TAB_WIDTH); + while (spaces-- > 0) + { + pszNew[ich++] = TEXT(' '); + } + } + else + { + pszNew[ich++] = *pch; + } + } + pszNew[ich] = 0; + return pszNew; +} + +#define HASH_EOF 0xFFFFFFFF +#define HASH_MASK 0x7FFFFFFF + +static DWORD GetHash(LPCTSTR psz, BOOL bIgnoreCase) +{ + DWORD ret = 0xDEADFACE; + while (*psz) + { + ret += (bIgnoreCase ? towupper(*psz) : *psz); + ret <<= 2; + ++psz; + } + return (ret & HASH_MASK); +} + +static NODE *AllocEOFNode(DWORD lineno) +{ + NODE *node = AllocNode(AllocLine(NULL, 0), 0); + if (node == NULL) + return NULL; + node->pszComp = AllocLine(NULL, 0); + if (node->pszComp == NULL) + { + DeleteNode(node); + return NULL; + } + node->lineno = lineno; + node->hash = HASH_EOF; + return node; +} + +static __inline BOOL IsEOFNode(NODE *node) +{ + return !node || node->hash == HASH_EOF; +} + +static BOOL ConvertNode(const FILECOMPARE *pFC, NODE *node) +{ + if (!(pFC->dwFlags & FLAG_T)) + { + LPTSTR tmp = ExpandTab(node->pszLine); + if (!tmp) + return FALSE; + free(node->pszLine); + node->pszLine = tmp; + if (!(pFC->dwFlags & FLAG_W)) + node->hash = GetHash(node->pszLine, !!(pFC->dwFlags & FLAG_C)); + } + if (pFC->dwFlags & FLAG_W) + { + node->pszComp = CompressSpace(node->pszLine); + if (!node->pszComp) + return FALSE; + node->hash = GetHash(node->pszComp, !!(pFC->dwFlags & FLAG_C)); + } + return TRUE; +} + +static FCRET CompareNode(const FILECOMPARE *pFC, const NODE *node0, const NODE *node1) +{ + DWORD dwCmpFlags; + LPTSTR psz0, psz1; + INT ret; + if (node0->hash != node1->hash) + return FCRET_DIFFERENT; + + psz0 = (pFC->dwFlags & FLAG_W) ? node0->pszComp : node0->pszLine; + psz1 = (pFC->dwFlags & FLAG_W) ? node1->pszComp : node1->pszLine; + dwCmpFlags = ((pFC->dwFlags & FLAG_C) ? NORM_IGNORECASE : 0); + ret = CompareString(LOCALE_USER_DEFAULT, dwCmpFlags, psz0, -1, psz1, -1); + return (ret == CSTR_EQUAL) ? FCRET_IDENTICAL : FCRET_DIFFERENT; +} + +static BOOL FindNextLine(LPCTSTR pch, DWORD ich, DWORD cch, LPDWORD pich) +{ + while (ich < cch) + { + if (pch[ich] == TEXT('\n') || pch[ich] == TEXT('\0')) + { + *pich = ich; + return TRUE; + } + ++ich; + } + *pich = cch; + return FALSE; +} + +static FCRET +ParseLines(const FILECOMPARE *pFC, HANDLE *phMapping, + LARGE_INTEGER *pib, const LARGE_INTEGER *pcb, struct list *list) +{ + DWORD lineno = 1, ich, cch, ichNext, cbView, cchNode; + LPTSTR psz, pszLine; + BOOL fLast, bCR; + NODE *node; + + if (*phMapping == NULL) + return FCRET_NO_MORE_DATA; + + if (pib->QuadPart >= pcb->QuadPart) + { + CloseHandle(*phMapping); + *phMapping = NULL; + return FCRET_NO_MORE_DATA; + } + + cbView = (DWORD)min(pcb->QuadPart - pib->QuadPart, MAX_VIEW_SIZE); + psz = MapViewOfFile(*phMapping, FILE_MAP_READ, pib->HighPart, pib->LowPart, cbView); + if (!psz) + { + return OutOfMemory(); + } + + ich = 0; + cch = cbView / sizeof(TCHAR); + fLast = (pib->QuadPart + cbView >= pcb->QuadPart); + while (ich < cch && + (FindNextLine(psz, ich, cch, &ichNext) || + (ichNext == cch && (fLast || ich == 0)))) + { + bCR = (ichNext > 0) && (psz[ichNext - 1] == TEXT('\r')); + cchNode = ichNext - ich - bCR; + TRACE("ich:%ld, cch:%ld, ichNext:%ld, cchNode:%ld\n", ich, cch, ichNext, cchNode); + pszLine = AllocLine(&psz[ich], cchNode); + node = AllocNode(pszLine, lineno++); + if (!node || !ConvertNode(pFC, node)) + { + DeleteNode(node); + UnmapViewOfFile(psz); + return OutOfMemory(); + } + list_add_tail(list, &node->entry); + ich = ichNext + 1; + } + + UnmapViewOfFile(psz); + + pib->QuadPart += ichNext * sizeof(WCHAR); + + if (pib->QuadPart < pcb->QuadPart) + return FCRET_IDENTICAL; + + // append EOF node + node = AllocEOFNode(lineno); + if (!node) + return OutOfMemory(); + list_add_tail(list, &node->entry); + + return FCRET_NO_MORE_DATA; +} + +static VOID +ShowDiff(FILECOMPARE *pFC, INT i, struct list *begin, struct list *end) +{ + NODE* node; + struct list *list = &pFC->list[i]; + struct list *first = NULL, *last = NULL; + PrintCaption(pFC->file[i]); + if (begin && end && list_prev(list, begin)) + begin = list_prev(list, begin); + while (begin != end) + { + node = LIST_ENTRY(begin, NODE, entry); + if (IsEOFNode(node)) + break; + if (!first) + first = begin; + last = begin; + if (!(pFC->dwFlags & FLAG_A)) + PrintLine(pFC, node->lineno, node->pszLine); + begin = list_next(list, begin); + } + if ((pFC->dwFlags & FLAG_A) && first) + { + node = LIST_ENTRY(first, NODE, entry); + PrintLine(pFC, node->lineno, node->pszLine); + first = list_next(list, first); + if (first != last) + { + if (list_next(list, first) == last) + { + node = LIST_ENTRY(first, NODE, entry); + PrintLine(pFC, node->lineno, node->pszLine); + } + else + { + PrintDots(); + } + } + node = LIST_ENTRY(last, NODE, entry); + PrintLine(pFC, node->lineno, node->pszLine); + } +} + +static VOID +SkipIdentical(FILECOMPARE *pFC, struct list **pptr0, struct list **pptr1) +{ + struct list *ptr0 = *pptr0, *ptr1 = *pptr1; + while (ptr0 && ptr1) + { + NODE *node0 = LIST_ENTRY(ptr0, NODE, entry); + NODE *node1 = LIST_ENTRY(ptr1, NODE, entry); + if (CompareNode(pFC, node0, node1) != FCRET_IDENTICAL) + break; + ptr0 = list_next(&pFC->list[0], ptr0); + ptr1 = list_next(&pFC->list[1], ptr1); + } + *pptr0 = ptr0; + *pptr1 = ptr1; +} + +static DWORD +SkipIdenticalN(FILECOMPARE *pFC, struct list **pptr0, struct list **pptr1, + DWORD nnnn, DWORD lineno0, DWORD lineno1) +{ + struct list *ptr0 = *pptr0, *ptr1 = *pptr1; + DWORD count = 0; + while (ptr0 && ptr1) + { + NODE *node0 = LIST_ENTRY(ptr0, NODE, entry); + NODE *node1 = LIST_ENTRY(ptr1, NODE, entry); + if (node0->lineno >= lineno0) + break; + if (node1->lineno >= lineno1) + break; + if (CompareNode(pFC, node0, node1) != FCRET_IDENTICAL) + break; + ptr0 = list_next(&pFC->list[0], ptr0); + ptr1 = list_next(&pFC->list[1], ptr1); + ++count; + if (count >= nnnn) + break; + } + *pptr0 = ptr0; + *pptr1 = ptr1; + return count; +} + +static FCRET +ScanDiff(FILECOMPARE *pFC, struct list **pptr0, struct list **pptr1, + DWORD lineno0, DWORD lineno1) +{ + struct list *ptr0 = *pptr0, *ptr1 = *pptr1, *tmp0, *tmp1; + NODE *node0, *node1; + INT count; + while (ptr0 && ptr1) + { + node0 = LIST_ENTRY(ptr0, NODE, entry); + node1 = LIST_ENTRY(ptr1, NODE, entry); + if (node0->lineno >= lineno0) + return FCRET_DIFFERENT; + if (node1->lineno >= lineno1) + return FCRET_DIFFERENT; + tmp0 = ptr0; + tmp1 = ptr1; + count = SkipIdenticalN(pFC, &tmp0, &tmp1, pFC->nnnn, lineno0, lineno1); + if (count >= pFC->nnnn) + break; + if (count > 0) + { + ptr0 = tmp0; + ptr1 = tmp1; + } + else + { + ptr0 = list_next(&pFC->list[0], ptr0); + ptr1 = list_next(&pFC->list[1], ptr1); + } + } + *pptr0 = ptr0; + *pptr1 = ptr1; + return FCRET_IDENTICAL; +} + +static FCRET +Resync(FILECOMPARE *pFC, struct list **pptr0, struct list **pptr1) +{ + FCRET ret; + struct list *ptr0, *ptr1, *save0 = NULL, *save1 = NULL; + NODE *node0, *node1; + struct list *list0 = &pFC->list[0], *list1 = &pFC->list[1]; + DWORD lineno0, lineno1; + INT penalty, i0, i1, min_penalty = MAXLONG; + + node0 = LIST_ENTRY(*pptr0, NODE, entry); + node1 = LIST_ENTRY(*pptr1, NODE, entry); + lineno0 = node0->lineno + pFC->n; + lineno1 = node1->lineno + pFC->n; + + // ``If the files that you are comparing have more than pFC->n consecutive + // differing lines, FC cancels the comparison,, + // ``If the number of matching lines in the files is less than pFC->nnnn, + // FC displays the matching lines as differences,, + for (ptr1 = list_next(list1, *pptr1), i1 = 0; ptr1; ptr1 = list_next(list1, ptr1), ++i1) + { + node1 = LIST_ENTRY(ptr1, NODE, entry); + if (node1->lineno >= lineno1) + break; + for (ptr0 = list_next(list0, *pptr0), i0 = 0; ptr0; ptr0 = list_next(list0, ptr0), ++i0) + { + node0 = LIST_ENTRY(ptr0, NODE, entry); + if (node0->lineno >= lineno0) + break; + if (CompareNode(pFC, node0, node1) == FCRET_IDENTICAL) + { + penalty = min(i0, i1) + abs(i1 - i0); + if (min_penalty > penalty) + { + min_penalty = penalty; + save0 = ptr0; + save1 = ptr1; + } + } + } + } + + if (save0 && save1) + { + *pptr0 = save0; + *pptr1 = save1; + ret = ScanDiff(pFC, &save0, &save1, lineno0, lineno1); + if (save0 && save1) + { + *pptr0 = save0; + *pptr1 = save1; + } + return ret; + } + + for (ptr0 = *pptr0; ptr0; ptr0 = list_next(list0, ptr0)) + { + node0 = LIST_ENTRY(ptr0, NODE, entry); + if (node0->lineno == lineno0) + break; + } + for (ptr1 = *pptr1; ptr1; ptr1 = list_next(list1, ptr1)) + { + node1 = LIST_ENTRY(ptr1, NODE, entry); + if (node1->lineno == lineno1) + break; + } + *pptr0 = ptr0; + *pptr1 = ptr1; + return FCRET_DIFFERENT; +} + +static FCRET +Finalize(FILECOMPARE* pFC, struct list *ptr0, struct list* ptr1, BOOL fDifferent) +{ + if (!ptr0 || !ptr1) + { + if (fDifferent) + return FCRET_DIFFERENT; + return NoDifference(); + } + else + { + ShowDiff(pFC, 0, ptr0, NULL); + ShowDiff(pFC, 1, ptr1, NULL); + PrintEndOfDiff(); + return FCRET_DIFFERENT; + } +} + +FCRET TextCompare(FILECOMPARE *pFC, HANDLE *phMapping0, const LARGE_INTEGER *pcb0, + HANDLE *phMapping1, const LARGE_INTEGER *pcb1) +{ + FCRET ret, ret0, ret1; + struct list *ptr0, *ptr1, *save0, *save1, *next0, *next1; + NODE* node0, * node1; + BOOL fDifferent = FALSE; + LARGE_INTEGER ib0 = { .QuadPart = 0 }, ib1 = { .QuadPart = 0 }; + struct list *list0 = &pFC->list[0], *list1 = &pFC->list[1]; + list_init(list0); + list_init(list1); + + do + { + ret0 = ParseLines(pFC, phMapping0, &ib0, pcb0, list0); + if (ret0 == FCRET_INVALID) + { + ret = ret0; + goto cleanup; + } + ret1 = ParseLines(pFC, phMapping1, &ib1, pcb1, list1); + if (ret1 == FCRET_INVALID) + { + ret = ret1; + goto cleanup; + } + + ptr0 = list_head(list0); + ptr1 = list_head(list1); + for (;;) + { + if (!ptr0 || !ptr1) + goto quit; + + // skip identical (sync'ed) + SkipIdentical(pFC, &ptr0, &ptr1); + if (ptr0 || ptr1) + fDifferent = TRUE; + node0 = LIST_ENTRY(ptr0, NODE, entry); + node1 = LIST_ENTRY(ptr1, NODE, entry); + if (IsEOFNode(node0) || IsEOFNode(node1)) + goto quit; + + // try to resync + save0 = ptr0; + save1 = ptr1; + ret = Resync(pFC, &ptr0, &ptr1); + if (ret == FCRET_INVALID) + goto cleanup; + if (ret == FCRET_DIFFERENT) + { + // resync failed + ret = ResyncFailed(); + // show the difference + ShowDiff(pFC, 0, save0, ptr0); + ShowDiff(pFC, 1, save1, ptr1); + PrintEndOfDiff(); + goto cleanup; + } + + // show the difference + fDifferent = TRUE; + next0 = ptr0 ? list_next(list0, ptr0) : ptr0; + next1 = ptr1 ? list_next(list1, ptr1) : ptr1; + ShowDiff(pFC, 0, save0, (next0 ? next0 : ptr0)); + ShowDiff(pFC, 1, save1, (next1 ? next1 : ptr1)); + PrintEndOfDiff(); + + // now resync'ed + } + } while (ret0 != FCRET_NO_MORE_DATA || ret1 != FCRET_NO_MORE_DATA); + +quit: + ret = Finalize(pFC, ptr0, ptr1, fDifferent); +cleanup: + DeleteList(list0); + DeleteList(list1); + return ret; +} diff --git a/base/applications/cmdutils/fc/texta.c b/base/applications/cmdutils/fc/texta.c new file mode 100644 index 00000000000..1f524f76f03 --- /dev/null +++ b/base/applications/cmdutils/fc/texta.c @@ -0,0 +1,6 @@ +#undef UNICODE +#undef _UNICODE +#ifndef _MBCS + #define _MBCS +#endif +#include "text.h" diff --git a/base/applications/cmdutils/fc/textw.c b/base/applications/cmdutils/fc/textw.c new file mode 100644 index 00000000000..a3fa9114819 --- /dev/null +++ b/base/applications/cmdutils/fc/textw.c @@ -0,0 +1,8 @@ +#ifndef UNICODE + #define UNICODE +#endif +#ifndef _UNICODE + #define _UNICODE +#endif +#undef _MBCS +#include "text.h"

3 years, 7 months

[reactos] 01/01: [NTOS:SE] Get the session ID and assign it to the new token

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5dd93a8a5bf3936fd1810… commit 5dd93a8a5bf3936fd1810af520e12abd041675e0 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon May 3 21:23:02 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue May 4 10:08:26 2021 +0200 [NTOS:SE] Get the session ID and assign it to the new token SeExchangePrimaryToken doesn't assign the session ID to the new token, which could lead to incorrect behaviour in the long run. Let's fix that. --- ntoskrnl/se/token.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 6c1fa178643..bb623ea7c4c 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -636,7 +636,8 @@ SeExchangePrimaryToken( /* Mark new token in use */ NewToken->TokenInUse = TRUE; - // TODO: Set a correct SessionId for NewToken + /* Set the session ID for the new token */ + NewToken->SessionId = MmGetSessionId(Process); /* Unlock the new token */ SepReleaseTokenLock(NewToken);

3 years, 7 months

[reactos] 01/01: [HALX86] Disable Lazy IRQL in APIC HAL (#3609)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d9020634a02d972a1bec… commit 0d9020634a02d972a1bec2674e9e206a0c200868 Author: Justin Miller <justinmiller100(a)gmail.com> AuthorDate: Mon May 3 18:29:50 2021 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 4 04:29:50 2021 +0300 [HALX86] Disable Lazy IRQL in APIC HAL (#3609) Lazy IRQL feature has issues with interrupt delivery on VirtualBox, so disable it for now. For the feature description, see commit d28eae967a04320931241f06c88c801aa86397bd Meanwhile, merge and clean up APIC headers a bit --- hal/halx86/CMakeLists.txt | 6 +- hal/halx86/apic/apic.c | 8 +- hal/halx86/apic/apic.h | 286 ------------------------- hal/halx86/apic/apictimer.c | 3 +- hal/halx86/apic/halaacpi.rc | 5 + hal/halx86/apic/halinit.c | 5 +- hal/halx86/apic/tsc.c | 3 +- hal/halx86/include/apic.h | 512 ++++++++++++++++++++++++-------------------- hal/halx86/smp/halmacpi.rc | 9 + 9 files changed, 308 insertions(+), 529 deletions(-) diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index abb3c1dd469..0b1b18be370 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -60,14 +60,11 @@ if(ARCH STREQUAL "i386") # hal add_hal(hal SOURCES pic/halpic.rc COMPONENTS generic legacy up pic) add_hal(halacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up pic) - add_hal(halaacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up apic) + add_hal(halaacpi SOURCES apic/halaacpi.rc COMPONENTS generic acpi up apic) add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS xbox up) add_hal(halpc98 SOURCES pc98/halpc98.rc COMPONENTS pc98 up) - #add_hal(halmps SOURCES up/halup.rc COMPONENTS generic legacy smp pic) #add_hal(halmacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi smp pic) - #add_hal(halmapic SOURCES acpi/halacpi.rc COMPONENTS generic legacy smp apic) - #add_hal(halmaacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi smp apic) elseif(ARCH STREQUAL "amd64") @@ -75,6 +72,7 @@ elseif(ARCH STREQUAL "amd64") amd64/x86bios.c) add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi up apic) + #add_hal(halmacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi smp pic) target_link_libraries(hal fast486) endif() diff --git a/hal/halx86/apic/apic.c b/hal/halx86/apic/apic.c index 54dbbf01f0a..4c98e13bdf9 100644 --- a/hal/halx86/apic/apic.c +++ b/hal/halx86/apic/apic.c @@ -12,14 +12,14 @@ /* INCLUDES *******************************************************************/ #include <hal.h> +#include <apic.h> #define NDEBUG #include <debug.h> -#include "apic.h" void __cdecl HackEoi(void); #ifndef _M_AMD64 -#define APIC_LAZY_IRQL +//#define APIC_LAZY_IRQL //FIXME: Disabled due to bug. #endif /* GLOBALS ********************************************************************/ @@ -263,10 +263,10 @@ ApicInitializeLocalApic(ULONG Cpu) LVT_REGISTER LvtEntry; /* Enable the APIC if it wasn't yet */ - BaseRegister.Long = __readmsr(MSR_APIC_BASE); + BaseRegister.LongLong = __readmsr(MSR_APIC_BASE); BaseRegister.Enable = 1; BaseRegister.BootStrapCPUCore = (Cpu == 0); - __writemsr(MSR_APIC_BASE, BaseRegister.Long); + __writemsr(MSR_APIC_BASE, BaseRegister.LongLong); /* Set spurious vector and SoftwareEnable to 1 */ SpIntRegister.Long = ApicRead(APIC_SIVR); diff --git a/hal/halx86/apic/apic.h b/hal/halx86/apic/apic.h deleted file mode 100644 index edabaa3b9db..00000000000 --- a/hal/halx86/apic/apic.h +++ /dev/null @@ -1,286 +0,0 @@ - -#pragma once - -#ifdef _M_AMD64 -#define IOAPIC_BASE 0xFFFFFFFFFFFE1000ULL // checkme -#define ZERO_VECTOR 0x00 // IRQL 00 -#define APC_VECTOR 0x3D // IRQL 01 -#define APIC_SPURIOUS_VECTOR 0x3f -#define DISPATCH_VECTOR 0x41 // IRQL 02 -#define APIC_GENERIC_VECTOR 0xC1 // IRQL 27 -#define APIC_CLOCK_VECTOR 0xD1 // IRQL 28 -#define APIC_SYNCH_VECTOR 0xD1 // IRQL 28 -#define APIC_IPI_VECTOR 0xE1 // IRQL 29 -#define APIC_ERROR_VECTOR 0xE3 -#define POWERFAIL_VECTOR 0xEF // IRQL 30 -#define APIC_PROFILE_VECTOR 0xFD // IRQL 31 -#define APIC_NMI_VECTOR 0xFF -#define IrqlToTpr(Irql) (Irql << 4) -#define IrqlToSoftVector(Irql) ((Irql << 4)|0xf) -#define TprToIrql(Tpr) ((KIRQL)(Tpr >> 4)) -#define CLOCK2_LEVEL CLOCK_LEVEL -#else -#define IOAPIC_BASE 0xFFFE1000 // checkme -#define ZERO_VECTOR 0x00 // IRQL 00 -#define APIC_SPURIOUS_VECTOR 0x1f -#define APC_VECTOR 0x3D // IRQL 01 -#define DISPATCH_VECTOR 0x41 // IRQL 02 -#define APIC_GENERIC_VECTOR 0xC1 // IRQL 27 -#define APIC_CLOCK_VECTOR 0xD1 // IRQL 28 -#define APIC_SYNCH_VECTOR 0xD1 // IRQL 28 -#define APIC_IPI_VECTOR 0xE1 // IRQL 29 -#define APIC_ERROR_VECTOR 0xE3 -#define POWERFAIL_VECTOR 0xEF // IRQL 30 -#define APIC_PROFILE_VECTOR 0xFD // IRQL 31 -#define APIC_NMI_VECTOR 0xFF -#define IrqlToTpr(Irql) (HalpIRQLtoTPR[Irql]) -#define IrqlToSoftVector(Irql) IrqlToTpr(Irql) -#define TprToIrql(Tpr) (HalVectorToIRQL[Tpr >> 4]) -#endif - -#define MSR_APIC_BASE 0x0000001B -#define IOAPIC_PHYS_BASE 0xFEC00000 -#define APIC_CLOCK_INDEX 8 - -#define ApicLogicalId(Cpu) ((UCHAR)(1<< Cpu)) - -/* APIC Register Address Map */ -#define APIC_ID 0x0020 /* Local APIC ID Register (R/W) */ -#define APIC_VER 0x0030 /* Local APIC Version Register (R) */ -#define APIC_TPR 0x0080 /* Task Priority Register (R/W) */ -#define APIC_APR 0x0090 /* Arbitration Priority Register (R) */ -#define APIC_PPR 0x00A0 /* Processor Priority Register (R) */ -#define APIC_EOI 0x00B0 /* EOI Register (W) */ -#define APIC_RRR 0x00C0 /* Remote Read Register () */ -#define APIC_LDR 0x00D0 /* Logical Destination Register (R/W) */ -#define APIC_DFR 0x00E0 /* Destination Format Register (0-27 R, 28-31 R/W) */ -#define APIC_SIVR 0x00F0 /* Spurious Interrupt Vector Register (0-3 R, 4-9 R/W) */ -#define APIC_ISR 0x0100 /* Interrupt Service Register 0-255 (R) */ -#define APIC_TMR 0x0180 /* Trigger Mode Register 0-255 (R) */ -#define APIC_IRR 0x0200 /* Interrupt Request Register 0-255 (r) */ -#define APIC_ESR 0x0280 /* Error Status Register (R) */ -#define APIC_ICR0 0x0300 /* Interrupt Command Register 0-31 (R/W) */ -#define APIC_ICR1 0x0310 /* Interrupt Command Register 32-63 (R/W) */ -#define APIC_TMRLVTR 0x0320 /* Timer Local Vector Table (R/W) */ -#define APIC_THRMLVTR 0x0330 /* Thermal Local Vector Table */ -#define APIC_PCLVTR 0x0340 /* Performance Counter Local Vector Table (R/W) */ -#define APIC_LINT0 0x0350 /* LINT0 Local Vector Table (R/W) */ -#define APIC_LINT1 0x0360 /* LINT1 Local Vector Table (R/W) */ -#define APIC_ERRLVTR 0x0370 /* Error Local Vector Table (R/W) */ -#define APIC_TICR 0x0380 /* Initial Count Register for Timer (R/W) */ -#define APIC_TCCR 0x0390 /* Current Count Register for Timer (R) */ -#define APIC_TDCR 0x03E0 /* Timer Divide Configuration Register (R/W) */ -#define APIC_EAFR 0x0400 /* extended APIC Feature register (R/W) */ -#define APIC_EACR 0x0410 /* Extended APIC Control Register (R/W) */ -#define APIC_SEOI 0x0420 /* Specific End Of Interrupt Register (W) */ -#define APIC_EXT0LVTR 0x0500 /* Extended Interrupt 0 Local Vector Table */ -#define APIC_EXT1LVTR 0x0510 /* Extended Interrupt 1 Local Vector Table */ -#define APIC_EXT2LVTR 0x0520 /* Extended Interrupt 2 Local Vector Table */ -#define APIC_EXT3LVTR 0x0530 /* Extended Interrupt 3 Local Vector Table */ - -enum -{ - APIC_MT_Fixed = 0, - APIC_MT_LowestPriority = 1, - APIC_MT_SMI = 2, - APIC_MT_RemoteRead = 3, - APIC_MT_NMI = 4, - APIC_MT_INIT = 5, - APIC_MT_Startup = 6, - APIC_MT_ExtInt = 7, -}; - -enum -{ - APIC_TGM_Edge, - APIC_TGM_Level -}; - -enum -{ - APIC_DM_Physical, - APIC_DM_Logical -}; - -enum -{ - APIC_DSH_Destination, - APIC_DSH_Self, - APIC_DSH_AllIncludingSelf, - APIC_DSH_AllExclusingSelf -}; - -enum -{ - APIC_DF_Flat = 0xFFFFFFFF, - APIC_DF_Cluster = 0x0FFFFFFF -}; - -enum -{ - TIMER_DV_DivideBy2 = 0, - TIMER_DV_DivideBy4 = 1, - TIMER_DV_DivideBy8 = 2, - TIMER_DV_DivideBy16 = 3, - TIMER_DV_DivideBy32 = 8, - TIMER_DV_DivideBy64 = 9, - TIMER_DV_DivideBy128 = 10, - TIMER_DV_DivideBy1 = 11, -}; - - -typedef union _APIC_BASE_ADRESS_REGISTER -{ - ULONG64 Long; - struct - { - ULONG64 Reserved1:8; - ULONG64 BootStrapCPUCore:1; - ULONG64 Reserved2:2; - ULONG64 Enable:1; - ULONG64 BaseAddress:40; - ULONG64 ReservedMBZ:12; - }; -} APIC_BASE_ADRESS_REGISTER; - -typedef union _APIC_SPURIOUS_INERRUPT_REGISTER -{ - ULONG Long; - struct - { - ULONG Vector:8; - ULONG SoftwareEnable:1; - ULONG FocusCPUCoreChecking:1; - ULONG ReservedMBZ:22; - }; -} APIC_SPURIOUS_INERRUPT_REGISTER; - -typedef union -{ - ULONG Long; - struct - { - ULONG Version:8; - ULONG ReservedMBZ:8; - ULONG MaxLVT:8; - ULONG ReservedMBZ1:7; - ULONG ExtRegSpacePresent:1; - }; -} APIC_VERSION_REGISTER; - -typedef union -{ - ULONG Long; - struct - { - ULONG Version:1; - ULONG SEOIEnable:1; - ULONG ExtApicIdEnable:1; - ULONG ReservedMBZ:29; - }; -} APIC_EXTENDED_CONTROL_REGISTER; - -typedef union _APIC_COMMAND_REGISTER -{ - ULONGLONG LongLong; - struct - { - ULONG Long0; - ULONG Long1; - }; - struct - { - ULONGLONG Vector:8; - ULONGLONG MessageType:3; - ULONGLONG DestinationMode:1; - ULONGLONG DeliveryStatus:1; - ULONGLONG ReservedMBZ:1; - ULONGLONG Level:1; - ULONGLONG TriggerMode:1; - ULONGLONG RemoteReadStatus:2; - ULONGLONG DestinationShortHand:2; - ULONGLONG Reserved2MBZ:36; - ULONGLONG Destination:8; - }; -} APIC_COMMAND_REGISTER; - -typedef union -{ - ULONG Long; - struct - { - ULONG Vector:8; - ULONG MessageType:3; - ULONG ReservedMBZ:1; - ULONG DeliveryStatus:1; - ULONG Reserved1MBZ:1; - ULONG RemoteIRR:1; - ULONG TriggerMode:1; - ULONG Mask:1; - ULONG TimerMode:1; - ULONG Reserved2MBZ:13; - }; -} LVT_REGISTER; - - -enum -{ - IOAPIC_IOREGSEL = 0x00, - IOAPIC_IOWIN = 0x10 -}; - -enum -{ - IOAPIC_ID = 0x00, - IOAPIC_VER = 0x01, - IOAPIC_ARB = 0x02, - IOAPIC_REDTBL = 0x10 -}; - -typedef union _IOAPIC_REDIRECTION_REGISTER -{ - ULONGLONG LongLong; - struct - { - ULONG Long0; - ULONG Long1; - }; - struct - { - ULONGLONG Vector:8; - ULONGLONG DeliveryMode:3; - ULONGLONG DestinationMode:1; - ULONGLONG DeliveryStatus:1; - ULONGLONG Polarity:1; - ULONGLONG RemoteIRR:1; - ULONGLONG TriggerMode:1; - ULONGLONG Mask:1; - ULONGLONG Reserved:39; - ULONGLONG Destination:8; - }; -} IOAPIC_REDIRECTION_REGISTER; - -FORCEINLINE -ULONG -ApicRead(ULONG Offset) -{ - return *(volatile ULONG *)(APIC_BASE + Offset); -} - -FORCEINLINE -VOID -ApicWrite(ULONG Offset, ULONG Value) -{ - *(volatile ULONG *)(APIC_BASE + Offset) = Value; -} - -VOID -NTAPI -ApicInitializeTimer(ULONG Cpu); - -VOID -NTAPI -HalInitializeProfiling(VOID); - -VOID __cdecl ApicSpuriousService(VOID); - diff --git a/hal/halx86/apic/apictimer.c b/hal/halx86/apic/apictimer.c index 5fe93056605..1a152e2d410 100644 --- a/hal/halx86/apic/apictimer.c +++ b/hal/halx86/apic/apictimer.c @@ -9,11 +9,10 @@ /* INCLUDES ******************************************************************/ #include <hal.h> +#include <apic.h> #define NDEBUG #include <debug.h> -#include "apic.h" - extern LARGE_INTEGER HalpCpuClockFrequency; /* HAL profiling variables */ diff --git a/hal/halx86/apic/halaacpi.rc b/hal/halx86/apic/halaacpi.rc new file mode 100644 index 00000000000..8d7142e80a2 --- /dev/null +++ b/hal/halx86/apic/halaacpi.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "X86 Uniprocessor Hardware Abstraction Layer" +#define REACTOS_STR_INTERNAL_NAME "halaacpi" +#define REACTOS_STR_ORIGINAL_FILENAME "halaacpi.dll" +#include <reactos/version.rc> diff --git a/hal/halx86/apic/halinit.c b/hal/halx86/apic/halinit.c index 0ade0fda11c..504f568dbb1 100644 --- a/hal/halx86/apic/halinit.c +++ b/hal/halx86/apic/halinit.c @@ -1,16 +1,16 @@ /* * PROJECT: ReactOS Hardware Abstraction Layer * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Initialize the x86 HAL + * PURPOSE: Initialize the APIC HAL * COPYRIGHT: Copyright 2011 Timo Kreuzer <timo.kreuzer(a)reactos.org> */ /* INCLUDES *****************************************************************/ #include <hal.h> +#include <apic.h> #define NDEBUG #include <debug.h> -#include "apic.h" VOID NTAPI @@ -36,7 +36,6 @@ HalpInitProcessor( /* Initialize the timer */ //ApicInitializeTimer(ProcessorNumber); - } VOID diff --git a/hal/halx86/apic/tsc.c b/hal/halx86/apic/tsc.c index a9b79eea233..ce06b2f6d8e 100644 --- a/hal/halx86/apic/tsc.c +++ b/hal/halx86/apic/tsc.c @@ -9,11 +9,10 @@ /* INCLUDES ******************************************************************/ #include <hal.h> +#include "tsc.h" #define NDEBUG #include <debug.h> -#include "tsc.h" - LARGE_INTEGER HalpCpuClockFrequency = {{INITIAL_STALL_COUNT * 1000000}}; UCHAR TscCalibrationPhase; diff --git a/hal/halx86/include/apic.h b/hal/halx86/include/apic.h index 315af0a6b3e..fe82a1425d8 100644 --- a/hal/halx86/include/apic.h +++ b/hal/halx86/include/apic.h @@ -1,253 +1,309 @@ /* - * + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Header file for APIC hal + * COPYRIGHT: Copyright 2011 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright 2021 Justin Miller <justinmiller100(a)gmail.com> */ #pragma once #ifdef _M_AMD64 -#define APIC_DEFAULT_BASE 0xfffffffffee00000ULL; + #define LOCAL_APIC_BASE 0xFFFFFFFFFFFE0000ULL + #define IOAPIC_BASE 0xFFFFFFFFFFFE1000ULL + #define APIC_SPURIOUS_VECTOR 0x3f + #define IrqlToTpr(Irql) (Irql << 4) + #define IrqlToSoftVector(Irql) ((Irql << 4)|0xf) + #define TprToIrql(Tpr) ((KIRQL)(Tpr >> 4)) + #define CLOCK2_LEVEL CLOCK_LEVEL #else -#define APIC_DEFAULT_BASE 0xFEE00000 /* Default Local APIC Base Register Address */ + #define LOCAL_APIC_BASE 0xFFFE0000 + #define IOAPIC_BASE 0xFFFE1000 + #define APIC_SPURIOUS_VECTOR 0x1f + #define IrqlToTpr(Irql) (HalpIRQLtoTPR[Irql]) + #define IrqlToSoftVector(Irql) IrqlToTpr(Irql) + #define TprToIrql(Tpr) (HalVectorToIRQL[Tpr >> 4]) #endif -/* APIC Register Address Map */ -#define APIC_ID 0x0020 /* Local APIC ID Register (R/W) */ -#define APIC_VER 0x0030 /* Local APIC Version Register (R) */ -#define APIC_TPR 0x0080 /* Task Priority Register (R/W) */ -#define APIC_APR 0x0090 /* Arbitration Priority Register (R) */ -#define APIC_PPR 0x00A0 /* Processor Priority Register (R) */ -#define APIC_EOI 0x00B0 /* EOI Register (W) */ -#define APIC_LDR 0x00D0 /* Logical Destination Register (R/W) */ -#define APIC_DFR 0x00E0 /* Destination Format Register (0-27 R, 28-31 R/W) */ -#define APIC_SIVR 0x00F0 /* Spurious Interrupt Vector Register (0-3 R, 4-9 R/W) */ -#define APIC_ISR 0x0100 /* Interrupt Service Register 0-255 (R) */ -#define APIC_TMR 0x0180 /* Trigger Mode Register 0-255 (R) */ -#define APIC_IRR 0x0200 /* Interrupt Request Register 0-255 (r) */ -#define APIC_ESR 0x0280 /* Error Status Register (R) */ -#define APIC_ICR0 0x0300 /* Interrupt Command Register 0-31 (R/W) */ -#define APIC_ICR1 0x0310 /* Interrupt Command Register 32-63 (R/W) */ -#define APIC_LVTT 0x0320 /* Local Vector Table (Timer) (R/W) */ -#define APIC_LVTTHMR 0x0330 -#define APIC_LVTPC 0x0340 /* Performance Counter LVT (R/W) */ -#define APIC_LINT0 0x0350 /* Local Vector Table (LINT0) (R/W) */ -#define APIC_LINT1 0x0360 /* Local Vector Table (LINT1) (R/W) */ -#define APIC_LVT3 0x0370 /* Local Vector Table (Error) (R/W) */ -#define APIC_ICRT 0x0380 /* Initial Count Register for Timer (R/W) */ -#define APIC_CCRT 0x0390 /* Current Count Register for Timer (R) */ -#define APIC_TDCR 0x03E0 /* Timer Divide Configuration Register (R/W) */ - -#define APIC_ID_MASK (0xF << 24) -#define GET_APIC_ID(x) (((x) & APIC_ID_MASK) >> 24) -#define GET_APIC_LOGICAL_ID(x) (((x)>>24)&0xFF) -#define APIC_VER_MASK 0xFF00FF -#define GET_APIC_VERSION(x) ((x) & 0xFF) -#define GET_APIC_MAXLVT(x) (((x) >> 16) & 0xFF) - -#define APIC_TPR_PRI 0xFF -#define APIC_TPR_INT 0xF0 -#define APIC_TPR_SUB 0xF -#define APIC_TPR_MAX 0xFF /* Maximum priority */ -#define APIC_TPR_MIN 0x20 /* Minimum priority */ - -#define APIC_LDR_MASK (0xFF << 24) - -#define APIC_SIVR_ENABLE (0x1 << 8) -#define APIC_SIVR_FOCUS (0x1 << 9) - -#define APIC_ESR_MASK (0xFE << 0) /* Error Mask */ - -#define APIC_ICR0_VECTOR (0xFF << 0) /* Vector */ -#define APIC_ICR0_DM (0x7 << 8) /* Delivery Mode */ -#define APIC_ICR0_DESTM (0x1 << 11) /* Destination Mode */ -#define APIC_ICR0_DS (0x1 << 12) /* Delivery Status */ -#define APIC_ICR0_LEVEL (0x1 << 14) /* Level */ -#define APIC_ICR0_TM (0x1 << 15) /* Trigger Mode */ -#define APIC_ICR0_DESTS (0x3 << 18) /* Destination Shorthand */ - -/* Delivery Modes */ -#define APIC_DM_FIXED (0x0 << 8) -#define APIC_DM_LOWEST (0x1 << 8) -#define APIC_DM_SMI (0x2 << 8) -#define APIC_DM_REMRD (0x3 << 8) -#define APIC_DM_NMI (0x4 << 8) -#define APIC_DM_INIT (0x5 << 8) -#define APIC_DM_STARTUP (0x6 << 8) -#define APIC_DM_EXTINT (0x7 << 8) -#define GET_APIC_DELIVERY_MODE(x) (((x) >> 8) & 0x7) -#define SET_APIC_DELIVERY_MODE(x,y) (((x) & ~0x700) | ((y) << 8)) - -/* Destination Shorthand values */ -#define APIC_ICR0_DESTS_FIELD (0x0 << 0) -#define APIC_ICR0_DESTS_SELF (0x1 << 18) -#define APIC_ICR0_DESTS_ALL (0x2 << 18) -#define APIC_ICR0_DESTS_ALL_BUT_SELF (0x3 << 18) - -#define APIC_ICR0_LEVEL_DEASSERT (0x0 << 14) /* Deassert level */ -#define APIC_ICR0_LEVEL_ASSERT (0x1 << 14) /* Assert level */ - -#define GET_APIC_DEST_FIELD(x) (((x) >> 24) & 0xFF) -#define SET_APIC_DEST_FIELD(x) (((x) & 0xFF) << 24) - -#define GET_APIC_TIMER_BASE(x) (((x) >> 18) & 0x3) -#define SET_APIC_TIMER_BASE(x) ((x) << 18) -#define APIC_TIMER_BASE_CLKIN 0x0 -#define APIC_TIMER_BASE_TMBASE 0x1 -#define APIC_TIMER_BASE_DIV 0x2 - -#define APIC_LVT_VECTOR (0xFF << 0) /* Vector */ -#define APIC_LVT_DS (0x1 << 12) /* Delivery Status */ -#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ -#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ -#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ -#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ - -#define APIC_LVT3_DM (0x7 << 8) -#define APIC_LVT3_IIPP (0x1 << 13) -#define APIC_LVT3_TM (0x1 << 15) -#define APIC_LVT3_MASKED (0x1 << 16) -#define APIC_LVT3_OS (0x1 << 17) - -#define APIC_TDCR_TMBASE (0x1 << 2) -#define APIC_TDCR_MASK 0x0F -#define APIC_TDCR_2 0x00 -#define APIC_TDCR_4 0x01 -#define APIC_TDCR_8 0x02 -#define APIC_TDCR_16 0x03 -#define APIC_TDCR_32 0x08 -#define APIC_TDCR_64 0x09 -#define APIC_TDCR_128 0x0A -#define APIC_TDCR_1 0x0B - -#define APIC_TARGET_SELF 0x100 -#define APIC_TARGET_ALL 0x200 -#define APIC_TARGET_ALL_BUT_SELF 0x300 - -#define APIC_INTEGRATED(version) (version & 0xF0) - -typedef enum { - amPIC = 0, /* IMCR and PIC compatibility mode */ - amVWIRE /* Virtual Wire compatibility mode */ -} APIC_MODE; - -#ifdef CONFIG_SMP -#define MAX_CPU 32 -#else -#define MAX_CPU 1 -#endif +/* The IMCR is supported by two read/writable or write-only I/O ports, + 22h and 23h, which receive address and data respectively. + To access the IMCR, write a value of 70h to I/O port 22h, which selects the IMCR. + Then write the data to I/O port 23h. The power-on default value is zero, + which connects the NMI and 8259 INTR lines directly to the BSP. + Writing a value of 01h forces the NMI and 8259 INTR signals to pass through the APIC. +*/ +#define IMCR_ADDRESS_PORT (PUCHAR)0x0022 +#define IMCR_DATA_PORT (PUCHAR)0x0023 +#define IMCR_SELECT 0x70 +#define IMCR_PIC_DIRECT 0x00 +#define IMCR_PIC_VIA_APIC 0x01 + +#define ZERO_VECTOR 0x00 // IRQL 00 +#define APC_VECTOR 0x3D // IRQL 01 +#define DISPATCH_VECTOR 0x41 // IRQL 02 +#define APIC_GENERIC_VECTOR 0xC1 // IRQL 27 +#define APIC_CLOCK_VECTOR 0xD1 // IRQL 28 +#define APIC_SYNCH_VECTOR 0xD1 // IRQL 28 +#define APIC_IPI_VECTOR 0xE1 // IRQL 29 +#define APIC_ERROR_VECTOR 0xE3 +#define POWERFAIL_VECTOR 0xEF // IRQL 30 +#define APIC_PROFILE_VECTOR 0xFD // IRQL 31 +#define APIC_PERF_VECTOR 0xFE +#define APIC_NMI_VECTOR 0xFF -/* - * Local APIC timer IRQ vector is on a different priority level, - * to work around the 'lost local interrupt if more than 2 IRQ - * sources per level' errata. - */ -#define LOCAL_TIMER_VECTOR 0xEF - -#define IPI_VECTOR 0xFB -#define ERROR_VECTOR 0xFE -#define SPURIOUS_VECTOR 0xFF /* Must be 0xXF */ - -/* CPU flags */ -#define CPU_USABLE 0x01 /* 1 if the CPU is usable (ie. can be used) */ -#define CPU_ENABLED 0x02 /* 1 if the CPU is enabled */ -#define CPU_BSP 0x04 /* 1 if the CPU is the bootstrap processor */ -#define CPU_TSC 0x08 /* 1 if the CPU has a time stamp counter */ - -typedef struct _CPU_INFO -{ - UCHAR Flags; /* CPU flags */ - UCHAR APICId; /* Local APIC ID */ - UCHAR APICVersion; /* Local APIC version */ -// UCHAR MaxLVT; /* Number of LVT registers */ - ULONG BusSpeed; /* BUS speed */ - ULONG CoreSpeed; /* Core speed */ - UCHAR Padding[16-12]; /* Padding to 16-byte */ -} CPU_INFO, *PCPU_INFO; - -extern ULONG CPUCount; /* Total number of CPUs */ -extern ULONG BootCPU; /* Bootstrap processor */ -extern ULONG OnlineCPUs; /* Bitmask of online CPUs */ -extern CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */ -extern PULONG APICBase; /* Virtual address of local APIC */ -extern ULONG lastregr[MAX_CPU]; /* For debugging */ -extern ULONG lastvalr[MAX_CPU]; -extern ULONG lastregw[MAX_CPU]; -extern ULONG lastvalw[MAX_CPU]; - -/* Prototypes */ -VOID APICSendIPI(ULONG Target, ULONG Mode); -VOID APICSetup(VOID); -VOID HaliInitBSP(VOID); -VOID APICSyncArbIDs(VOID); -VOID APICCalibrateTimer(ULONG CPU); -VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack); - -static __inline ULONG _APICRead(ULONG Offset) -{ - PULONG p; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - return *p; -} - -#if 0 -static __inline VOID APICWrite(ULONG Offset, - ULONG Value) +/* APIC Register Address Map */ +#define APIC_ID 0x0020 /* Local APIC ID Register (R/W) */ +#define APIC_VER 0x0030 /* Local APIC Version Register (R) */ +#define APIC_TPR 0x0080 /* Task Priority Register (R/W) */ +#define APIC_APR 0x0090 /* Arbitration Priority Register (R) */ +#define APIC_PPR 0x00A0 /* Processor Priority Register (R) */ +#define APIC_EOI 0x00B0 /* EOI Register (W) */ +#define APIC_RRR 0x00C0 /* Remote Read Register () */ +#define APIC_LDR 0x00D0 /* Logical Destination Register (R/W) */ +#define APIC_DFR 0x00E0 /* Destination Format Register (0-27 R, 28-31 R/W) */ +#define APIC_SIVR 0x00F0 /* Spurious Interrupt Vector Register (0-3 R, 4-9 R/W) */ +#define APIC_ISR 0x0100 /* Interrupt Service Register 0-255 (R) */ +#define APIC_TMR 0x0180 /* Trigger Mode Register 0-255 (R) */ +#define APIC_IRR 0x0200 /* Interrupt Request Register 0-255 (r) */ +#define APIC_ESR 0x0280 /* Error Status Register (R) */ +#define APIC_ICR0 0x0300 /* Interrupt Command Register 0-31 (R/W) */ +#define APIC_ICR1 0x0310 /* Interrupt Command Register 32-63 (R/W) */ +#define APIC_TMRLVTR 0x0320 /* Timer Local Vector Table (R/W) */ +#define APIC_THRMLVTR 0x0330 /* Thermal Local Vector Table */ +#define APIC_PCLVTR 0x0340 /* Performance Counter Local Vector Table (R/W) */ +#define APIC_LINT0 0x0350 /* LINT0 Local Vector Table (R/W) */ +#define APIC_LINT1 0x0360 /* LINT1 Local Vector Table (R/W) */ +#define APIC_ERRLVTR 0x0370 /* Error Local Vector Table (R/W) */ +#define APIC_TICR 0x0380 /* Initial Count Register for Timer (R/W) */ +#define APIC_TCCR 0x0390 /* Current Count Register for Timer (R) */ +#define APIC_TDCR 0x03E0 /* Timer Divide Configuration Register (R/W) */ +#define APIC_EAFR 0x0400 /* extended APIC Feature register (R/W) */ +#define APIC_EACR 0x0410 /* Extended APIC Control Register (R/W) */ +#define APIC_SEOI 0x0420 /* Specific End Of Interrupt Register (W) */ +#define APIC_EXT0LVTR 0x0500 /* Extended Interrupt 0 Local Vector Table */ +#define APIC_EXT1LVTR 0x0510 /* Extended Interrupt 1 Local Vector Table */ +#define APIC_EXT2LVTR 0x0520 /* Extended Interrupt 2 Local Vector Table */ +#define APIC_EXT3LVTR 0x0530 /* Extended Interrupt 3 Local Vector Table */ + +#define MSR_APIC_BASE 0x0000001B +#define IOAPIC_PHYS_BASE 0xFEC00000 +#define APIC_CLOCK_INDEX 8 +#define ApicLogicalId(Cpu) ((UCHAR)(1<< Cpu)) + +/* Message Type */ +enum { - PULONG p; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - - *p = Value; -} -#else -static __inline VOID APICWrite(ULONG Offset, - ULONG Value) + APIC_MT_Fixed = 0, + APIC_MT_LowestPriority = 1, + APIC_MT_SMI = 2, + APIC_MT_RemoteRead = 3, + APIC_MT_NMI = 4, + APIC_MT_INIT = 5, + APIC_MT_Startup = 6, + APIC_MT_ExtInt = 7, +}; + +/* Trigger Mode */ +enum { - PULONG p; - ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; - - lastregw[CPU] = Offset; - lastvalw[CPU] = Value; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); + APIC_TGM_Edge, + APIC_TGM_Level +}; - *p = Value; -} -#endif - -#if 0 -static __inline ULONG APICRead(ULONG Offset) +/* Delivery Mode */ +enum { - PULONG p; + APIC_DM_Physical, + APIC_DM_Logical +}; - p = (PULONG)((ULONG_PTR)APICBase + Offset); - return *p; -} -#else -static __inline ULONG APICRead(ULONG Offset) +/* Destination Short Hand */ +enum { - PULONG p; - ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; - - lastregr[CPU] = Offset; - lastvalr[CPU] = 0; + APIC_DSH_Destination, + APIC_DSH_Self, + APIC_DSH_AllIncludingSelf, + APIC_DSH_AllExclusingSelf +}; + +/* Write Constants */ +enum +{ + APIC_DF_Flat = 0xFFFFFFFF, + APIC_DF_Cluster = 0x0FFFFFFF +}; - p = (PULONG)((ULONG_PTR)APICBase + Offset); +/* Timer Constants */ +enum +{ + TIMER_DV_DivideBy2 = 0, + TIMER_DV_DivideBy4 = 1, + TIMER_DV_DivideBy8 = 2, + TIMER_DV_DivideBy16 = 3, + TIMER_DV_DivideBy32 = 8, + TIMER_DV_DivideBy64 = 9, + TIMER_DV_DivideBy128 = 10, + TIMER_DV_DivideBy1 = 11, +}; + +#include <pshpack1.h> +typedef union _APIC_BASE_ADRESS_REGISTER +{ + UINT64 LongLong; + struct + { + UINT64 Reserved1:8; + UINT64 BootStrapCPUCore:1; + UINT64 Reserved2:2; + UINT64 Enable:1; + UINT64 BaseAddress:40; + UINT64 ReservedMBZ:12; + }; +} APIC_BASE_ADRESS_REGISTER; + +typedef union _APIC_SPURIOUS_INERRUPT_REGISTER +{ + UINT32 Long; + struct + { + UINT32 Vector:8; + UINT32 SoftwareEnable:1; + UINT32 FocusCPUCoreChecking:1; + UINT32 ReservedMBZ:22; + }; +} APIC_SPURIOUS_INERRUPT_REGISTER; + +typedef union _APIC_VERSION_REGISTER +{ + UINT32 Long; + struct + { + UINT32 Version:8; + UINT32 ReservedMBZ:8; + UINT32 MaxLVT:8; + UINT32 ReservedMBZ1:7; + UINT32 ExtRegSpacePresent:1; + }; +} APIC_VERSION_REGISTER; + +typedef union _APIC_EXTENDED_CONTROL_REGISTER +{ + UINT32 Long; + struct + { + UINT32 Version:1; + UINT32 SEOIEnable:1; + UINT32 ExtApicIdEnable:1; + UINT32 ReservedMBZ:29; + }; +} APIC_EXTENDED_CONTROL_REGISTER; + +typedef union _APIC_COMMAND_REGISTER +{ + UINT64 LongLong; + struct + { + UINT32 Long0; + UINT32 Long1; + }; + struct + { + UINT64 Vector:8; + UINT64 MessageType:3; + UINT64 DestinationMode:1; + UINT64 DeliveryStatus:1; + UINT64 ReservedMBZ:1; + UINT64 Level:1; + UINT64 TriggerMode:1; + UINT64 RemoteReadStatus:2; + UINT64 DestinationShortHand:2; + UINT64 Reserved2MBZ:36; + UINT64 Destination:8; + }; +} APIC_COMMAND_REGISTER; + +typedef union _LVT_REGISTER +{ + UINT32 Long; + struct + { + UINT32 Vector:8; + UINT32 MessageType:3; + UINT32 ReservedMBZ:1; + UINT32 DeliveryStatus:1; + UINT32 Reserved1MBZ:1; + UINT32 RemoteIRR:1; + UINT32 TriggerMode:1; + UINT32 Mask:1; + UINT32 TimerMode:1; + UINT32 Reserved2MBZ:13; + }; +} LVT_REGISTER; + +/* IOAPIC offsets */ +enum +{ + IOAPIC_IOREGSEL = 0x00, + IOAPIC_IOWIN = 0x10 +}; - lastvalr[CPU] = *p; - return lastvalr[CPU]; -} -#endif +/* IOAPIC Constants */ +enum +{ + IOAPIC_ID = 0x00, + IOAPIC_VER = 0x01, + IOAPIC_ARB = 0x02, + IOAPIC_REDTBL = 0x10 +}; -static __inline ULONG ThisCPU(VOID) +typedef union _IOAPIC_REDIRECTION_REGISTER { - return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24; + UINT64 LongLong; + struct + { + UINT32 Long0; + UINT32 Long1; + }; + struct + { + UINT64 Vector:8; + UINT64 DeliveryMode:3; + UINT64 DestinationMode:1; + UINT64 DeliveryStatus:1; + UINT64 Polarity:1; + UINT64 RemoteIRR:1; + UINT64 TriggerMode:1; + UINT64 Mask:1; + UINT64 Reserved:39; + UINT64 Destination:8; + }; +} IOAPIC_REDIRECTION_REGISTER; +#include <poppack.h> + +FORCEINLINE +ULONG +ApicRead(ULONG Offset) +{ + return *(volatile ULONG *)(APIC_BASE + Offset); } -static __inline VOID APICSendEOI(VOID) +FORCEINLINE +VOID +ApicWrite(ULONG Offset, ULONG Value) { - // Send the EOI - APICWrite(APIC_EOI, 0); + *(volatile ULONG *)(APIC_BASE + Offset) = Value; } -/* EOF */ +VOID +NTAPI +ApicInitializeTimer(ULONG Cpu); + +VOID +NTAPI +HalInitializeProfiling(VOID); + +VOID +NTAPI +HalpInitApicInfo(IN PLOADER_PARAMETER_BLOCK KeLoaderBlock); + +VOID __cdecl ApicSpuriousService(VOID); diff --git a/hal/halx86/smp/halmacpi.rc b/hal/halx86/smp/halmacpi.rc new file mode 100644 index 00000000000..883ed5cdbad --- /dev/null +++ b/hal/halx86/smp/halmacpi.rc @@ -0,0 +1,9 @@ +#define REACTOS_VERSION_DLL +#ifdef _M_AMD64 +#define REACTOS_STR_FILE_DESCRIPTION "X64 Multiprocessor Hardware Abstraction Layer" +#else +#define REACTOS_STR_FILE_DESCRIPTION "X86 Multiprocessor Hardware Abstraction Layer" +#endif +#define REACTOS_STR_INTERNAL_NAME "halmacpi" +#define REACTOS_STR_ORIGINAL_FILENAME "halmacpi.dll" +#include <reactos/version.rc>

3 years, 7 months

[reactos] 01/01: [GITHUB] Use full paths on build-linux, as RosBE.sh overwrites them

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=239266640f9f67de6380a… commit 239266640f9f67de6380a1198faa8587fe787b49 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue May 4 01:32:21 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue May 4 01:32:21 2021 +0300 [GITHUB] Use full paths on build-linux, as RosBE.sh overwrites them Addendum to 167c60a5c8c20cb0e58c78ff1449e5c220208c16 and 823ddc3d82b8a6d035c699d9366cf95cc7f94f8f --- .github/workflows/build.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d835a6db83..cade6ce5644 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,13 +53,11 @@ jobs: echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV echo "CCACHE_COMPILERCHECK=string:${{hashfiles('./build_rosbe_ci.sh', './RosBE-CI/git-commit')}}" >> $GITHUB_ENV - name: Configure - run: echo 'cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} + run: echo 'cmake -S ${{github.workspace}}/src -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} - name: Build - working-directory: ${{github.workspace}}/build - run: echo 'cmake --build .' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} + run: echo 'cmake --build ${{github.workspace}}/build' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} - name: Generate ISOs - working-directory: ${{github.workspace}}/build - run: echo 'cmake --build . --target bootcd --target livecd' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} + run: echo 'cmake --build ${{github.workspace}}/build --target bootcd --target livecd' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} - name: Print ccache statistics run: ccache -s - name: Upload bootcd

3 years, 7 months

[reactos] 01/01: [GITHUB] Remove working-directory for configure

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=823ddc3d82b8a6d035c69… commit 823ddc3d82b8a6d035c699d9366cf95cc7f94f8f Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue May 4 01:21:40 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue May 4 01:21:40 2021 +0300 [GITHUB] Remove working-directory for configure Addendum to 167c60a5c8c20cb0e58c78ff1449e5c220208c16 --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 95a61c6adc6..2d835a6db83 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,7 +118,6 @@ jobs: with: path: src - name: Configure - working-directory: ${{github.workspace}}\build run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=${{matrix.compiler == 'clang-cl'}} - name: Build working-directory: ${{github.workspace}}\build

3 years, 7 months

[reactos] 01/01: [GITHUB] Use cmake's -S and -B options explicitly

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=167c60a5c8c20cb0e58c7… commit 167c60a5c8c20cb0e58c78ff1449e5c220208c16 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue May 4 01:10:22 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue May 4 01:10:22 2021 +0300 [GITHUB] Use cmake's -S and -B options explicitly --- .github/workflows/build.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15e8a156f97..95a61c6adc6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,11 +52,8 @@ jobs: echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV echo "CCACHE_COMPILERCHECK=string:${{hashfiles('./build_rosbe_ci.sh', './RosBE-CI/git-commit')}}" >> $GITHUB_ENV - - name: Create Build directory - run: mkdir build - name: Configure - working-directory: ${{github.workspace}}/build - run: echo 'cmake ${{github.workspace}}/src -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} + run: echo 'cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} - name: Build working-directory: ${{github.workspace}}/build run: echo 'cmake --build .' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}} @@ -120,11 +117,9 @@ jobs: uses: actions/checkout@v2 with: path: src - - name: Create Build directory - run: mkdir build - name: Configure working-directory: ${{github.workspace}}\build - run: cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=${{matrix.compiler == 'clang-cl'}} ${{github.workspace}}\src + run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=${{matrix.compiler == 'clang-cl'}} - name: Build working-directory: ${{github.workspace}}\build run: cmake --build .

3 years, 7 months

[reactos] 17/17: [GITHUB] Add clang-cl amd64 build to CI

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e9cef3f216ec55b5a819a… commit e9cef3f216ec55b5a819a2046807f2c72b7fc625 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon May 3 15:48:53 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [GITHUB] Add clang-cl amd64 build to CI As before, use a matrix for Ninja+Msvc build --- .github/workflows/build.yml | 122 ++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 90 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31af335b11a..15e8a156f97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,116 +76,58 @@ jobs: name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} path: build/livecd.iso - build-clang-cl-i386: - name: Clang-CL (i386) + build-msvc: + strategy: + matrix: + compiler: [msvc, clang-cl] + arch: [i386, amd64] + fail-fast: false runs-on: windows-latest steps: - - name: Install packages + - name: Install ninja + run: choco install -y ninja + - name: Install LLVM (x86) + if: ${{ (matrix.compiler == 'clang-cl') && (matrix.arch == 'i386') }} run: | - choco install ninja -y choco install --x86 -y llvm - - name: Install Flex and Bison + echo "LLVM_PATH=${env:PROGRAMFILES(X86)}\llvm\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Install LLVM (amd64) + if: ${{ (matrix.compiler == 'clang-cl') && (matrix.arch == 'amd64') }} run: | - curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z - 7z x flexbison.7z -O${{github.workspace}}\bin - echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - - name: Add CL to PATH - uses: ilammy/msvc-dev-cmd@v1 - with: - arch: amd64_x86 - - uses: actions/checkout@v2 - with: - path: src - - name: Configure - run: | - mkdir build - cd build - $env:PATH = "${env:PROGRAMFILES(X86)}\llvm\bin;$env:PATH" - cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=1 ${{github.workspace}}\src - - name: Build - working-directory: ${{github.workspace}}\build - run: cmake --build . - - name: Generate ISOs - working-directory: ${{github.workspace}}\build - run: | - cmake --build . --target bootcd - cmake --build . --target livecd - - build-msvc-i386: - name: MSVC (i386) - runs-on: windows-latest - steps: - - name: Install packages - run: choco install ninja -y - - name: Install Flex and Bison + choco install -y llvm + echo "LLVM_PATH=${env:PROGRAMFILES}\llvm\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Install Flex & Bison run: | curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z 7z x flexbison.7z -O${{github.workspace}}\bin echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - - name: Add CL to PATH + - name: Activate VS cmd (x86) + if: ${{ matrix.arch == 'i386' }} uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64_x86 - - uses: actions/checkout@v2 - with: - path: src - - name: Configure - run: | - mkdir build - cd build - cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src - - name: Build - working-directory: ${{github.workspace}}\build - run: cmake --build . - - name: Generate ISOs - working-directory: ${{github.workspace}}\build - run: | - cmake --build . --target bootcd - cmake --build . --target livecd - - name: Upload bootcd - uses: actions/upload-artifact@v2 - with: - name: reactos-msvc-i386-${{github.sha}} - path: build/bootcd.iso - - name: Upload livecd - uses: actions/upload-artifact@v2 - with: - name: reactos-msvc-i386-${{github.sha}} - path: build/livecd.iso - - build-msvc-amd64: - name: MSVC (amd64) - runs-on: windows-latest - steps: - - name: Install packages - run: choco install ninja -y - - name: Install Flex and Bison - run: | - curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z - 7z x flexbison.7z -O${{github.workspace}}\bin - echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - - name: Add CL to PATH + - name: Activate VS cmd (amd64) + if: ${{ matrix.arch == 'amd64' }} uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64 - - uses: actions/checkout@v2 + - name: Add LLVM to PATH + if: ${{ matrix.compiler == 'clang-cl' }} + run: echo "${env:LLVM_PATH}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Source checkout + uses: actions/checkout@v2 with: path: src + - name: Create Build directory + run: mkdir build - name: Configure - run: | - mkdir build - cd build - cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=amd64 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src + working-directory: ${{github.workspace}}\build + run: cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=${{matrix.compiler == 'clang-cl'}} ${{github.workspace}}\src - name: Build working-directory: ${{github.workspace}}\build - run: | - cmake --build . + run: cmake --build . - name: Generate ISOs working-directory: ${{github.workspace}}\build run: | @@ -194,12 +136,12 @@ jobs: - name: Upload bootcd uses: actions/upload-artifact@v2 with: - name: reactos-msvc-amd64-${{github.sha}} + name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} path: build/bootcd.iso - name: Upload livecd uses: actions/upload-artifact@v2 with: - name: reactos-msvc-amd64-${{github.sha}} + name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{github.sha}} path: build/livecd.iso build-msbuild-i386:

3 years, 7 months

[reactos] 16/17: [FDEBUG] Use VK_ identifiers with VIRTKEY

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc92234ea406812a16236… commit bc92234ea406812a16236859256fcde29a4f6bec Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon May 3 15:47:56 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [FDEBUG] Use VK_ identifiers with VIRTKEY --- boot/freeldr/fdebug/lang/bg-BG.rc | 4 ++-- boot/freeldr/fdebug/lang/cs-CZ.rc | 4 ++-- boot/freeldr/fdebug/lang/de-DE.rc | 4 ++-- boot/freeldr/fdebug/lang/el-GR.rc | 4 ++-- boot/freeldr/fdebug/lang/en-US.rc | 4 ++-- boot/freeldr/fdebug/lang/es-ES.rc | 4 ++-- boot/freeldr/fdebug/lang/fr-FR.rc | 4 ++-- boot/freeldr/fdebug/lang/hu-HU.rc | 4 ++-- boot/freeldr/fdebug/lang/id-ID.rc | 4 ++-- boot/freeldr/fdebug/lang/it-IT.rc | 4 ++-- boot/freeldr/fdebug/lang/ja-JP.rc | 4 ++-- boot/freeldr/fdebug/lang/no-NO.rc | 4 ++-- boot/freeldr/fdebug/lang/pl-PL.rc | 4 ++-- boot/freeldr/fdebug/lang/ro-RO.rc | 6 +++--- boot/freeldr/fdebug/lang/ru-RU.rc | 4 ++-- boot/freeldr/fdebug/lang/sk-SK.rc | 4 ++-- boot/freeldr/fdebug/lang/sq-AL.rc | 4 ++-- boot/freeldr/fdebug/lang/tr-TR.rc | 4 ++-- boot/freeldr/fdebug/lang/uk-UA.rc | 4 ++-- boot/freeldr/fdebug/lang/zh-CN.rc | 4 ++-- boot/freeldr/fdebug/lang/zh-TW.rc | 4 ++-- 21 files changed, 43 insertions(+), 43 deletions(-) diff --git a/boot/freeldr/fdebug/lang/bg-BG.rc b/boot/freeldr/fdebug/lang/bg-BG.rc index 08903cf64ea..e68ed38f707 100644 --- a/boot/freeldr/fdebug/lang/bg-BG.rc +++ b/boot/freeldr/fdebug/lang/bg-BG.rc @@ -26,8 +26,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/cs-CZ.rc b/boot/freeldr/fdebug/lang/cs-CZ.rc index def85dcffbf..8681e1323f8 100644 --- a/boot/freeldr/fdebug/lang/cs-CZ.rc +++ b/boot/freeldr/fdebug/lang/cs-CZ.rc @@ -31,8 +31,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/de-DE.rc b/boot/freeldr/fdebug/lang/de-DE.rc index 0dbd1af30cd..ef134309867 100644 --- a/boot/freeldr/fdebug/lang/de-DE.rc +++ b/boot/freeldr/fdebug/lang/de-DE.rc @@ -28,8 +28,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/el-GR.rc b/boot/freeldr/fdebug/lang/el-GR.rc index 837a619aae6..3ce3e6e5c7c 100644 --- a/boot/freeldr/fdebug/lang/el-GR.rc +++ b/boot/freeldr/fdebug/lang/el-GR.rc @@ -26,8 +26,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/en-US.rc b/boot/freeldr/fdebug/lang/en-US.rc index f140455efcd..c4ee6167dd7 100644 --- a/boot/freeldr/fdebug/lang/en-US.rc +++ b/boot/freeldr/fdebug/lang/en-US.rc @@ -26,8 +26,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/es-ES.rc b/boot/freeldr/fdebug/lang/es-ES.rc index 7025ebb40ac..84f6869171f 100644 --- a/boot/freeldr/fdebug/lang/es-ES.rc +++ b/boot/freeldr/fdebug/lang/es-ES.rc @@ -28,8 +28,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/fr-FR.rc b/boot/freeldr/fdebug/lang/fr-FR.rc index 3e1eb92409a..223c7638f85 100644 --- a/boot/freeldr/fdebug/lang/fr-FR.rc +++ b/boot/freeldr/fdebug/lang/fr-FR.rc @@ -26,8 +26,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/hu-HU.rc b/boot/freeldr/fdebug/lang/hu-HU.rc index 7dd7b48da0f..22cfb17aea8 100644 --- a/boot/freeldr/fdebug/lang/hu-HU.rc +++ b/boot/freeldr/fdebug/lang/hu-HU.rc @@ -28,8 +28,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/id-ID.rc b/boot/freeldr/fdebug/lang/id-ID.rc index 2b5452bd398..eaed3817579 100644 --- a/boot/freeldr/fdebug/lang/id-ID.rc +++ b/boot/freeldr/fdebug/lang/id-ID.rc @@ -28,8 +28,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/it-IT.rc b/boot/freeldr/fdebug/lang/it-IT.rc index 2c6f0d66eed..19e98621132 100644 --- a/boot/freeldr/fdebug/lang/it-IT.rc +++ b/boot/freeldr/fdebug/lang/it-IT.rc @@ -28,8 +28,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/ja-JP.rc b/boot/freeldr/fdebug/lang/ja-JP.rc index 3970415a3eb..1ed66b3dab2 100644 --- a/boot/freeldr/fdebug/lang/ja-JP.rc +++ b/boot/freeldr/fdebug/lang/ja-JP.rc @@ -26,8 +26,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/no-NO.rc b/boot/freeldr/fdebug/lang/no-NO.rc index 09bdda619d6..60561c02b32 100644 --- a/boot/freeldr/fdebug/lang/no-NO.rc +++ b/boot/freeldr/fdebug/lang/no-NO.rc @@ -26,8 +26,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/pl-PL.rc b/boot/freeldr/fdebug/lang/pl-PL.rc index 7a3af80d959..f2604db1d0c 100644 --- a/boot/freeldr/fdebug/lang/pl-PL.rc +++ b/boot/freeldr/fdebug/lang/pl-PL.rc @@ -28,8 +28,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/ro-RO.rc b/boot/freeldr/fdebug/lang/ro-RO.rc index 522d9535a78..a9a13a2e1e4 100644 --- a/boot/freeldr/fdebug/lang/ro-RO.rc +++ b/boot/freeldr/fdebug/lang/ro-RO.rc @@ -28,8 +28,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ @@ -40,7 +40,7 @@ CAPTION "Despre depanatorul FreeLoader" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Depanatorul FreeLoader v1.0\nDrept de autor (C) 2003\nde Brian Palmer (brianp(a)reactos.org)", IDC_STATIC, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 53, 28, 122, 26 - DEFPUSHBUTTON "Î&nchide", IDOK, 189, 44, 14, WS_GROUP + DEFPUSHBUTTON "Î&nchide", IDOK, 189, 44, 50, 14, WS_GROUP ICON IDI_FDEBUG, IDC_STATIC, 19, 30, 20, 20 EDITTEXT IDC_LICENSE_EDIT, 53, 63, 174, 107, ES_MULTILINE | ES_READONLY | WS_VSCROLL END diff --git a/boot/freeldr/fdebug/lang/ru-RU.rc b/boot/freeldr/fdebug/lang/ru-RU.rc index 837d31b09ca..2a10925579c 100644 --- a/boot/freeldr/fdebug/lang/ru-RU.rc +++ b/boot/freeldr/fdebug/lang/ru-RU.rc @@ -28,8 +28,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/sk-SK.rc b/boot/freeldr/fdebug/lang/sk-SK.rc index fa6b5dc4df8..f89e4a5d6ae 100644 --- a/boot/freeldr/fdebug/lang/sk-SK.rc +++ b/boot/freeldr/fdebug/lang/sk-SK.rc @@ -28,8 +28,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/sq-AL.rc b/boot/freeldr/fdebug/lang/sq-AL.rc index 2ec34f9e056..ef410488e30 100644 --- a/boot/freeldr/fdebug/lang/sq-AL.rc +++ b/boot/freeldr/fdebug/lang/sq-AL.rc @@ -30,8 +30,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/tr-TR.rc b/boot/freeldr/fdebug/lang/tr-TR.rc index e569a489395..c11bf81a053 100644 --- a/boot/freeldr/fdebug/lang/tr-TR.rc +++ b/boot/freeldr/fdebug/lang/tr-TR.rc @@ -28,8 +28,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/uk-UA.rc b/boot/freeldr/fdebug/lang/uk-UA.rc index c19433d7722..d1ce076148d 100644 --- a/boot/freeldr/fdebug/lang/uk-UA.rc +++ b/boot/freeldr/fdebug/lang/uk-UA.rc @@ -26,8 +26,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/zh-CN.rc b/boot/freeldr/fdebug/lang/zh-CN.rc index ea5794f8e98..444942b3eb6 100644 --- a/boot/freeldr/fdebug/lang/zh-CN.rc +++ b/boot/freeldr/fdebug/lang/zh-CN.rc @@ -29,8 +29,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */ diff --git a/boot/freeldr/fdebug/lang/zh-TW.rc b/boot/freeldr/fdebug/lang/zh-TW.rc index 41603ca9450..82d612355ab 100644 --- a/boot/freeldr/fdebug/lang/zh-TW.rc +++ b/boot/freeldr/fdebug/lang/zh-TW.rc @@ -28,8 +28,8 @@ END /* Accelerators */ IDC_FDEBUG ACCELERATORS BEGIN - 63, IDM_ABOUT, ASCII, ALT // "?" - 47, IDM_ABOUT, ASCII, ALT // "/" + VK_OEM_2, IDM_ABOUT, VIRTKEY, ALT //FIXME: ?/ US keyboard only + VK_DIVIDE, IDM_ABOUT, VIRTKEY, ALT END /* Dialogs */

3 years, 7 months

[reactos] 15/17: [PSEH] Fix use of dummy implementation in C++

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d312ef234bffd4a073234… commit d312ef234bffd4a0732345fa930094b233d2feb6 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon May 3 16:09:34 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon May 3 22:00:57 2021 +0200 [PSEH] Fix use of dummy implementation in C++ --- sdk/lib/pseh/include/pseh/pseh2.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/lib/pseh/include/pseh/pseh2.h b/sdk/lib/pseh/include/pseh/pseh2.h index ecaaa72ee87..407557f2152 100644 --- a/sdk/lib/pseh/include/pseh/pseh2.h +++ b/sdk/lib/pseh/include/pseh/pseh2.h @@ -43,8 +43,15 @@ #elif defined(_USE_DUMMY_PSEH) || defined (__arm__) || defined(_M_AMD64) +#ifdef __cplusplus +extern"C" +{ +#endif extern int _SEH2_Volatile0; extern int _SEH2_VolatileExceptionCode; +#ifdef __cplusplus +} // extern "C" +#endif #define _SEH2_TRY \ _Pragma("GCC diagnostic push") \

3 years, 7 months

← Newer
1
...
12
13
14
15
16
17
18
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