Ros-diffs November 2022

ros-diffs@reactos.org

26 participants
175 discussions

[reactos] 01/01: [CPL:INTL] Use Japanese package for Far-East files (#4834)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94c8f271c98a793ea4f5a… commit 94c8f271c98a793ea4f5a5e166e65215b93a9982 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 4 21:48:07 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 4 21:48:07 2022 +0900 [CPL:INTL] Use Japanese package for Far-East files (#4834) Implement IDC_INST_FILES_FOR_ASIAN checkbox action. It will install/uninstall "ReactOS JPN Package" in Japanese ReactOS. JIRA issue: CORE-12748 --- dll/cpl/intl/CMakeLists.txt | 2 +- dll/cpl/intl/languages.c | 100 ++++++++++++++++++++++++++++++++------------ 2 files changed, 74 insertions(+), 28 deletions(-) diff --git a/dll/cpl/intl/CMakeLists.txt b/dll/cpl/intl/CMakeLists.txt index a2b6723e250..e2b1c3f3077 100644 --- a/dll/cpl/intl/CMakeLists.txt +++ b/dll/cpl/intl/CMakeLists.txt @@ -24,6 +24,6 @@ add_library(intl MODULE ${CMAKE_CURRENT_BINARY_DIR}/intl.def) set_module_type(intl cpl UNICODE) -add_importlibs(intl user32 comctl32 advapi32 setupapi shell32 msvcrt kernel32 ntdll) +add_importlibs(intl user32 comctl32 advapi32 setupapi shlwapi shell32 msvcrt kernel32 ntdll) add_pch(intl intl.h SOURCE) add_cd_file(TARGET intl DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/intl/languages.c b/dll/cpl/intl/languages.c index c4507b75643..548ad727370 100644 --- a/dll/cpl/intl/languages.c +++ b/dll/cpl/intl/languages.c @@ -1,15 +1,46 @@ #include "intl.h" #include <shellapi.h> +#include <shlobj.h> +#include <shlwapi.h> #include <strsafe.h> -/* Is there any Japanese input method? */ -BOOL HasJapaneseIME(VOID) +/* What is the uninstallation command line of "ReactOS JPN Package"? */ +BOOL GetJapaneseUninstallCmdLine(HWND hwnd, LPWSTR pszCmdLine, SIZE_T cchCmdLine) { - WCHAR szImePath[MAX_PATH]; - GetSystemDirectoryW(szImePath, _countof(szImePath)); - StringCchCatW(szImePath, _countof(szImePath), L"\\mzimeja.ime"); - return GetFileAttributesW(szImePath) != INVALID_FILE_ATTRIBUTES; + HKEY hKey; + LONG error; + DWORD dwSize; + + pszCmdLine[0] = UNICODE_NULL; + + error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + L"{80F03D6E-0549-4202-BE81-FF583F56A7A8}_is1", + 0, + KEY_READ, + &hKey); + if (error != ERROR_SUCCESS) + return FALSE; + + dwSize = cchCmdLine * sizeof(WCHAR); + error = RegQueryValueExW(hKey, L"UninstallString", NULL, NULL, (LPBYTE)pszCmdLine, &dwSize); + if (error != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + pszCmdLine[cchCmdLine - 1] = UNICODE_NULL; + RegCloseKey(hKey); + return TRUE; +} + +/* Is there any installed "ReactOS JPN Package"? */ +BOOL HasJapanesePackage(HWND hwnd) +{ + WCHAR szPath[MAX_PATH]; + return GetJapaneseUninstallCmdLine(hwnd, szPath, _countof(szPath)); } /* Property page dialog callback */ @@ -40,9 +71,8 @@ LanguagesPageProc(HWND hwndDlg, switch (PRIMARYLANGID(GetUserDefaultLangID())) { case LANG_JAPANESE: - if (HasJapaneseIME()) + if (HasJapanesePackage(hwndDlg)) { - EnableWindow(GetDlgItem(hwndDlg, IDC_INST_FILES_FOR_ASIAN), FALSE); CheckDlgButton(hwndDlg, IDC_INST_FILES_FOR_ASIAN, BST_CHECKED); } break; @@ -82,32 +112,48 @@ LanguagesPageProc(HWND hwndDlg, break; case WM_NOTIFY: - if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) /* Apply changes */ { - /* Apply changes */ - if (IsDlgButtonChecked(hwndDlg, IDC_INST_FILES_FOR_ASIAN) == BST_CHECKED) + /* EAST ASIAN specific */ + switch (PRIMARYLANGID(GetUserDefaultLangID())) { - /* EAST ASIAN specific */ - switch (PRIMARYLANGID(GetUserDefaultLangID())) - { - case LANG_JAPANESE: - if (HasJapaneseIME()) + case LANG_JAPANESE: + if (IsDlgButtonChecked(hwndDlg, IDC_INST_FILES_FOR_ASIAN) == BST_CHECKED) + { + if (!HasJapanesePackage(hwndDlg)) { - EnableWindow(GetDlgItem(hwndDlg, IDC_INST_FILES_FOR_ASIAN), FALSE); - CheckDlgButton(hwndDlg, IDC_INST_FILES_FOR_ASIAN, BST_CHECKED); + /* Install now */ + ShellExecuteW(hwndDlg, NULL, L"rapps.exe", L"/INSTALL jpn-package", + NULL, SW_SHOWNORMAL); } - else + } + else + { + WCHAR szUninstall[MAX_PATH]; + if (GetJapaneseUninstallCmdLine(hwndDlg, szUninstall, _countof(szUninstall))) { - ShellExecuteW(hwndDlg, NULL, L"rapps.exe", L"/INSTALL mzimeja", - NULL, SW_SHOWNORMAL); + /* Go to arguments of command line */ + PWCHAR pchArgs = PathGetArgsW(szUninstall); + if (pchArgs && *pchArgs) + { + --pchArgs; + /* pchArgs pointer is inside szUninstall, + * so we have to split both strings */ + *pchArgs = UNICODE_NULL; + ++pchArgs; + } + PathUnquoteSpacesW(szUninstall); + + /* Uninstall now */ + ShellExecuteW(hwndDlg, NULL, szUninstall, pchArgs, NULL, SW_SHOWNORMAL); } - break; + } + break; - case LANG_CHINESE: /* Not supported yet */ - case LANG_KOREAN: /* Not supported yet */ - default: - break; - } + case LANG_CHINESE: /* Not supported yet */ + case LANG_KOREAN: /* Not supported yet */ + default: + break; } PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg);

1 year, 10 months

[reactos] 01/01: [SHELL32][INCLUDE] Fix PathResolve for double-backslash (#4833)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a1a8a8303e941586dd2c… commit 1a1a8a8303e941586dd2c37d943245ffcdfe6f28 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 4 21:44:46 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 4 21:44:46 2022 +0900 [SHELL32][INCLUDE] Fix PathResolve for double-backslash (#4833) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> Fix shell32!PathResolve and shell32!PathQualifyExW functions for double-backslash. However it doesn't fix CORE-15204. CORE-18080, CORE-15204 --- dll/win32/shell32/wine/shellpath.c | 328 ++++++++++++++++++++++-------------- sdk/include/reactos/shlwapi_undoc.h | 1 + 2 files changed, 205 insertions(+), 124 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 70409260e69..b39f7da7c49 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -3,7 +3,7 @@ * * Copyright 1998, 1999, 2000 Juergen Schmied * Copyright 2004 Juan Lang - * Copyright 2018-2021 Katayama Hirofumi MZ + * Copyright 2018-2022 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,8 +57,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); static const BOOL is_win64 = sizeof(void *) > sizeof(int); -#ifdef __REACTOS__ - /* FIXME: Remove this */ typedef enum _NT_PRODUCT_TYPE { @@ -105,15 +103,16 @@ DoGetProductType(PNT_PRODUCT_TYPE ProductType) return TRUE; } -#endif // __REACTOS__ - /* ########## Combining and Constructing paths ########## */ -/* @implemented */ static BOOL WINAPI -PathSearchOnExtensionsW(LPWSTR pszPath, LPCWSTR *ppszDirs, BOOL bDoSearch, DWORD dwWhich) +PathSearchOnExtensionsW( + _Inout_ LPWSTR pszPath, + _In_opt_ LPCWSTR *ppszDirs, + _In_ BOOL bDoSearch, + _In_ DWORD dwWhich) { if (*PathFindExtensionW(pszPath) != 0) return FALSE; @@ -124,15 +123,13 @@ PathSearchOnExtensionsW(LPWSTR pszPath, LPCWSTR *ppszDirs, BOOL bDoSearch, DWORD return PathFileExistsDefExtW(pszPath, dwWhich); } -#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) -/* @implemented */ -static BOOL WINAPI PathIsAbsoluteW(LPCWSTR path) +#if (_WIN32_WINNT >= _WIN32_WINNT_WS03) +static BOOL WINAPI PathIsAbsoluteW(_In_ LPCWSTR path) { return PathIsUNCW(path) || (PathGetDriveNumberW(path) != -1 && path[2] == L'\\'); } -/* @implemented */ -static BOOL WINAPI PathMakeAbsoluteW(LPWSTR path) +static BOOL WINAPI PathMakeAbsoluteW(_Inout_ LPWSTR path) { WCHAR path1[MAX_PATH]; DWORD cch; @@ -146,90 +143,176 @@ static BOOL WINAPI PathMakeAbsoluteW(LPWSTR path) } #endif -/* NOTE: GetShortPathName fails if the pathname didn't exist. - GetShortPathNameAbsentW should set the short path name that even doesn't exist. */ -static DWORD GetShortPathNameAbsentW(LPCWSTR pszLong, LPWSTR pszShort, DWORD cchShort) -{ - FIXME("GetShortPathNameAbsentW(%ls, %p, %ld): stub\n", pszLong, pszShort, cchShort); - StringCchCopyW(pszShort, cchShort, pszLong); - return lstrlenW(pszShort); -} - BOOL WINAPI IsLFNDriveW(LPCWSTR lpszPath); -/* @unconfirmed */ -static VOID WINAPI PathQualifyExW(LPWSTR pszPath, LPCWSTR pszDir, DWORD dwFlags) +static VOID WINAPI +PathQualifyExW(_Inout_ LPWSTR pszPath, _Inout_opt_ LPCWSTR pszDir, _In_ DWORD dwFlags) { - WCHAR szRoot[MAX_PATH], szCopy[MAX_PATH], szCurDir[MAX_PATH]; - LPWSTR pch; - LONG cch; - BOOL bCheckLFN; + INT iDrive, cchPathLeft; + WCHAR szTemp[MAX_PATH], szRoot[MAX_PATH]; + PWCHAR pchTemp = szTemp, pchPath; + BOOL bLFN = TRUE; - if (FAILED(StringCchCopyW(szCopy, _countof(szCopy), pszPath))) - return; + TRACE("(%s,%s,0x%08x)\n", debugstr_w(pszPath), debugstr_w(pszDir), dwFlags); - FixSlashesAndColonW(szCopy); + /* Save pszPath path into szTemp for rebuilding the path later */ + if (FAILED(StringCchCopyW(szTemp, _countof(szTemp), pszPath))) + return; - if (pszDir) - { - cch = GetCurrentDirectoryW(_countof(szCurDir), szCurDir); - if (cch <= 0 || cch >= _countof(szCurDir) || !SetCurrentDirectoryW(pszDir)) - pszDir = NULL; - } + /* Replace every '/' by '\' */ + FixSlashesAndColonW(szTemp); - if (!GetFullPathNameW(szCopy, _countof(szRoot), szRoot, NULL)) - goto Quit; + cchPathLeft = MAX_PATH; - if (PathIsUNCW(szRoot)) /* it begins with double backslash */ + /* Build the root-like path on pszPath, and set pchTemp */ + if (!PathIsUNCW(szTemp)) { - pch = StrChrW(&szRoot[2], L'\\'); - if (pch) + /* + * Non-UNC path. + * Determine and normalize the root drive. + */ + iDrive = PathGetDriveNumberW(szTemp); + if (iDrive == -1) { - pch = StrChrW(&pch[1], L'\\'); - if (pch) - *pch = 0; - if (!PathAddBackslashW(szRoot)) - goto Quit; - /* szRoot is like \\MyServer\MyShare\ */ - bCheckLFN = TRUE; + /* + * No drive was specified in the path. Try to find one from the + * optional directory (if this fails, fall back to the one of the + * Windows directory). + */ + if (!pszDir || FAILED(StringCchCopyW(szRoot, _countof(szRoot), pszDir))) + { + /* pszDir was invalid or NULL. Fall back to the + * Windows directory and find its root. */ + szRoot[0] = UNICODE_NULL; + GetWindowsDirectoryW(szRoot, _countof(szRoot)); + iDrive = PathGetDriveNumberW(szRoot); + if (iDrive != -1) + PathBuildRootW(szRoot, iDrive); + } + + if (szTemp[0] == L'\\') + { + PathStripToRootW(szRoot); + } } else { - bCheckLFN = FALSE; + /* + * A drive is specified in the path, that can be either of the + * form 'C:\xxx' or of the form 'C:xxx' (relative path). Isolate + * the root part 'C:' and the rest of the path 'xxx' in pchTemp. + */ + PathBuildRootW(szRoot, iDrive); + pchTemp += 2; + if (*pchTemp == L'\\') + ++pchTemp; } + +#if 0 // FIXME: IsLFNDriveW has a bug + bLFN = IsLFNDriveW(szRoot); +#endif + if (!bLFN) + { + /* FIXME: Support non-LFN */ + } + + StringCchCopyW(pszPath, MAX_PATH, szRoot); + cchPathLeft -= lstrlenW(pszPath) + 1; } - else + else /* UNC path: Begins with double backslash */ { - if (!PathStripToRootW(szRoot) || !PathAddBackslashW(szRoot)) - goto Quit; - /* szRoot is like X:\ */ - bCheckLFN = TRUE; +#if 0 // FIXME: IsLFNDriveW has a bug + bLFN = IsLFNDriveW(pchTemp); +#endif + if (!bLFN) + { + /* FIXME: Support non-LFN */ + } + pszPath[2] = UNICODE_NULL; /* Cut off */ + cchPathLeft -= (2 + 1); + pchTemp += 2; } + /* Now pszPath is a root-like path or an empty string. */ - if (bCheckLFN && !IsLFNDriveW(szRoot)) /* not a long filename drive */ + /* Start appending the path components of szTemp to pszPath. */ + while (*pchTemp && cchPathLeft > 0) { - if (!GetFullPathNameW(szCopy, _countof(szRoot), szRoot, NULL)) - goto Quit; - if (!GetShortPathNameW(szRoot, szCopy, _countof(szCopy)) && - !GetShortPathNameAbsentW(szRoot, szCopy, _countof(szCopy))) + /* Collapse any .\ and ..\ parts in the path */ + if (*pchTemp == L'.') + { + BOOL bDots = FALSE; /* '.' or '..' ? */ + + if (pchTemp[1] == UNICODE_NULL || pchTemp[1] == L'\\') + { + /* Component '.' */ + bDots = TRUE; + } + else if (pchTemp[1] == L'.' && (pchTemp[2] == UNICODE_NULL || pchTemp[2] == L'\\')) + { + /* Component '..' */ + PathRemoveFileSpecW(pszPath); /* Remove the last component from pszPath */ + bDots = TRUE; + } + + /* If a '.' or '..' was encountered, skip to the next component */ + if (bDots) + { + while (*pchTemp && *pchTemp != L'\\') + { + ++pchTemp; + } + + while (*pchTemp == L'\\') + { + ++pchTemp; + } + + continue; + } + } + + /* Otherwise, copy the other path component */ + + if (!PathAddBackslashW(pszPath)) /* Append a backslash at the end */ + break; + + --cchPathLeft; + + pchPath = &pszPath[lstrlenW(pszPath)]; + + if (!bLFN) { - goto Quit; + /* FIXME: Support non-LFN */ } + else + { + /* Copy the component up to the next separator */ + while (*pchTemp != UNICODE_NULL && *pchTemp != L'\\' && cchPathLeft > 0) + { + *pchPath++ = *pchTemp++; + --cchPathLeft; + } + } + + /* Skip the backslashes */ + while (*pchTemp == L'\\') + { + ++pchTemp; + } + + /* Keep null-terminated */ + *pchPath = UNICODE_NULL; } - PathRemoveBackslashW(szCopy); - StringCchCopyW(pszPath, MAX_PATH, szCopy); + /* Remove any trailing backslash */ + PathRemoveBackslashW(pszPath); - if ((dwFlags & 1) == 0) + if (!(dwFlags & 1)) /* Remove the trailing dot? */ { - cch = lstrlenW(pszPath); - if (cch > 0 && pszPath[cch - 1] == L'.') - pszPath[cch - 1] = 0; + pchPath = CharPrevW(pszPath, pszPath + lstrlenW(pszPath)); + if (*pchPath == L'.') + *pchPath = UNICODE_NULL; } - -Quit: - if (pszDir) - SetCurrentDirectoryW(szCurDir); } /************************************************************************* @@ -634,7 +717,7 @@ BOOL WINAPI PathResolveA(LPSTR path, LPCSTR *dirs, DWORD flags) DWORD iDir, cDirs, cbDirs; WCHAR pathW[MAX_PATH]; - TRACE("PathResolveA(%s,%p,0x%08x)\n", debugstr_a(path), dirs, flags); + TRACE("(%s,%p,0x%08x)\n", debugstr_a(path), dirs, flags); if (dirs) { @@ -673,81 +756,78 @@ Cleanup: return ret; } -BOOL WINAPI PathResolveW(LPWSTR path, LPCWSTR *dirs, DWORD flags) +BOOL WINAPI PathResolveW(_Inout_ LPWSTR path, _Inout_opt_ LPCWSTR *dirs, _In_ DWORD flags) { - DWORD dwWhich = ((flags & PRF_DONTFINDLNK) ? (WHICH_DEFAULT & ~WHICH_LNK) : WHICH_DEFAULT); + DWORD dwWhich = WHICH_DEFAULT; /* The extensions to be searched */ + + TRACE("(%s,%p,0x%08x)\n", debugstr_w(path), dirs, flags); - TRACE("PathResolveW(%s,%p,0x%08x)\n", debugstr_w(path), dirs, flags); + if (flags & PRF_DONTFINDLNK) + dwWhich &= ~WHICH_LNK; /* Don't search '.LNK' (shortcut) */ if (flags & PRF_VERIFYEXISTS) - SetLastError(ERROR_FILE_NOT_FOUND); + SetLastError(ERROR_FILE_NOT_FOUND); /* We set this error code at first in verification */ PathUnquoteSpacesW(path); - if (PathIsRootW(path)) + if (PathIsRootW(path)) /* Root path */ { - if ((path[0] == L'\\' && path[1] == 0) || - PathIsUNCServerW(path) || PathIsUNCServerShareW(path)) - { - if (flags & PRF_FIRSTDIRDEF) - PathQualifyExW(path, dirs[0], 0); - else - PathQualifyExW(path, NULL, 0); - } + if (path[0] == L'\\' && path[1] == UNICODE_NULL) /* '\' only? */ + PathQualifyExW(path, ((flags & PRF_FIRSTDIRDEF) ? *dirs : NULL), 0); /* Qualify */ if (flags & PRF_VERIFYEXISTS) - return PathFileExistsAndAttributesW(path, NULL); + return PathFileExistsAndAttributesW(path, NULL); /* Check the existence */ + return TRUE; } - else if (PathIsFileSpecW(path)) + + if (PathIsFileSpecW(path)) /* Filename only */ { - if ((flags & PRF_TRYPROGRAMEXTENSIONS) && PathSearchOnExtensionsW(path, dirs, TRUE, dwWhich)) - return TRUE; + /* Try to find the path with program extensions applied? */ + if ((flags & PRF_TRYPROGRAMEXTENSIONS) && + PathSearchOnExtensionsW(path, dirs, TRUE, dwWhich)) + { + return TRUE; /* Found */ + } + /* Try to find the filename in the directories */ if (PathFindOnPathW(path, dirs)) - { -#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) - if (!(flags & PRF_REQUIREABSOLUTE)) - return TRUE; + goto CheckAbsoluteAndFinish; - if (!PathIsAbsoluteW(path)) - return PathMakeAbsoluteW(path) && PathFileExistsAndAttributesW(path, NULL); -#else - return TRUE; -#endif - } + return FALSE; /* Not found */ } - else if (!PathIsURLW(path)) - { - if (flags & PRF_FIRSTDIRDEF) - PathQualifyExW(path, *dirs, 1); - else - PathQualifyExW(path, NULL, 1); - if (flags & PRF_VERIFYEXISTS) - { - if ((flags & PRF_TRYPROGRAMEXTENSIONS) && - PathSearchOnExtensionsW(path, dirs, FALSE, dwWhich)) - { - return TRUE; - } - else if (!PathFileExistsAndAttributesW(path, NULL)) - { - return FALSE; - } - } + if (PathIsURLW(path)) /* URL? */ + return FALSE; -#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) - if (flags & PRF_REQUIREABSOLUTE) - { - if (!PathIsAbsoluteW(path)) - return PathMakeAbsoluteW(path) && PathFileExistsAndAttributesW(path, NULL); - } -#endif + /* Qualify the path */ + PathQualifyExW(path, ((flags & PRF_FIRSTDIRDEF) ? *dirs : NULL), 1); + + TRACE("(%s)\n", debugstr_w(path)); + + if (!(flags & PRF_VERIFYEXISTS)) /* Don't verify the existence? */ return TRUE; + + /* Try to find the path with program extensions applied? */ + if (!(flags & PRF_TRYPROGRAMEXTENSIONS) || + !PathSearchOnExtensionsW(path, dirs, FALSE, dwWhich)) + { + if (!PathFileExistsAndAttributesW(path, NULL)) + return FALSE; /* Not found */ } - return FALSE; +CheckAbsoluteAndFinish: +#if (_WIN32_WINNT >= _WIN32_WINNT_WS03) + if (!(flags & PRF_REQUIREABSOLUTE) || PathIsAbsoluteW(path)) + return TRUE; + + if (!PathMakeAbsoluteW(path)) + return FALSE; + + return PathFileExistsAndAttributesW(path, NULL); +#else + return TRUE; /* Found */ +#endif } /************************************************************************* diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index d62b4ec65c4..631dd68b757 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -168,6 +168,7 @@ ShellMessageBoxWrapW( BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath, DWORD dwWhich); BOOL WINAPI PathFindOnPathExW(LPWSTR lpszFile, LPCWSTR *lppszOtherDirs, DWORD dwWhich); VOID WINAPI FixSlashesAndColonW(LPWSTR); +BOOL WINAPI PathIsValidCharW(WCHAR c, DWORD dwClass); #ifdef __cplusplus } /* extern "C" */

1 year, 10 months

[reactos] 01/01: [SHELL32_APITEST] Workaround on wine_dbgstr_w bugs

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c4cb40d8e2f61ff29d7a… commit 2c4cb40d8e2f61ff29d7ae7373906afd4d919f46 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 4 19:58:10 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 4 19:58:10 2022 +0900 [SHELL32_APITEST] Workaround on wine_dbgstr_w bugs Double wine_dbgstr_w calls makes output broken. I used two buffers and kept the results of wine_dbgstr_w to do workaround. CORE-18080 --- modules/rostests/apitests/shell32/PathResolve.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/PathResolve.cpp b/modules/rostests/apitests/shell32/PathResolve.cpp index b8d0e560dd9..92c044702de 100644 --- a/modules/rostests/apitests/shell32/PathResolve.cpp +++ b/modules/rostests/apitests/shell32/PathResolve.cpp @@ -658,6 +658,9 @@ static void DoEntry(INT SectionNumber, INT LineNumber, const TEST_ENTRY *pEntry) INT Ret; DWORD Error; + ZeroMemory(Path, sizeof(Path)); + ZeroMemory(PathExpected, sizeof(PathExpected)); + if (pEntry->NameBefore == NULL) { assert(pEntry->NameExpected == NULL); @@ -750,8 +753,14 @@ static void DoEntry(INT SectionNumber, INT LineNumber, const TEST_ENTRY *pEntry) if (pEntry->NameExpected && !(pEntry->EF_ & EF_APP_PATH)) { + char expected[MAX_PATH]; + char path[MAX_PATH]; + + lstrcpynA(expected, wine_dbgstr_w(PathExpected), _countof(expected)); + lstrcpynA(path, wine_dbgstr_w(Path), _countof(path)); + ok(lstrcmpW(Path, PathExpected) == 0, "Section %d, Line %d: Path expected %s, was %s.\n", - SectionNumber, LineNumber, wine_dbgstr_w(PathExpected), wine_dbgstr_w(Path)); + SectionNumber, LineNumber, expected, path); } }

1 year, 10 months

[reactos] 01/01: [SHELL32_APITEST] Add dots tests to PathResolve testcase

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02d92979d97beb3c33fd8… commit 02d92979d97beb3c33fd8110d2bf1289014f8494 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 4 11:37:01 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 4 11:37:01 2022 +0900 [SHELL32_APITEST] Add dots tests to PathResolve testcase CORE-18080 --- modules/rostests/apitests/shell32/PathResolve.cpp | 70 ++++++++++++++++++++++- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/shell32/PathResolve.cpp b/modules/rostests/apitests/shell32/PathResolve.cpp index 832b801c80b..b8d0e560dd9 100644 --- a/modules/rostests/apitests/shell32/PathResolve.cpp +++ b/modules/rostests/apitests/shell32/PathResolve.cpp @@ -81,6 +81,8 @@ typedef struct tagTEST_ENTRY #define EF_NAME_ONLY 0x10 #define EF_APP_PATH 0x20 +#define RET_IGNORE 0x00BEF00D + /* Special error codes */ #define ERR_NO_CHANGE 0xBEEF /* Error Code 48879 */ #define ERR_DEAD 0xDEAD /* Error Code 57005 */ @@ -345,6 +347,66 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS11 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS12 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS13 }, + /* .\2PRONG.txt with dirs (path) */ + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L".\\2PRONG.txt", NULL, FLAGS0, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\2PRONG.txt", NULL, FLAGS1, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L".\\2PRONG.txt", NULL, FLAGS2, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\2PRONG.txt", NULL, FLAGS3, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\2PRONG.txt", s_LinkTarget, FLAGS4, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L".\\2PRONG.txt", NULL, FLAGS5, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\2PRONG.txt", NULL, FLAGS6, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\2PRONG.txt", NULL, FLAGS7, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L".\\2PRONG.txt", NULL, FLAGS8, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\2PRONG.txt", NULL, FLAGS9, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\2PRONG.txt", s_LinkTarget, FLAGS10, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L".\\2PRONG.txt", NULL, FLAGS11, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\2PRONG.txt", s_LinkTarget, FLAGS12, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\2PRONG.txt", s_LinkTarget, FLAGS13, s_Dirs }, + /* .\\2PRONG.txt with dirs (path) */ + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L".\\\\2PRONG.txt", NULL, FLAGS0, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\\\2PRONG.txt", NULL, FLAGS1, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L".\\\\2PRONG.txt", NULL, FLAGS2, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\\\2PRONG.txt", NULL, FLAGS3, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\\\2PRONG.txt", s_LinkTarget, FLAGS4, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L".\\\\2PRONG.txt", NULL, FLAGS5, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\\\2PRONG.txt", NULL, FLAGS6, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\\\2PRONG.txt", NULL, FLAGS7, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L".\\\\2PRONG.txt", NULL, FLAGS8, s_Dirs }, + { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\\\2PRONG.txt", NULL, FLAGS9, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\\\2PRONG.txt", s_LinkTarget, FLAGS10, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L".\\\\2PRONG.txt", NULL, FLAGS11, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\\\2PRONG.txt", s_LinkTarget, FLAGS12, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L".\\\\2PRONG.txt", s_LinkTarget, FLAGS13, s_Dirs }, + /* .\..\.\testdir\..\testdir\2PRONG.txt with dirs */ + { __LINE__, 1, ERR_IGNORE, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS0, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS1, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS2, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS3, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS4, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS5, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS6, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS7, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS8, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS9, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS10, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS11, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS12, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L".\\..\\.\\testdir\\..\\testdir\\2PRONG.txt", L"2PRONG.txt", FLAGS13, s_Dirs }, + /* ..\testdir\.\..\testdir\.\.\2PRONG.txt with dirs (path) */ + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", NULL, FLAGS0, s_Dirs }, + { __LINE__, RET_IGNORE, ERR_IGNORE, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", NULL, FLAGS1, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", NULL, FLAGS2, s_Dirs }, + { __LINE__, RET_IGNORE, ERR_IGNORE, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", NULL, FLAGS3, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", s_LinkTarget, FLAGS4, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", s_LinkTarget, FLAGS5, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", s_LinkTarget, FLAGS6, s_Dirs }, + { __LINE__, RET_IGNORE, ERR_IGNORE, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", NULL, FLAGS7, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", NULL, FLAGS8, s_Dirs }, + { __LINE__, RET_IGNORE, ERR_IGNORE, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", NULL, FLAGS9, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", s_LinkTarget, FLAGS10, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", s_LinkTarget, FLAGS11, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", s_LinkTarget, FLAGS12, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"..\\testdir\\.\\..\\testdir\\.\\.\\2PRONG.txt", s_LinkTarget, FLAGS13, s_Dirs }, /* 2PRONG.txt with dirs (name only) */ { __LINE__, 1, ERR_IGNORE, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS0, s_Dirs }, { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS1, s_Dirs }, @@ -674,8 +736,12 @@ static void DoEntry(INT SectionNumber, INT LineNumber, const TEST_ENTRY *pEntry) "Section %d, Line %d: DeleteRegAppPath failed\n", SectionNumber, LineNumber); } - ok(Ret == pEntry->Ret, "Section %d, Line %d: Ret expected %d, was %d.\n", - SectionNumber, LineNumber, pEntry->Ret, Ret); + if (pEntry->Ret != RET_IGNORE) + { + ok(Ret == pEntry->Ret, "Section %d, Line %d: Ret expected %d, was %d.\n", + SectionNumber, LineNumber, pEntry->Ret, Ret); + } + if (pEntry->Error != ERR_IGNORE) { ok(Error == pEntry->Error, "Section %d, Line %d: last error expected %ld, was %ld.\n",

1 year, 10 months

[reactos] 01/01: Remove '.html' from spdx.org license page URLs. (#4845)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e944dfa75fc49c297446e… commit e944dfa75fc49c297446eef2d3eda1a3eb59793e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 3 16:36:27 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 3 18:25:37 2022 +0100 Remove '.html' from spdx.org license page URLs. (#4845) --- drivers/network/dd/e1000/send.c | 2 +- modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c | 2 +- modules/rostests/apitests/ntdll/RtlUnicodeStringToCountedOemString.c | 2 +- modules/rostests/apitests/ntdll/RtlUnicodeToOemN.c | 2 +- modules/rostests/apitests/ntdll/RtlxUnicodeStringToAnsiSize.c | 2 +- modules/rostests/apitests/ntdll/RtlxUnicodeStringToOemSize.c | 2 +- modules/rostests/apitests/ntdll/locale.c | 2 +- ntoskrnl/mm/ARM3/wslist.cpp | 2 +- ntoskrnl/mm/i386/procsup.c | 2 +- sdk/include/reactos/msgdump.h | 2 +- sdk/include/reactos/winxx.h | 2 +- sdk/tools/gcc_plugin_seh/main.cpp | 2 +- sdk/tools/txt2nls/main.cpp | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/network/dd/e1000/send.c b/drivers/network/dd/e1000/send.c index 990e8b313d2..6f02bb91997 100644 --- a/drivers/network/dd/e1000/send.c +++ b/drivers/network/dd/e1000/send.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Intel PRO/1000 Driver - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Sending packets * COPYRIGHT: Copyright 2018 Mark Jansen <mark.jansen(a)reactos.org> * Copyright 2019 Victor Perevertkin <victor.perevertkin(a)reactos.org> diff --git a/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c b/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c index fa8ded244ea..01166709e8e 100644 --- a/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c +++ b/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c @@ -3,7 +3,7 @@ // To revert conversion, please execute "code7bit -r <file>". /* * PROJECT: ReactOS API tests - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Test for RtlGenerate8dot3Name * COPYRIGHT: Copyright 2015-2016 Pierre Schweitzer <pierre(a)reactos.org> * Copyright 2021 Jérôme Gardou <jerome.gardou(a)reactos.org> diff --git a/modules/rostests/apitests/ntdll/RtlUnicodeStringToCountedOemString.c b/modules/rostests/apitests/ntdll/RtlUnicodeStringToCountedOemString.c index 30393fc0ea6..4d7887e5774 100644 --- a/modules/rostests/apitests/ntdll/RtlUnicodeStringToCountedOemString.c +++ b/modules/rostests/apitests/ntdll/RtlUnicodeStringToCountedOemString.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS API tests - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later.html) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Test for RtlUnicodeStringToCountedOemString * COPYRIGHT: Copyright 2021 Jérôme Gardou <jerome.gardou(a)reactos.org> */ diff --git a/modules/rostests/apitests/ntdll/RtlUnicodeToOemN.c b/modules/rostests/apitests/ntdll/RtlUnicodeToOemN.c index ff20e9a7b82..1a757695941 100644 --- a/modules/rostests/apitests/ntdll/RtlUnicodeToOemN.c +++ b/modules/rostests/apitests/ntdll/RtlUnicodeToOemN.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS API tests - * LICENSE: 0BSD (https://spdx.org/licenses/0BSD.html) + * LICENSE: 0BSD (https://spdx.org/licenses/0BSD) * PURPOSE: Test for RtlUnicodeToOemN * COPYRIGHT: Copyright 2021 Jérôme Gardou <jerome.gardou(a)reactos.org> */ diff --git a/modules/rostests/apitests/ntdll/RtlxUnicodeStringToAnsiSize.c b/modules/rostests/apitests/ntdll/RtlxUnicodeStringToAnsiSize.c index 5caeea2346c..067e9a9b241 100644 --- a/modules/rostests/apitests/ntdll/RtlxUnicodeStringToAnsiSize.c +++ b/modules/rostests/apitests/ntdll/RtlxUnicodeStringToAnsiSize.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS API tests - * LICENSE: 0BSD (https://spdx.org/licenses/0BSD.html) + * LICENSE: 0BSD (https://spdx.org/licenses/0BSD) * PURPOSE: Test for RtlxUnicodeStringToAnsiSize * COPYRIGHT: Copyright 2021 Jérôme Gardou <jerome.gardou(a)reactos.org> */ diff --git a/modules/rostests/apitests/ntdll/RtlxUnicodeStringToOemSize.c b/modules/rostests/apitests/ntdll/RtlxUnicodeStringToOemSize.c index 354b64562fd..a7157c9b792 100644 --- a/modules/rostests/apitests/ntdll/RtlxUnicodeStringToOemSize.c +++ b/modules/rostests/apitests/ntdll/RtlxUnicodeStringToOemSize.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS API tests - * LICENSE: 0BSD (https://spdx.org/licenses/0BSD.html) + * LICENSE: 0BSD (https://spdx.org/licenses/0BSD) * PURPOSE: Test for RtlxUnicodeStringToOemSize * COPYRIGHT: Copyright 2021 Jérôme Gardou <jerome.gardou(a)reactos.org> */ diff --git a/modules/rostests/apitests/ntdll/locale.c b/modules/rostests/apitests/ntdll/locale.c index 281d3b8b2ba..0742b9865f8 100644 --- a/modules/rostests/apitests/ntdll/locale.c +++ b/modules/rostests/apitests/ntdll/locale.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS API tests - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: RTL locale support * COPYRIGHT: Copyright 2016 Mark Jansen <mark.jansen(a)reactos.org> * Copyright 2021 Jérôme Gardou <jerome.gardou(a)reactos.org> diff --git a/ntoskrnl/mm/ARM3/wslist.cpp b/ntoskrnl/mm/ARM3/wslist.cpp index 73067dfa910..28419be13f1 100644 --- a/ntoskrnl/mm/ARM3/wslist.cpp +++ b/ntoskrnl/mm/ARM3/wslist.cpp @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause.html) + * LICENSE: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause) * FILE: ntoskrnl/mm/ARM3/wslist.cpp * PURPOSE: Working set list management * PROGRAMMERS: Jérôme Gardou diff --git a/ntoskrnl/mm/i386/procsup.c b/ntoskrnl/mm/i386/procsup.c index 8ffaec103c6..69e15b79d57 100644 --- a/ntoskrnl/mm/i386/procsup.c +++ b/ntoskrnl/mm/i386/procsup.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause.html) + * LICENSE: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause) * FILE: ntoskrnl/mm/i386/procsup.c * PURPOSE: Process handling for i386 architecture * PROGRAMMERS: Jérôme Gardou diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index 1076c7e8943..da8057a7f0d 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS header files - * LICENSE: CC-BY-4.0 (https://spdx.org/licenses/CC-BY-4.0.html) + * LICENSE: CC-BY-4.0 (https://spdx.org/licenses/CC-BY-4.0) * PURPOSE: Win32API message dumping * COPYRIGHT: Copyright 2018-2021 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ diff --git a/sdk/include/reactos/winxx.h b/sdk/include/reactos/winxx.h index 4921b106100..53baa65456c 100644 --- a/sdk/include/reactos/winxx.h +++ b/sdk/include/reactos/winxx.h @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS header files - * LICENSE: CC-BY-4.0 (https://spdx.org/licenses/CC-BY-4.0.html) + * LICENSE: CC-BY-4.0 (https://spdx.org/licenses/CC-BY-4.0) * PURPOSE: An unofficial extension of <windowsx.h> * COPYRIGHT: Copyright 2017-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ diff --git a/sdk/tools/gcc_plugin_seh/main.cpp b/sdk/tools/gcc_plugin_seh/main.cpp index 7383192da71..b90c736b584 100644 --- a/sdk/tools/gcc_plugin_seh/main.cpp +++ b/sdk/tools/gcc_plugin_seh/main.cpp @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS SDK - * LICENSE: BSD Zero Clause License (https://spdx.org/licenses/0BSD.html) + * LICENSE: BSD Zero Clause License (https://spdx.org/licenses/0BSD) * PURPOSE: Helper pragma implementation for pseh library (amd64) * COPYRIGHT: Copyright 2021 Jérôme Gardou */ diff --git a/sdk/tools/txt2nls/main.cpp b/sdk/tools/txt2nls/main.cpp index d966029ede0..8d5c473914f 100644 --- a/sdk/tools/txt2nls/main.cpp +++ b/sdk/tools/txt2nls/main.cpp @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS TXT to NLS Converter - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * FILE: sdk/tools/txt2nls/main.c * COPYRIGHT: Copyright 2021 Jérôme Gardou <jerome.gardou(a)reactos.org> */

1 year, 10 months

[reactos] 01/01: [EXPLORER] Implement "Undo Cascade/Tile" menu items (#4817)

by Tuur Martens

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be970d8d313e9af71990c… commit be970d8d313e9af71990c8b6025e8fcfa2f0c1b6 Author: Tuur Martens <tuurmartens4(a)gmail.com> AuthorDate: Thu Nov 3 13:48:18 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 3 15:48:18 2022 +0300 [EXPLORER] Implement "Undo Cascade/Tile" menu items (#4817) Implement taskbar context menu items "Undo Cascade" and "Undo Tile". Based on patch by KRosUser. CORE-18383 --- base/shell/explorer/lang/bg-BG.rc | 2 ++ base/shell/explorer/lang/cs-CZ.rc | 2 ++ base/shell/explorer/lang/de-DE.rc | 2 ++ base/shell/explorer/lang/en-US.rc | 2 ++ base/shell/explorer/lang/es-ES.rc | 2 ++ base/shell/explorer/lang/et-EE.rc | 2 ++ base/shell/explorer/lang/eu-ES.rc | 2 ++ base/shell/explorer/lang/fi-FI.rc | 2 ++ base/shell/explorer/lang/fr-FR.rc | 2 ++ base/shell/explorer/lang/he-IL.rc | 2 ++ base/shell/explorer/lang/hi-IN.rc | 2 ++ base/shell/explorer/lang/hu-HU.rc | 2 ++ base/shell/explorer/lang/id-ID.rc | 2 ++ base/shell/explorer/lang/it-IT.rc | 2 ++ base/shell/explorer/lang/ja-JP.rc | 2 ++ base/shell/explorer/lang/ko-KR.rc | 2 ++ base/shell/explorer/lang/lt-LT.rc | 2 ++ base/shell/explorer/lang/ms-MY.rc | 2 ++ base/shell/explorer/lang/nl-NL.rc | 2 ++ base/shell/explorer/lang/no-NO.rc | 2 ++ base/shell/explorer/lang/pl-PL.rc | 2 ++ base/shell/explorer/lang/pt-BR.rc | 2 ++ base/shell/explorer/lang/pt-PT.rc | 2 ++ base/shell/explorer/lang/ro-RO.rc | 2 ++ base/shell/explorer/lang/ru-RU.rc | 2 ++ base/shell/explorer/lang/sk-SK.rc | 2 ++ base/shell/explorer/lang/sq-AL.rc | 2 ++ base/shell/explorer/lang/tr-TR.rc | 2 ++ base/shell/explorer/lang/uk-UA.rc | 2 ++ base/shell/explorer/lang/zh-CN.rc | 2 ++ base/shell/explorer/lang/zh-HK.rc | 2 ++ base/shell/explorer/lang/zh-TW.rc | 2 ++ base/shell/explorer/resource.h | 2 ++ base/shell/explorer/traywnd.cpp | 75 +++++++++++++++++++++++++++++++++++++++ 34 files changed, 141 insertions(+) diff --git a/base/shell/explorer/lang/bg-BG.rc b/base/shell/explorer/lang/bg-BG.rc index da3edd651d9..d9d1ff619c9 100644 --- a/base/shell/explorer/lang/bg-BG.rc +++ b/base/shell/explorer/lang/bg-BG.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Лента със задачи и Старт меню" IDS_RESTORE_ALL "&Покажи отворените прозорци" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/cs-CZ.rc b/base/shell/explorer/lang/cs-CZ.rc index 27260f5a654..5890a4583de 100644 --- a/base/shell/explorer/lang/cs-CZ.rc +++ b/base/shell/explorer/lang/cs-CZ.rc @@ -201,4 +201,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Vlastnosti hlavního panelu a Start menu" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index e24726f74d7..55a62189cd1 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskleisten- und Startmenüeinstellungen" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/en-US.rc b/base/shell/explorer/lang/en-US.rc index 7bb22c452c1..2fd043fd994 100644 --- a/base/shell/explorer/lang/en-US.rc +++ b/base/shell/explorer/lang/en-US.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/es-ES.rc b/base/shell/explorer/lang/es-ES.rc index e10343ebd6b..1626c620650 100644 --- a/base/shell/explorer/lang/es-ES.rc +++ b/base/shell/explorer/lang/es-ES.rc @@ -207,4 +207,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Propiedades de la Barra de tareas y del Menú Inicio" IDS_RESTORE_ALL "&Mostrar ventanas abiertas" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/et-EE.rc b/base/shell/explorer/lang/et-EE.rc index e4e894120fe..4769d34e826 100644 --- a/base/shell/explorer/lang/et-EE.rc +++ b/base/shell/explorer/lang/et-EE.rc @@ -202,4 +202,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Tegumiriba ja Menüü Start" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/eu-ES.rc b/base/shell/explorer/lang/eu-ES.rc index 5658396e712..6a29c041c51 100644 --- a/base/shell/explorer/lang/eu-ES.rc +++ b/base/shell/explorer/lang/eu-ES.rc @@ -202,4 +202,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Ataza-barra eta Hasi menuaren propietateak" IDS_RESTORE_ALL "E&rakutsi irekitako leihoak" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/fi-FI.rc b/base/shell/explorer/lang/fi-FI.rc index b564f3a6b2e..ce29db6b61b 100644 --- a/base/shell/explorer/lang/fi-FI.rc +++ b/base/shell/explorer/lang/fi-FI.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Tehtäväpalkki ja Käynnistä Valikko" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/fr-FR.rc b/base/shell/explorer/lang/fr-FR.rc index b667d86a89e..5323bf42d94 100644 --- a/base/shell/explorer/lang/fr-FR.rc +++ b/base/shell/explorer/lang/fr-FR.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Barre des tâches et Menu Démarrer" IDS_RESTORE_ALL "&Afficher les fenêtres ouvertes" + IDS_TRAYWND_UNDO_CASCADE "Ann&uler cascade" + IDS_TRAYWND_UNDO_TILE "Ann&uler mosaïque" END diff --git a/base/shell/explorer/lang/he-IL.rc b/base/shell/explorer/lang/he-IL.rc index dbe1a5d6c27..a3765b9ed9c 100644 --- a/base/shell/explorer/lang/he-IL.rc +++ b/base/shell/explorer/lang/he-IL.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "שורת המשימות ושולחן העבודה" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/hi-IN.rc b/base/shell/explorer/lang/hi-IN.rc index d503dcac0cd..7238f7c0793 100644 --- a/base/shell/explorer/lang/hi-IN.rc +++ b/base/shell/explorer/lang/hi-IN.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "टास्कबार और स्टार्ट मेनू" IDS_RESTORE_ALL "खुले हुऐ विंडोज &दिखाएं" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/hu-HU.rc b/base/shell/explorer/lang/hu-HU.rc index 4ed7ff57c4a..8f236550e4a 100644 --- a/base/shell/explorer/lang/hu-HU.rc +++ b/base/shell/explorer/lang/hu-HU.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Tálca és Start menü" IDS_RESTORE_ALL "&Megnyitott ablakok megjelenítése" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/id-ID.rc b/base/shell/explorer/lang/id-ID.rc index 835f8b34823..154cdbd6b1d 100644 --- a/base/shell/explorer/lang/id-ID.rc +++ b/base/shell/explorer/lang/id-ID.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Bilah Tugas dan Menu Mulai" IDS_RESTORE_ALL "&Tampilkan Semua Jendela" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/it-IT.rc b/base/shell/explorer/lang/it-IT.rc index f58f97c5401..7df443353af 100644 --- a/base/shell/explorer/lang/it-IT.rc +++ b/base/shell/explorer/lang/it-IT.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Proprietà della Barra delle applicazioni e del Menú di avvio" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/ja-JP.rc b/base/shell/explorer/lang/ja-JP.rc index 8a6d03e7b5e..8bb0f845ea7 100644 --- a/base/shell/explorer/lang/ja-JP.rc +++ b/base/shell/explorer/lang/ja-JP.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "タスクバーとスタートメニュー" IDS_RESTORE_ALL "開いているウィンドウを表示(&S)" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/ko-KR.rc b/base/shell/explorer/lang/ko-KR.rc index a54b4939977..a6e88008126 100644 --- a/base/shell/explorer/lang/ko-KR.rc +++ b/base/shell/explorer/lang/ko-KR.rc @@ -203,4 +203,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "작업 표시줄 및 시작 메뉴" IDS_RESTORE_ALL "열린 창 보기(&S)" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/lt-LT.rc b/base/shell/explorer/lang/lt-LT.rc index 49ff5d70832..05645847a0e 100644 --- a/base/shell/explorer/lang/lt-LT.rc +++ b/base/shell/explorer/lang/lt-LT.rc @@ -198,4 +198,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/ms-MY.rc b/base/shell/explorer/lang/ms-MY.rc index 40d5a92bc1c..40cd9d8440c 100644 --- a/base/shell/explorer/lang/ms-MY.rc +++ b/base/shell/explorer/lang/ms-MY.rc @@ -197,4 +197,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Bar Tugas dan Menu Mula" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/nl-NL.rc b/base/shell/explorer/lang/nl-NL.rc index d9c52184c71..7434245e6c2 100644 --- a/base/shell/explorer/lang/nl-NL.rc +++ b/base/shell/explorer/lang/nl-NL.rc @@ -195,4 +195,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taakbalk en menu Start eigenschappen" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/no-NO.rc b/base/shell/explorer/lang/no-NO.rc index 7cde4dc6f64..fcdb0042501 100644 --- a/base/shell/explorer/lang/no-NO.rc +++ b/base/shell/explorer/lang/no-NO.rc @@ -196,4 +196,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Egenskaper for oppgavelinjen og startmeny" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/pl-PL.rc b/base/shell/explorer/lang/pl-PL.rc index a36a7168de1..61ff49d92ee 100644 --- a/base/shell/explorer/lang/pl-PL.rc +++ b/base/shell/explorer/lang/pl-PL.rc @@ -206,4 +206,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Paska zadań i menu Start" IDS_RESTORE_ALL "&Pokaż otwarte okna" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/pt-BR.rc b/base/shell/explorer/lang/pt-BR.rc index 1ee4135c8cb..f9106431638 100644 --- a/base/shell/explorer/lang/pt-BR.rc +++ b/base/shell/explorer/lang/pt-BR.rc @@ -197,4 +197,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Propriedades do Barra de Tarefas e Menu Iniciar" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index 94107915b1a..bbc370a3ca2 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -197,4 +197,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Barra de Tarefas e Menu Iniciar" IDS_RESTORE_ALL "&Mostrar janelas abertas" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/ro-RO.rc b/base/shell/explorer/lang/ro-RO.rc index a8d609c58f6..3b3ec3c16be 100644 --- a/base/shell/explorer/lang/ro-RO.rc +++ b/base/shell/explorer/lang/ro-RO.rc @@ -197,4 +197,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Bara de activități și meniul „Pornire”" IDS_RESTORE_ALL "&Afișează ferestrele deschise" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/ru-RU.rc b/base/shell/explorer/lang/ru-RU.rc index 15ad76a321a..f82251a6ade 100644 --- a/base/shell/explorer/lang/ru-RU.rc +++ b/base/shell/explorer/lang/ru-RU.rc @@ -197,4 +197,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Меню ""Пуск"" и панель задач" IDS_RESTORE_ALL "&Показать окна" + IDS_TRAYWND_UNDO_CASCADE "&Отменить Каскадом" + IDS_TRAYWND_UNDO_TILE "&Отменить Окна рядом" END diff --git a/base/shell/explorer/lang/sk-SK.rc b/base/shell/explorer/lang/sk-SK.rc index 90e30583a8e..8e3606ba092 100644 --- a/base/shell/explorer/lang/sk-SK.rc +++ b/base/shell/explorer/lang/sk-SK.rc @@ -200,4 +200,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Vlastnosti panela úloh a ponuky Štart" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/sq-AL.rc b/base/shell/explorer/lang/sq-AL.rc index 9f7d14d2f7f..8941c1ed26e 100644 --- a/base/shell/explorer/lang/sq-AL.rc +++ b/base/shell/explorer/lang/sq-AL.rc @@ -199,4 +199,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar dhe Start Menu" IDS_RESTORE_ALL "&Show Open Windows" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/tr-TR.rc b/base/shell/explorer/lang/tr-TR.rc index deec41b8be8..bea911fbb3e 100644 --- a/base/shell/explorer/lang/tr-TR.rc +++ b/base/shell/explorer/lang/tr-TR.rc @@ -200,4 +200,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Görev Çubuğu ve Başlat Menüsü" IDS_RESTORE_ALL "&Açık Pencereleri Göster" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/uk-UA.rc b/base/shell/explorer/lang/uk-UA.rc index 03fbaa8b7cf..b5327772944 100644 --- a/base/shell/explorer/lang/uk-UA.rc +++ b/base/shell/explorer/lang/uk-UA.rc @@ -203,4 +203,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Властивості меню Пуск та Панелі завдань" IDS_RESTORE_ALL "&Показати відкриті вікна" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index 942fc5bf07d..d1807953dc0 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -204,4 +204,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "任务栏和开始菜单属性" IDS_RESTORE_ALL "显示打开的窗口(&S)" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/zh-HK.rc b/base/shell/explorer/lang/zh-HK.rc index bae35d9a71e..03f8db4bb15 100644 --- a/base/shell/explorer/lang/zh-HK.rc +++ b/base/shell/explorer/lang/zh-HK.rc @@ -203,4 +203,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "工作列及開始功能表" IDS_RESTORE_ALL "顯示開啟的視窗(&S)" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/lang/zh-TW.rc b/base/shell/explorer/lang/zh-TW.rc index 6ab16e00f72..741d85f0ce5 100644 --- a/base/shell/explorer/lang/zh-TW.rc +++ b/base/shell/explorer/lang/zh-TW.rc @@ -204,4 +204,6 @@ STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "工作列及開始功能表" IDS_RESTORE_ALL "顯示開啟的視窗(&S)" + IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" + IDS_TRAYWND_UNDO_TILE "&Undo Tile" END diff --git a/base/shell/explorer/resource.h b/base/shell/explorer/resource.h index 5265eb15618..2ff1e6b4e5f 100644 --- a/base/shell/explorer/resource.h +++ b/base/shell/explorer/resource.h @@ -102,6 +102,8 @@ #define IDS_HELP_COMMAND 732 #define IDS_TASKBAR_STARTMENU_PROP_CAPTION 810 #define IDS_RESTORE_ALL 811 +#define IDS_TRAYWND_UNDO_CASCADE 812 +#define IDS_TRAYWND_UNDO_TILE 813 /*******************************************************************************\ |* Control Resources *| diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 75023294696..ca930e56e55 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -58,6 +58,47 @@ void appbar_notify_all(HMONITOR hMon, UINT uMsg, HWND hwndExclude, LPARAM lParam static const WCHAR szTrayWndClass[] = L"Shell_TrayWnd"; +enum { NONE, TILED, CASCADED } g_Arrangement = NONE; + +struct WINDOWPOSBACKUPDATA +{ + HWND hwnd; + WINDOWPLACEMENT wplt; +}; +CSimpleArray<WINDOWPOSBACKUPDATA> g_WindowPosBackup; + +static BOOL CALLBACK BackupWindowsPosProc(HWND hwnd, LPARAM lParam) +{ + WINDOWPOSBACKUPDATA wposdata; + HWND hDesk = GetDesktopWindow(); + if (IsWindowVisible(hwnd) && !IsIconic(hwnd) && (hwnd != hDesk)) + { + wposdata.hwnd = hwnd; + wposdata.wplt.length = sizeof(wposdata.wplt); + GetWindowPlacement(hwnd, &(wposdata.wplt)); + g_WindowPosBackup.Add(wposdata); + } + + return TRUE; +} + +VOID BackupWindowPos() +{ + EnumWindows(BackupWindowsPosProc, NULL); +} + +VOID RestoreWindowPos() +{ + g_Arrangement = NONE; + + for (INT i = g_WindowPosBackup.GetSize() - 1; i >= 0; --i) + { + SetWindowPlacement(g_WindowPosBackup[i].hwnd, &(g_WindowPosBackup[i].wplt)); + } + + g_WindowPosBackup.RemoveAll(); +} + struct EFFECTIVE_INFO { HWND hwndFound; @@ -805,6 +846,7 @@ public: break; case ID_SHELL_CMD_UNDO_ACTION: + RestoreWindowPos(); break; case ID_SHELL_CMD_SHOW_DESKTOP: @@ -813,20 +855,35 @@ public: case ID_SHELL_CMD_TILE_WND_H: appbar_notify_all(NULL, ABN_WINDOWARRANGE, NULL, TRUE); + if (g_Arrangement == NONE) + { + BackupWindowPos(); + } TileWindows(NULL, MDITILE_HORIZONTAL, NULL, 0, NULL); appbar_notify_all(NULL, ABN_WINDOWARRANGE, NULL, FALSE); + g_Arrangement = TILED; break; case ID_SHELL_CMD_TILE_WND_V: appbar_notify_all(NULL, ABN_WINDOWARRANGE, NULL, TRUE); + if (g_Arrangement == NONE) + { + BackupWindowPos(); + } TileWindows(NULL, MDITILE_VERTICAL, NULL, 0, NULL); appbar_notify_all(NULL, ABN_WINDOWARRANGE, NULL, FALSE); + g_Arrangement = TILED; break; case ID_SHELL_CMD_CASCADE_WND: appbar_notify_all(NULL, ABN_WINDOWARRANGE, NULL, TRUE); + if (g_Arrangement == NONE) + { + BackupWindowPos(); + } CascadeWindows(NULL, MDITILE_SKIPDISABLED, NULL, 0, NULL); appbar_notify_all(NULL, ABN_WINDOWARRANGE, NULL, FALSE); + g_Arrangement = CASCADED; break; case ID_SHELL_CMD_CUST_NOTIF: @@ -3281,12 +3338,30 @@ HandleTrayContextMenu: ::EnableMenuItem(hMenu, ID_SHELL_CMD_CASCADE_WND, MF_BYCOMMAND | MF_ENABLED); ::EnableMenuItem(hMenu, ID_SHELL_CMD_TILE_WND_H, MF_BYCOMMAND | MF_ENABLED); ::EnableMenuItem(hMenu, ID_SHELL_CMD_TILE_WND_V, MF_BYCOMMAND | MF_ENABLED); + if (g_Arrangement != NONE) + { + CStringW strCaption((g_Arrangement == TILED) ? MAKEINTRESOURCEW(IDS_TRAYWND_UNDO_TILE) + : MAKEINTRESOURCEW(IDS_TRAYWND_UNDO_CASCADE)); + MENUITEMINFOW mii = { sizeof(mii) }; + ::GetMenuItemInfoW(hMenu, ID_SHELL_CMD_UNDO_ACTION, FALSE, &mii); + mii.fMask = MIIM_TYPE; + mii.fType = MFT_STRING; + mii.dwTypeData = const_cast<LPWSTR>(&strCaption[0]); + ::SetMenuItemInfoW(hMenu, ID_SHELL_CMD_UNDO_ACTION, FALSE, &mii); + } + else + { + ::DeleteMenu(hMenu, ID_SHELL_CMD_UNDO_ACTION, MF_BYCOMMAND); + } } else { ::EnableMenuItem(hMenu, ID_SHELL_CMD_CASCADE_WND, MF_BYCOMMAND | MF_GRAYED); ::EnableMenuItem(hMenu, ID_SHELL_CMD_TILE_WND_H, MF_BYCOMMAND | MF_GRAYED); ::EnableMenuItem(hMenu, ID_SHELL_CMD_TILE_WND_V, MF_BYCOMMAND | MF_GRAYED); + ::DeleteMenu(hMenu, ID_SHELL_CMD_UNDO_ACTION, MF_BYCOMMAND); + g_Arrangement = NONE; + g_WindowPosBackup.RemoveAll(); } return 0; }

1 year, 10 months

[reactos] 01/01: [MEDIA:FONTS] Add Greek glyphs to tahoma.ttf (#4837)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9642031d2ad528b924826… commit 9642031d2ad528b924826d96bb4f853d2e4a6d56 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 3 14:05:57 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 3 14:05:57 2022 +0900 [MEDIA:FONTS] Add Greek glyphs to tahoma.ttf (#4837) - Copy Greek vector glyphs from DejaVu Sans font by using FontForge. - Add Greek bitmap glyphs by hand with using FontForge. - Add Greek charset on font info. - Underline position is hacked because FontForge has a bug in saving Underline position. CORE-14343 --- media/fonts/doc/Tahoma/LICENSE.txt | 101 +++++++++++++++++++++++++++++++++++++ media/fonts/tahoma.ttf | Bin 154488 -> 173904 bytes 2 files changed, 101 insertions(+) diff --git a/media/fonts/doc/Tahoma/LICENSE.txt b/media/fonts/doc/Tahoma/LICENSE.txt new file mode 100644 index 00000000000..d4538151163 --- /dev/null +++ b/media/fonts/doc/Tahoma/LICENSE.txt @@ -0,0 +1,101 @@ +tahoma.ttf Version 0.019 khmz +tahomabd.ttf Version 0.021 khmz + +Fonts are based on (c) Bitstream (see below). Changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) +Katayama Hirofumi MZ added Greek and Hebrew glyphs and made improvements to the font. + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING +ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE +FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index ec8dd3bc82a..9e89238e819 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

1 year, 10 months

[reactos] 04/04: [SMSS] Call SmpConfigureEnvironment() twice in order to resolve forward environment variables references.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=258caa85d1745796c7d19… commit 258caa85d1745796c7d192d8d0b6baa70fa0b9ac Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 2 15:46:08 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 3 02:55:51 2022 +0100 [SMSS] Call SmpConfigureEnvironment() twice in order to resolve forward environment variables references. Example: environment variable EnvVar1 that refers to a later-defined variable EnvVar2. --- base/system/smss/sminit.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/base/system/smss/sminit.c b/base/system/smss/sminit.c index 8960010fcc8..da11f72e000 100644 --- a/base/system/smss/sminit.c +++ b/base/system/smss/sminit.c @@ -477,6 +477,12 @@ SmpConfigureKnownDlls(IN PWSTR ValueName, } } +/** + * @remark + * SmpConfigureEnvironment() should be called twice in order to resolve + * forward references to environment variables. + * See the two L"Environment" entries in SmpRegistryConfigurationTable[]. + **/ NTSTATUS NTAPI SmpConfigureEnvironment(IN PWSTR ValueName, @@ -493,7 +499,7 @@ SmpConfigureEnvironment(IN PWSTR ValueName, RtlInitUnicodeString(&ValueString, ValueName); RtlInitUnicodeString(&DataString, ValueData); DPRINT("Setting %wZ = %wZ\n", &ValueString, &DataString); - Status = RtlSetEnvironmentVariable(0, &ValueString, &DataString); + Status = RtlSetEnvironmentVariable(NULL, &ValueString, &DataString); if (!NT_SUCCESS(Status)) { DPRINT1("SMSS: 'SET %wZ = %wZ' failed - Status == %lx\n", @@ -716,6 +722,13 @@ SmpRegistryConfigurationTable[] = 0 }, + /** + * @remark + * SmpConfigureEnvironment() is expected to be called twice + * (see SmpCalledConfigEnv) in order to resolve forward references + * to environment variables (e.g. EnvVar1 referring to EnvVar2, + * before EnvVar2 is defined). + **/ { SmpConfigureEnvironment, RTL_QUERY_REGISTRY_SUBKEY, @@ -726,6 +739,17 @@ SmpRegistryConfigurationTable[] = 0 }, + { + SmpConfigureEnvironment, + RTL_QUERY_REGISTRY_SUBKEY, + L"Environment", + NULL, + REG_NONE, + NULL, + 0 + }, + /****/ + { SmpConfigureSubSystems, RTL_QUERY_REGISTRY_SUBKEY,

1 year, 10 months

[reactos] 03/04: [NTOS][NTDLL][NDK] Nt/ZwCreatePagingFile: Fix parameter names + use SAL; fix NTDLL spec file.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ac263c93ab47aab53015… commit 4ac263c93ab47aab5301585cbbbd98161962f472 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 1 22:07:36 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 3 02:55:50 2022 +0100 [NTOS][NTDLL][NDK] Nt/ZwCreatePagingFile: Fix parameter names + use SAL; fix NTDLL spec file. --- dll/ntdll/def/ntdll.spec | 4 ++-- ntoskrnl/mm/pagefile.c | 12 +++++++----- sdk/include/ndk/mmfuncs.h | 8 ++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 617933ca710..c2b00882c2d 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -277,7 +277,7 @@ @ stdcall NtCreateMailslotFile(long long long long long long long long) @ stdcall NtCreateMutant(ptr long ptr long) @ stdcall NtCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) -@ stdcall NtCreatePagingFile(long long long long) +@ stdcall NtCreatePagingFile(ptr ptr ptr long) @ stdcall NtCreatePort(ptr ptr long long ptr) @ stub -version=0x600+ NtCreatePrivateNamespace @ stdcall NtCreateProcess(ptr long ptr ptr long ptr ptr ptr) @@ -1438,7 +1438,7 @@ @ stdcall ZwCreateMailslotFile(long long long long long long long long) @ stdcall ZwCreateMutant(ptr long ptr long) @ stdcall ZwCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) -@ stdcall ZwCreatePagingFile(long long long long) +@ stdcall ZwCreatePagingFile(ptr ptr ptr long) @ stdcall ZwCreatePort(ptr ptr long long long) @ stdcall ZwCreateProcess(ptr long ptr ptr long ptr ptr ptr) @ stdcall ZwCreateProcessEx(ptr long ptr ptr long ptr ptr ptr long) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 5b35860862f..1387a38527b 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -344,11 +344,13 @@ MmAllocSwapPage(VOID) return(0); } -NTSTATUS NTAPI -NtCreatePagingFile(IN PUNICODE_STRING FileName, - IN PLARGE_INTEGER MinimumSize, - IN PLARGE_INTEGER MaximumSize, - IN ULONG Reserved) +NTSTATUS +NTAPI +NtCreatePagingFile( + _In_ PUNICODE_STRING FileName, + _In_ PLARGE_INTEGER MinimumSize, + _In_ PLARGE_INTEGER MaximumSize, + _In_ ULONG Reserved) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; diff --git a/sdk/include/ndk/mmfuncs.h b/sdk/include/ndk/mmfuncs.h index 9872ecb9770..a0be60bac7c 100644 --- a/sdk/include/ndk/mmfuncs.h +++ b/sdk/include/ndk/mmfuncs.h @@ -106,8 +106,8 @@ NTSTATUS NTAPI NtCreatePagingFile( _In_ PUNICODE_STRING FileName, - _In_ PLARGE_INTEGER InitialSize, - _In_ PLARGE_INTEGER MaxiumSize, + _In_ PLARGE_INTEGER MinimumSize, + _In_ PLARGE_INTEGER MaximumSize, _In_ ULONG Reserved ); @@ -346,8 +346,8 @@ NTSTATUS NTAPI ZwCreatePagingFile( _In_ PUNICODE_STRING FileName, - _In_ PLARGE_INTEGER InitialSize, - _In_ PLARGE_INTEGER MaxiumSize, + _In_ PLARGE_INTEGER MinimumSize, + _In_ PLARGE_INTEGER MaximumSize, _In_ ULONG Reserved );

1 year, 10 months

[reactos] 02/04: [NTOS] Add TAG_DACL in tag.h and use it.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab5fdac922def35914942… commit ab5fdac922def35914942b1211b8b49b57243586 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 1 22:06:12 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 3 02:55:49 2022 +0100 [NTOS] Add TAG_DACL in tag.h and use it. --- ntoskrnl/include/internal/tag.h | 1 + ntoskrnl/mm/ARM3/mminit.c | 4 ++-- ntoskrnl/mm/pagefile.c | 30 +++++++++++++++--------------- ntoskrnl/ob/obname.c | 6 +++--- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h index b79a8a2a2c0..f7a021152ce 100644 --- a/ntoskrnl/include/internal/tag.h +++ b/ntoskrnl/include/internal/tag.h @@ -165,6 +165,7 @@ #define TAG_SID_AND_ATTRIBUTES 'aSeS' #define TAG_SID_VALIDATE 'vSeS' #define TAG_ACCESS_CHECK_RIGHT 'rCeS' +#define TAG_DACL 'lcaD' /* LPC Tags */ #define TAG_LPC_MESSAGE 'McpL' diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index 400f8965dd5..bd5ab3caa88 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -1264,7 +1264,7 @@ MiCreateMemoryEvent(IN PUNICODE_STRING Name, RtlLengthSid(SeWorldSid); /* Allocate space for the DACL */ - Dacl = ExAllocatePoolWithTag(PagedPool, DaclLength, 'lcaD'); + Dacl = ExAllocatePoolWithTag(PagedPool, DaclLength, TAG_DACL); if (!Dacl) return STATUS_INSUFFICIENT_RESOURCES; /* Setup the ACL inside it */ @@ -1314,7 +1314,7 @@ MiCreateMemoryEvent(IN PUNICODE_STRING Name, FALSE); CleanUp: /* Free the DACL */ - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); /* Check if this is the success path */ if (NT_SUCCESS(Status)) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 6f73c28d37d..5b35860862f 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -476,7 +476,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, /* Create the DACL: we will only allow two SIDs */ Count = sizeof(ACL) + (sizeof(ACE) + RtlLengthSid(SeLocalSystemSid)) + (sizeof(ACE) + RtlLengthSid(SeAliasAdminsSid)); - Dacl = ExAllocatePoolWithTag(PagedPool, Count, 'lcaD'); + Dacl = ExAllocatePoolWithTag(PagedPool, Count, TAG_DACL); if (Dacl == NULL) { ExFreePoolWithTag(Buffer, TAG_MM); @@ -487,7 +487,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Status = RtlCreateAcl(Dacl, Count, ACL_REVISION); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -496,7 +496,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Status = RtlAddAccessAllowedAce(Dacl, ACL_REVISION, FILE_ALL_ACCESS, SeAliasAdminsSid); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -505,7 +505,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Status = RtlAddAccessAllowedAce(Dacl, ACL_REVISION, FILE_ALL_ACCESS, SeLocalSystemSid); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -514,7 +514,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Status = RtlSetDaclSecurityDescriptor(&SecurityDescriptor, TRUE, Dacl, FALSE); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -573,7 +573,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, SL_OPEN_PAGING_FILE | IO_NO_PARAMETER_CHECKING); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -590,7 +590,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ZwClose(FileHandle); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -625,7 +625,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, KeReleaseGuardedMutex(&MmPageFileCreationLock); ObDereferenceObject(FileObject); ZwClose(FileHandle); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_NOT_FOUND; } @@ -636,7 +636,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, KeReleaseGuardedMutex(&MmPageFileCreationLock); ObDereferenceObject(FileObject); ZwClose(FileHandle); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_INVALID_PARAMETER_2; } @@ -646,7 +646,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, KeReleaseGuardedMutex(&MmPageFileCreationLock); ObDereferenceObject(FileObject); ZwClose(FileHandle); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_INVALID_PARAMETER_3; } @@ -657,7 +657,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, KeReleaseGuardedMutex(&MmPageFileCreationLock); ObDereferenceObject(FileObject); ZwClose(FileHandle); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_NOT_IMPLEMENTED; } @@ -665,7 +665,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { DPRINT1("Failed creating page file: %lx\n", Status); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -676,17 +676,17 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Status = ZwSetSecurityObject(FileHandle, DACL_SECURITY_INFORMATION, &SecurityDescriptor); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Dacl, 'lcaD'); ZwClose(FileHandle); + ExFreePoolWithTag(Dacl, TAG_DACL); ExFreePoolWithTag(Buffer, TAG_MM); return Status; } } /* DACL is no longer needed, free it */ - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); - /* FIXME: To enable once page file managment is moved to ARM3 */ + /* FIXME: To enable once page file management is moved to ARM3 */ #if 0 /* Check we won't overflow commit limit with the page file */ if (MmTotalCommitLimitMaximum + (SafeMaximumSize.QuadPart >> PAGE_SHIFT) <= MmTotalCommitLimitMaximum) diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index 667815d41dc..5c829327c14 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -58,7 +58,7 @@ ObpGetDosDevicesProtection(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) sizeof(ACE) + RtlLengthSid(SeCreatorOwnerSid); /* Allocate the ACL */ - Dacl = ExAllocatePoolWithTag(PagedPool, AclSize, 'lcaD'); + Dacl = ExAllocatePoolWithTag(PagedPool, AclSize, TAG_DACL); if (Dacl == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -117,7 +117,7 @@ ObpGetDosDevicesProtection(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) sizeof(ACE) + RtlLengthSid(SeLocalSystemSid); /* Allocate the ACL */ - Dacl = ExAllocatePoolWithTag(PagedPool, AclSize, 'lcaD'); + Dacl = ExAllocatePoolWithTag(PagedPool, AclSize, TAG_DACL); if (Dacl == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -168,7 +168,7 @@ ObpFreeDosDevicesProtection(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) ASSERT(NT_SUCCESS(Status)); ASSERT(DaclPresent); ASSERT(Dacl != NULL); - ExFreePoolWithTag(Dacl, 'lcaD'); + ExFreePoolWithTag(Dacl, TAG_DACL); } CODE_SEG("INIT")

1 year, 10 months

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 November 2022