Ros-diffs March 2023

ros-diffs@reactos.org

18 participants
139 discussions

[reactos] 01/01: [MSVCRT] Follow-up of Follow-up of #5032 (f172503)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdedc549d016316819915… commit fdedc549d0163168199156df10cc7f4fd816de7d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 5 23:28:00 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Mar 5 23:28:00 2023 +0900 [MSVCRT] Follow-up of Follow-up of #5032 (f172503) Fix for system/_wsystem. Use _set_errno(ENOMEM) for malloc failure. Rename status variable as exit_code. --- sdk/lib/crt/process/_system.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sdk/lib/crt/process/_system.c b/sdk/lib/crt/process/_system.c index 2b2696e6d45..a7e3b174e56 100644 --- a/sdk/lib/crt/process/_system.c +++ b/sdk/lib/crt/process/_system.c @@ -21,11 +21,10 @@ int system(const char *command) { char *szCmdLine = NULL; char *szComSpec = NULL; - PROCESS_INFORMATION ProcessInformation; STARTUPINFOA StartupInfo; BOOL result; - int status; + int exit_code; char cmd_exe[MAX_PATH]; szComSpec = getenv("COMSPEC"); @@ -46,8 +45,8 @@ int system(const char *command) szCmdLine = malloc(1 + strlen(szComSpec) + 5 + strlen(command) + 1); if (szCmdLine == NULL) { - _dosmaperr(GetLastError()); - return -1; + _set_errno(ENOMEM); + return -1; } strcpy(szCmdLine, "\""); @@ -88,12 +87,12 @@ int system(const char *command) CloseHandle(ProcessInformation.hThread); /* Wait for the process to exit */ - _cwait(&status, (intptr_t)ProcessInformation.hProcess, 0); + _cwait(&exit_code, (intptr_t)ProcessInformation.hProcess, 0); CloseHandle(ProcessInformation.hProcess); _set_errno(0); - return status; + return exit_code; } int CDECL _wsystem(const wchar_t *cmd) @@ -103,7 +102,7 @@ int CDECL _wsystem(const wchar_t *cmd) PROCESS_INFORMATION process_info; STARTUPINFOW startup_info; BOOL result; - int status; + int exit_code; wchar_t cmd_exe[MAX_PATH]; comspec = _wgetenv(L"COMSPEC"); @@ -124,7 +123,7 @@ int CDECL _wsystem(const wchar_t *cmd) cmdline = malloc((1 + wcslen(comspec) + 5 + wcslen(cmd) + 1) * sizeof(wchar_t)); if (cmdline == NULL) { - _dosmaperr(GetLastError()); + _set_errno(ENOMEM); return -1; } @@ -167,10 +166,10 @@ int CDECL _wsystem(const wchar_t *cmd) CloseHandle(process_info.hThread); /* Wait for the process to exit */ - _cwait(&status, (intptr_t)process_info.hProcess, 0); + _cwait(&exit_code, (intptr_t)process_info.hProcess, 0); CloseHandle(process_info.hProcess); _set_errno(0); - return status; + return exit_code; }

1 year, 9 months

[reactos] 01/01: [MSVCRT] Follow-up of #5032 (f172503)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a7dbd6064e74e1ed2b88… commit 5a7dbd6064e74e1ed2b886dcd973d444d2a8dc4d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 5 23:20:12 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Mar 5 23:20:12 2023 +0900 [MSVCRT] Follow-up of #5032 (f172503) Use _cwait() instead of WaitForSingleObject and GetExitCodeProcess. Use malloc/free instead of LocalAlloc/LocalFree. --- sdk/lib/crt/process/_system.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/sdk/lib/crt/process/_system.c b/sdk/lib/crt/process/_system.c index 6ce5b117808..2b2696e6d45 100644 --- a/sdk/lib/crt/process/_system.c +++ b/sdk/lib/crt/process/_system.c @@ -14,7 +14,6 @@ #include <string.h> #include <process.h> - /* * @implemented */ @@ -26,7 +25,7 @@ int system(const char *command) PROCESS_INFORMATION ProcessInformation; STARTUPINFOA StartupInfo; BOOL result; - DWORD exit_code; + int status; char cmd_exe[MAX_PATH]; szComSpec = getenv("COMSPEC"); @@ -44,7 +43,7 @@ int system(const char *command) szComSpec = cmd_exe; } - szCmdLine = LocalAlloc(LPTR, 1 + strlen(szComSpec) + 5 + strlen(command) + 1); + szCmdLine = malloc(1 + strlen(szComSpec) + 5 + strlen(command) + 1); if (szCmdLine == NULL) { _dosmaperr(GetLastError()); @@ -78,7 +77,7 @@ int system(const char *command) NULL, &StartupInfo, &ProcessInformation); - LocalFree(szCmdLine); + free(szCmdLine); if (result == FALSE) { @@ -89,23 +88,22 @@ int system(const char *command) CloseHandle(ProcessInformation.hThread); /* Wait for the process to exit */ - WaitForSingleObject(ProcessInformation.hProcess, INFINITE); - GetExitCodeProcess(ProcessInformation.hProcess, &exit_code); + _cwait(&status, (intptr_t)ProcessInformation.hProcess, 0); CloseHandle(ProcessInformation.hProcess); _set_errno(0); - return (int)exit_code; + return status; } -int CDECL _wsystem(const wchar_t* cmd) +int CDECL _wsystem(const wchar_t *cmd) { wchar_t *cmdline = NULL; wchar_t *comspec = NULL; PROCESS_INFORMATION process_info; STARTUPINFOW startup_info; BOOL result; - DWORD exit_code; + int status; wchar_t cmd_exe[MAX_PATH]; comspec = _wgetenv(L"COMSPEC"); @@ -123,7 +121,7 @@ int CDECL _wsystem(const wchar_t* cmd) comspec = cmd_exe; } - cmdline = LocalAlloc(LPTR, (1 + wcslen(comspec) + 5 + wcslen(cmd) + 1) * sizeof(wchar_t)); + cmdline = malloc((1 + wcslen(comspec) + 5 + wcslen(cmd) + 1) * sizeof(wchar_t)); if (cmdline == NULL) { _dosmaperr(GetLastError()); @@ -158,7 +156,7 @@ int CDECL _wsystem(const wchar_t* cmd) NULL, &startup_info, &process_info); - LocalFree(cmdline); + free(cmdline); if (!result) { @@ -169,11 +167,10 @@ int CDECL _wsystem(const wchar_t* cmd) CloseHandle(process_info.hThread); /* Wait for the process to exit */ - WaitForSingleObject(process_info.hProcess, INFINITE); - GetExitCodeProcess(process_info.hProcess, &exit_code); + _cwait(&status, (intptr_t)process_info.hProcess, 0); CloseHandle(process_info.hProcess); _set_errno(0); - return (int)exit_code; + return status; }

1 year, 9 months

[reactos] 01/01: [MSVCRT][CRT_APITEST] Implement _wsystem (#5032)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f172503d57236c8388b33… commit f172503d57236c8388b334bc5ecef02ea34d4561 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 5 21:01:14 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 5 21:01:14 2023 +0900 [MSVCRT][CRT_APITEST] Implement _wsystem (#5032) Implement _wsystem(), by referring system(). Improve system(). Use WaitForSingleObject in system() and _wsystem(). Check existence of COMSPEC. Thanks ChatGPT. --- modules/rostests/apitests/crt/_wsystem.c | 72 +++++++++++ .../rostests/apitests/crt/crtdll_crt_apitest.cmake | 2 +- .../rostests/apitests/crt/msvcrt_crt_apitest.cmake | 4 +- modules/rostests/apitests/crt/system.c | 72 +++++++++++ modules/rostests/apitests/crt/testlist.c | 8 ++ sdk/lib/crt/process/_system.c | 144 ++++++++++++++------- 6 files changed, 255 insertions(+), 47 deletions(-) diff --git a/modules/rostests/apitests/crt/_wsystem.c b/modules/rostests/apitests/crt/_wsystem.c new file mode 100644 index 00000000000..1659b3ee609 --- /dev/null +++ b/modules/rostests/apitests/crt/_wsystem.c @@ -0,0 +1,72 @@ +/* + * PROJECT: ReactOS CRT + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Tests for _wsystem() + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <apitest.h> +#include <apitest_guard.h> + +START_TEST(_wsystem) +{ + int ret; + WCHAR szCmdExe[MAX_PATH]; + + GetSystemDirectoryW(szCmdExe, _countof(szCmdExe)); + lstrcatW(szCmdExe, L"\\cmd.exe"); + + SetEnvironmentVariableW(L"COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = _wsystem(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableW(L"COMSPEC", L"InvalidComSpec"); + errno = 0xDEADBEEF; + ret = _wsystem(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableW(L"COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = _wsystem(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableW(L"COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = _wsystem(L"echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableW(L"COMSPEC", L"InvalidComSpec"); + errno = 0xDEADBEEF; + ret = _wsystem(L"echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableW(L"COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = _wsystem(L"echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableW(L"COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = _wsystem(L"InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); + + SetEnvironmentVariableW(L"COMSPEC", L"InvalidComSpec"); + errno = 0xDEADBEEF; + ret = _wsystem(L"InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); + + SetEnvironmentVariableW(L"COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = _wsystem(L"InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); +} diff --git a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake index f40c603c480..c6f60ea1d56 100644 --- a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake @@ -480,7 +480,7 @@ list(APPEND SOURCE_CRTDLL # strxfrm.c # swprintf.c # swscanf.c -# system.c + system.c # tan.c # tanh.c # time.c diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake index 4677f90fbfa..919a7b01b64 100644 --- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -981,7 +981,7 @@ list(APPEND SOURCE_MSVCRT # _wstrdate_s # _wstrtime.c # _wstrtime_s -# _wsystem.c + _wsystem.c # _wtempnam.c # _wtempnam_dbg # _wtmpnam.c @@ -1189,7 +1189,7 @@ list(APPEND SOURCE_MSVCRT # swprintf_s.c # swscanf.c # swscanf_s.c -# system.c + system.c # tan.c # tanh.c # time.c diff --git a/modules/rostests/apitests/crt/system.c b/modules/rostests/apitests/crt/system.c new file mode 100644 index 00000000000..5d49a0babf1 --- /dev/null +++ b/modules/rostests/apitests/crt/system.c @@ -0,0 +1,72 @@ +/* + * PROJECT: ReactOS CRT + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Tests for system() + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <apitest.h> +#include <apitest_guard.h> + +START_TEST(system) +{ + int ret; + CHAR szCmdExe[MAX_PATH]; + + GetSystemDirectoryA(szCmdExe, _countof(szCmdExe)); + lstrcatA(szCmdExe, "\\cmd.exe"); + + SetEnvironmentVariableA("COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = system(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableA("COMSPEC", "InvalidComSpec"); + errno = 0xDEADBEEF; + ret = system(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableA("COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = system(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableA("COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = system("echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableA("COMSPEC", "InvalidComSpec"); + errno = 0xDEADBEEF; + ret = system("echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableA("COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = system("echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableA("COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = system("InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); + + SetEnvironmentVariableA("COMSPEC", "InvalidComSpec"); + errno = 0xDEADBEEF; + ret = system("InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); + + SetEnvironmentVariableA("COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = system("InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); +} diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index fd746d39011..14f0bb97ad3 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -35,10 +35,12 @@ extern void func_strcpy(void); extern void func_strlen(void); extern void func_strnlen(void); extern void func_strtoul(void); +extern void func_system(void); extern void func_wcsnlen(void); extern void func_wcstombs(void); extern void func_wcstoul(void); extern void func_wctomb(void); +extern void func__wsystem(void); extern void func___getmainargs(void); extern void func_static_construct(void); @@ -57,6 +59,12 @@ const struct test winetest_testlist[] = { "strcpy", func_strcpy }, { "strlen", func_strlen }, { "strtoul", func_strtoul }, +#if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) + { "system", func_system }, +#endif +#if defined(TEST_MSVCRT) + { "_wsystem", func__wsystem }, +#endif { "wcstoul", func_wcstoul }, { "wctomb", func_wctomb }, { "wcstombs", func_wcstombs }, diff --git a/sdk/lib/crt/process/_system.c b/sdk/lib/crt/process/_system.c index 6d879fce591..6ce5b117808 100644 --- a/sdk/lib/crt/process/_system.c +++ b/sdk/lib/crt/process/_system.c @@ -4,6 +4,7 @@ * FILE: lib/sdk/crt/process/_system.c * PURPOSE: Excutes a shell command * PROGRAMER: Ariadne + * Katayama Hirofumi MZ * UPDATE HISTORY: * 04/03/99: Created */ @@ -24,70 +25,48 @@ int system(const char *command) PROCESS_INFORMATION ProcessInformation; STARTUPINFOA StartupInfo; - char *s; BOOL result; - - int nStatus; + DWORD exit_code; + char cmd_exe[MAX_PATH]; szComSpec = getenv("COMSPEC"); // system should return 0 if command is null and the shell is found if (command == NULL) { - if (szComSpec == NULL) - return 0; - else - return 1; + return (szComSpec == NULL) ? 0 : 1; } - if (szComSpec == NULL) - return -1; - -// should return 127 or 0 ( MS ) if the shell is not found -// _set_errno(ENOENT); - - if (szComSpec == NULL) + if (!szComSpec || GetFileAttributesA(szComSpec) == INVALID_FILE_ATTRIBUTES) { - szComSpec = "cmd.exe"; + GetSystemDirectoryA(cmd_exe, _countof(cmd_exe)); + strcat(cmd_exe, "\\cmd.exe"); + szComSpec = cmd_exe; } - /* split the path from shell command */ - s = max(strrchr(szComSpec, '\\'), strrchr(szComSpec, '/')); - if (s == NULL) - s = szComSpec; - else - s++; - - szCmdLine = malloc(strlen(s) + 4 + strlen(command) + 1); + szCmdLine = LocalAlloc(LPTR, 1 + strlen(szComSpec) + 5 + strlen(command) + 1); if (szCmdLine == NULL) { - _set_errno(ENOMEM); + _dosmaperr(GetLastError()); return -1; } - strcpy(szCmdLine, s); - s = strrchr(szCmdLine, '.'); - if (s) - *s = 0; - strcat(szCmdLine, " /C "); + strcpy(szCmdLine, "\""); + strcat(szCmdLine, szComSpec); + strcat(szCmdLine, "\" /C "); strcat(szCmdLine, command); //command file has invalid format ENOEXEC - memset (&StartupInfo, 0, sizeof(StartupInfo)); + memset(&StartupInfo, 0, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpReserved= NULL; StartupInfo.dwFlags = STARTF_USESHOWWINDOW; StartupInfo.wShowWindow = SW_SHOWDEFAULT; - StartupInfo.lpReserved2 = NULL; - StartupInfo.cbReserved2 = 0; - -// According to ansi standards the new process should ignore SIGINT and SIGQUIT -// In order to disable ctr-c the process is created with CREATE_NEW_PROCESS_GROUP, -// thus SetConsoleCtrlHandler(NULL,TRUE) is made on behalf of the new process. +// In order to disable Ctrl+C, the process is created with CREATE_NEW_PROCESS_GROUP. +// Thus, SetConsoleCtrlHandler(NULL, TRUE) is made on behalf of the new process. -//SIGCHILD should be blocked aswell +//SIGCHILD should be blocked as well result = CreateProcessA(szComSpec, szCmdLine, @@ -99,7 +78,7 @@ int system(const char *command) NULL, &StartupInfo, &ProcessInformation); - free(szCmdLine); + LocalFree(szCmdLine); if (result == FALSE) { @@ -109,15 +88,92 @@ int system(const char *command) CloseHandle(ProcessInformation.hThread); -// system should wait untill the calling process is finished - _cwait(&nStatus,(intptr_t)ProcessInformation.hProcess,0); + /* Wait for the process to exit */ + WaitForSingleObject(ProcessInformation.hProcess, INFINITE); + GetExitCodeProcess(ProcessInformation.hProcess, &exit_code); + CloseHandle(ProcessInformation.hProcess); - return nStatus; + _set_errno(0); + return (int)exit_code; } int CDECL _wsystem(const wchar_t* cmd) { - FIXME("_wsystem stub\n"); - return -1; + wchar_t *cmdline = NULL; + wchar_t *comspec = NULL; + PROCESS_INFORMATION process_info; + STARTUPINFOW startup_info; + BOOL result; + DWORD exit_code; + wchar_t cmd_exe[MAX_PATH]; + + comspec = _wgetenv(L"COMSPEC"); + + /* _wsystem should return 0 if cmd is null and the shell is found */ + if (cmd == NULL) + { + return (comspec == NULL) ? 0 : 1; + } + + if (comspec == NULL || GetFileAttributesW(comspec) == INVALID_FILE_ATTRIBUTES) + { + GetSystemDirectoryW(cmd_exe, _countof(cmd_exe)); + wcscat(cmd_exe, L"\\cmd.exe"); + comspec = cmd_exe; + } + + cmdline = LocalAlloc(LPTR, (1 + wcslen(comspec) + 5 + wcslen(cmd) + 1) * sizeof(wchar_t)); + if (cmdline == NULL) + { + _dosmaperr(GetLastError()); + return -1; + } + + wcscpy(cmdline, L"\""); + wcscat(cmdline, comspec); + wcscat(cmdline, L"\" /C "); + wcscat(cmdline, cmd); + + /* command file has invalid format ENOEXEC */ + + memset(&startup_info, 0, sizeof(startup_info)); + startup_info.cb = sizeof(startup_info); + startup_info.dwFlags = STARTF_USESHOWWINDOW; + startup_info.wShowWindow = SW_SHOWDEFAULT; + + /* In order to disable Ctrl+C, the process is created with CREATE_NEW_PROCESS_GROUP. + Thus, SetConsoleCtrlHandler(NULL, TRUE) is made on behalf of the new process. */ + + /* SIGCHILD should be blocked as well */ + + /* Create the process to execute the command */ + result = CreateProcessW(comspec, + cmdline, + NULL, + NULL, + TRUE, + CREATE_NEW_PROCESS_GROUP, + NULL, + NULL, + &startup_info, + &process_info); + LocalFree(cmdline); + + if (!result) + { + _dosmaperr(GetLastError()); + return -1; + } + + CloseHandle(process_info.hThread); + + /* Wait for the process to exit */ + WaitForSingleObject(process_info.hProcess, INFINITE); + GetExitCodeProcess(process_info.hProcess, &exit_code); + + CloseHandle(process_info.hProcess); + + _set_errno(0); + return (int)exit_code; }

1 year, 9 months

[reactos] 01/01: [MSPAINT] Treat as a file even if the bitmap file is empty

by Atharva Kulkarni

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72974d2bac6f2802d7f23… commit 72974d2bac6f2802d7f232c848573996cd99c9f0 Author: Atharva Kulkarni <atharvak1910(a)gmail.com> AuthorDate: Sun Mar 5 17:23:38 2023 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 5 20:53:38 2023 +0900 [MSPAINT] Treat as a file even if the bitmap file is empty CORE-18508 --- base/applications/mspaint/dib.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 01c23fa84bf..529d7c91ee4 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -118,7 +118,6 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL i fileHPPM = fileVPPM = 2834; ZeroMemory(&fileTime, sizeof(fileTime)); - isFile = FALSE; } else {

1 year, 9 months

[reactos] 01/01: [NTUSER][USER32] Refactor NtUserLoadKeyboardLayoutEx (#5107)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77e6348f5fce69070852d… commit 77e6348f5fce69070852df0e516f649012930d30 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 5 11:41:32 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 5 11:41:32 2023 +0900 [NTUSER][USER32] Refactor NtUserLoadKeyboardLayoutEx (#5107) - Split some code of NtUserLoadKeyboardLayoutEx to newly-added co_IntLoadKeyboardLayoutEx helper function. - Modify NtUserLoadKeyboardLayoutEx prototype. - Move co_UserImmLoadLayout code. - Implement KLF_REORDER. - Rename UserLoadKbdLayout as co_UserLoadKbdLayout. - Improve LoadKeyboardLayoutEx. CORE-11700 --- win32ss/include/ntuser.h | 8 +- win32ss/user/ntuser/kbdlayout.c | 257 ++++++++++++++++++++++-------------- win32ss/user/user32/windows/input.c | 10 +- 3 files changed, 165 insertions(+), 110 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index cd7fcdf7034..656d3b443fa 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -2736,12 +2736,12 @@ NtUserKillTimer( HKL NTAPI NtUserLoadKeyboardLayoutEx( - IN HANDLE Handle, + IN HANDLE hFile, IN DWORD offTable, - IN PUNICODE_STRING puszKeyboardName, - IN HKL hKL, + IN PVOID pTables, + IN HKL hOldKL, IN PUNICODE_STRING puszKLID, - IN DWORD dwKLID, + IN DWORD dwNewKL, IN UINT Flags); BOOL diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index 6ce1523d208..9a5c43d60a4 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -369,12 +369,12 @@ cleanup: } /* - * UserLoadKbdLayout + * co_UserLoadKbdLayout * * Loads keyboard layout and creates KL object */ static PKL -UserLoadKbdLayout(PUNICODE_STRING pustrKLID, HKL hKL) +co_UserLoadKbdLayout(PUNICODE_STRING pustrKLID, HKL hKL) { LCID lCid; CHARSETINFO cs; @@ -846,6 +846,129 @@ IntUnloadKeyboardLayout(_Inout_ PWINSTATION_OBJECT pWinSta, _In_ HKL hKL) return co_IntUnloadKeyboardLayoutEx(pWinSta, pKL, 0); } +PIMEINFOEX FASTCALL co_UserImmLoadLayout(_In_ HKL hKL) +{ + PIMEINFOEX piiex; + + if (!IS_IME_HKL(hKL) && !IS_CICERO_MODE()) + return NULL; + + piiex = ExAllocatePoolWithTag(PagedPool, sizeof(IMEINFOEX), USERTAG_IME); + if (!piiex) + return NULL; + + if (!co_ClientImmLoadLayout(hKL, piiex)) + { + ExFreePoolWithTag(piiex, USERTAG_IME); + return NULL; + } + + return piiex; +} + +HKL APIENTRY +co_IntLoadKeyboardLayoutEx( + IN OUT PWINSTATION_OBJECT pWinSta, + IN HANDLE hSafeFile, + IN HKL hOldKL, + IN PUNICODE_STRING puszSafeKLID, + IN HKL hNewKL, + IN UINT Flags) +{ + PKL pOldKL, pNewKL; + + UNREFERENCED_PARAMETER(hSafeFile); + + if (hNewKL == NULL || (pWinSta->Flags & WSS_NOIO)) + return NULL; + + /* If hOldKL is specified, unload it and load new layput as default */ + if (hOldKL && hOldKL != hNewKL) + { + pOldKL = UserHklToKbl(hOldKL); + if (pOldKL) + UserUnloadKbl(pOldKL); + } + + /* FIXME: It seems KLF_RESET is only supported for WINLOGON */ + + /* Let's see if layout was already loaded. */ + pNewKL = UserHklToKbl(hNewKL); + if (!pNewKL) + { + /* It wasn't, so load it. */ + pNewKL = co_UserLoadKbdLayout(puszSafeKLID, hNewKL); + if (!pNewKL) + return NULL; + + if (gspklBaseLayout) + { + /* Find last not unloaded layout */ + PKL pLastKL = gspklBaseLayout->pklPrev; + while (pLastKL != gspklBaseLayout && (pLastKL->dwKL_Flags & KLF_UNLOAD)) + pLastKL = pLastKL->pklPrev; + + /* Add new layout to the list */ + pNewKL->pklNext = pLastKL->pklNext; + pNewKL->pklPrev = pLastKL; + pNewKL->pklNext->pklPrev = pNewKL; + pNewKL->pklPrev->pklNext = pNewKL; + } + else + { + /* This is the first layout */ + pNewKL->pklNext = pNewKL; + pNewKL->pklPrev = pNewKL; + gspklBaseLayout = pNewKL; + } + + pNewKL->piiex = co_UserImmLoadLayout(hNewKL); + } + + /* If this layout was prepared to unload, undo it */ + pNewKL->dwKL_Flags &= ~KLF_UNLOAD; + + /* Reorder if necessary */ + if (Flags & KLF_REORDER) + IntReorderKeyboardLayouts(pWinSta, pNewKL); + + /* Activate this layout in current thread */ + if (Flags & KLF_ACTIVATE) + co_UserActivateKbl(PsGetCurrentThreadWin32Thread(), pNewKL, Flags); + + /* Send shell message */ + if (!(Flags & KLF_NOTELLSHELL)) + co_IntShellHookNotify(HSHELL_LANGUAGE, 0, (LPARAM)hNewKL); + + /* FIXME: KLF_REPLACELANG */ + + return hNewKL; +} + +HANDLE FASTCALL IntVerifyKeyboardFileHandle(HANDLE hFile) +{ + PFILE_OBJECT FileObject; + NTSTATUS Status; + + if (hFile == INVALID_HANDLE_VALUE) + return NULL; + + Status = ObReferenceObjectByHandle(hFile, FILE_READ_DATA, NULL, UserMode, + (PVOID*)&FileObject, NULL); + if (!NT_SUCCESS(Status)) + { + ERR("0x%08X\n", Status); + return NULL; + } + + /* FIXME: Is the file in the system directory? */ + + if (FileObject) + ObDereferenceObject(FileObject); + + return hFile; +} + /* EXPORTS *******************************************************************/ /* @@ -1009,50 +1132,34 @@ cleanup: return bRet; } -/* Win: xxxImmLoadLayout */ -PIMEINFOEX FASTCALL co_UserImmLoadLayout(_In_ HKL hKL) -{ - PIMEINFOEX piiex; - - if (!IS_IME_HKL(hKL) && !IS_CICERO_MODE()) - return NULL; - - piiex = ExAllocatePoolWithTag(PagedPool, sizeof(IMEINFOEX), USERTAG_IME); - if (!piiex) - return NULL; - - if (!co_ClientImmLoadLayout(hKL, piiex)) - { - ExFreePoolWithTag(piiex, USERTAG_IME); - return NULL; - } - - return piiex; -} - /* * NtUserLoadKeyboardLayoutEx * * Loads keyboard layout with given locale id * - * NOTE: We adopt a different design from Microsoft's one for security reason. - * We don't use the 1st and 3rd parameters of NtUserLoadKeyboardLayoutEx. + * NOTE: We adopt a different design from Microsoft's one due to security reason. + * We don't use the 3rd parameter of NtUserLoadKeyboardLayoutEx. + * See https://bugtraq.securityfocus.com/detail/50056B96.6040306 */ HKL -APIENTRY +NTAPI NtUserLoadKeyboardLayoutEx( - IN HANDLE Handle, // hFile (See downloads.securityfocus.com/vulnerabilities/exploits/43774.c) - IN DWORD offTable, // Offset to KbdTables - IN PUNICODE_STRING puszKeyboardName, // Not used? - IN HKL hklUnload, - IN PUNICODE_STRING pustrKLID, - IN DWORD hkl, + IN HANDLE hFile, + IN DWORD offTable, + IN PVOID pTables, + IN HKL hOldKL, + IN PUNICODE_STRING puszKLID, + IN DWORD dwNewKL, IN UINT Flags) { - HKL hklRet = NULL; - PKL pKl = NULL, pklLast; + HKL hRetKL; WCHAR Buffer[KL_NAMELENGTH]; - UNICODE_STRING ustrSafeKLID; + UNICODE_STRING uszSafeKLID; + PWINSTATION_OBJECT pWinSta; + HANDLE hSafeFile; + + UNREFERENCED_PARAMETER(offTable); + UNREFERENCED_PARAMETER(pTables); if (Flags & ~(KLF_ACTIVATE|KLF_NOTELLSHELL|KLF_REORDER|KLF_REPLACELANG| KLF_SUBSTITUTE_OK|KLF_SETFORPROCESS|KLF_UNLOADPREVIOUS| @@ -1063,14 +1170,12 @@ NtUserLoadKeyboardLayoutEx( return NULL; } - /* FIXME: It seems KLF_RESET is only supported for WINLOGON */ - - RtlInitEmptyUnicodeString(&ustrSafeKLID, Buffer, sizeof(Buffer)); + RtlInitEmptyUnicodeString(&uszSafeKLID, Buffer, sizeof(Buffer)); _SEH2_TRY { - ProbeForRead(pustrKLID, sizeof(*pustrKLID), 1); - ProbeForRead(pustrKLID->Buffer, sizeof(pustrKLID->Length), 1); - RtlCopyUnicodeString(&ustrSafeKLID, pustrKLID); + ProbeForRead(puszKLID, sizeof(*puszKLID), 1); + ProbeForRead(puszKLID->Buffer, sizeof(puszKLID->Length), 1); + RtlCopyUnicodeString(&uszSafeKLID, puszKLID); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1081,67 +1186,19 @@ NtUserLoadKeyboardLayoutEx( UserEnterExclusive(); - /* If hklUnload is specified, unload it and load new layput as default */ - if (hklUnload && (hklUnload != UlongToHandle(hkl))) - { - pKl = UserHklToKbl(hklUnload); - if (pKl) - UserUnloadKbl(pKl); - } - - /* Let's see if layout was already loaded. */ - pKl = UserHklToKbl(UlongToHandle(hkl)); - if (!pKl) - { - /* It wasn't, so load it. */ - pKl = UserLoadKbdLayout(&ustrSafeKLID, UlongToHandle(hkl)); - if (!pKl) - goto cleanup; - - if (gspklBaseLayout) - { - /* Find last not unloaded layout */ - pklLast = gspklBaseLayout->pklPrev; - while (pklLast != gspklBaseLayout && pklLast->dwKL_Flags & KLF_UNLOAD) - pklLast = pklLast->pklPrev; - - /* Add new layout to the list */ - pKl->pklNext = pklLast->pklNext; - pKl->pklPrev = pklLast; - pKl->pklNext->pklPrev = pKl; - pKl->pklPrev->pklNext = pKl; - } - else - { - /* This is the first layout */ - pKl->pklNext = pKl; - pKl->pklPrev = pKl; - gspklBaseLayout = pKl; - } - - pKl->piiex = co_UserImmLoadLayout(UlongToHandle(hkl)); - } - - /* If this layout was prepared to unload, undo it */ - pKl->dwKL_Flags &= ~KLF_UNLOAD; - - /* Activate this layout in current thread */ - if (Flags & KLF_ACTIVATE) - co_UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKl, Flags); - - /* Send shell message */ - if (!(Flags & KLF_NOTELLSHELL)) - co_IntShellHookNotify(HSHELL_LANGUAGE, 0, (LPARAM)hkl); - - /* Return hkl on success */ - hklRet = UlongToHandle(hkl); - - /* FIXME: KLF_REPLACELANG - KLF_REORDER */ + hSafeFile = (hFile ? IntVerifyKeyboardFileHandle(hFile) : NULL); + pWinSta = IntGetProcessWindowStation(NULL); + hRetKL = co_IntLoadKeyboardLayoutEx(pWinSta, + hSafeFile, + hOldKL, + &uszSafeKLID, + (HKL)(DWORD_PTR)dwNewKL, + Flags); + if (hSafeFile) + ZwClose(hSafeFile); -cleanup: UserLeave(); - return hklRet; + return hRetKL; } /* diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index d3b7e114ba9..48b18b069da 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -721,9 +721,9 @@ VOID GetSystemLibraryPath(LPWSTR pszPath, INT cchPath, LPCWSTR pszFileName) /* * @unimplemented * - * NOTE: We adopt a different design from Microsoft's one for security reason. + * NOTE: We adopt a different design from Microsoft's one due to security reason. + * See NtUserLoadKeyboardLayoutEx. */ -/* Win: LoadKeyboardLayoutWorker */ HKL APIENTRY IntLoadKeyboardLayout( _In_ HKL hklUnload, @@ -733,7 +733,6 @@ IntLoadKeyboardLayout( _In_ BOOL unknown5) { DWORD dwKLID, dwHKL, dwType, dwSize; - UNICODE_STRING ustrKbdName; UNICODE_STRING ustrKLID; WCHAR wszRegKey[256] = L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\"; WCHAR wszLayoutId[10], wszNewKLID[KL_NAMELENGTH], szImeFileName[80]; @@ -807,7 +806,7 @@ IntLoadKeyboardLayout( szImeFileName[_countof(szImeFileName) - 1] = UNICODE_NULL; GetSystemLibraryPath(szPath, _countof(szPath), szImeFileName); - /* We don't allow the invalid "IME File" values for security reason */ + /* We don't allow the invalid "IME File" values due to security reason */ if (dwType != REG_SZ || szImeFileName[0] == 0 || wcscspn(szImeFileName, L":\\/") != wcslen(szImeFileName) || GetFileAttributesW(szPath) == INVALID_FILE_ATTRIBUTES) /* Does not exist? */ @@ -833,9 +832,8 @@ IntLoadKeyboardLayout( dwHKL = MAKELONG(wLow, wHigh); - ZeroMemory(&ustrKbdName, sizeof(ustrKbdName)); RtlInitUnicodeString(&ustrKLID, pwszKLID); - hNewKL = NtUserLoadKeyboardLayoutEx(NULL, 0, &ustrKbdName, NULL, &ustrKLID, dwHKL, Flags); + hNewKL = NtUserLoadKeyboardLayoutEx(NULL, 0, NULL, hklUnload, &ustrKLID, dwHKL, Flags); CliImmInitializeHotKeys(SETIMEHOTKEY_ADD, hNewKL); return hNewKL; }

1 year, 9 months

[reactos] 01/01: [SDK] Improve gen_baseaddress.py and its output files (#4964)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fb580a8553e1028fb942… commit 0fb580a8553e1028fb942ed8c061f9cd88d319e9 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sat Mar 4 11:45:06 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 4 11:45:06 2023 +0100 [SDK] Improve gen_baseaddress.py and its output files (#4964) * [SDK:TOOLS] Improve gen_baseaddress.py Adds some kbd layout modules into the excludes-section: that we do lack for todays master: e.g._ kbdeo, kbdsf, kbdrost and also some that we lacked in the past (for improving backwards compatibility of the script to older rls-branches): kbdgm, kbdes, kbdgrist, kbdja, kbdko, kbdsk, kbdsk1 * [SDK:CMAKE] Highlight in the output files where the script does misbehave --- sdk/cmake/baseaddress.cmake | 8 ++++---- sdk/cmake/baseaddress_dwarf.cmake | 6 +++--- sdk/cmake/baseaddress_msvc.cmake | 6 +++--- sdk/cmake/baseaddress_msvc_x64.cmake | 4 ++-- sdk/tools/gen_baseaddress.py | 10 ++++++++++ 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake index dbaad8bb9ba..02ad613b9b9 100644 --- a/sdk/cmake/baseaddress.cmake +++ b/sdk/cmake/baseaddress.cmake @@ -181,9 +181,9 @@ set(baseaddress_itss 0x745e0000) set(baseaddress_joy 0x745a0000) set(baseaddress_jscript 0x74400000) set(baseaddress_jsproxy 0x743d0000) -set(baseaddress_kbdeo 0x743b0000) -set(baseaddress_kbdrost 0x74390000) -set(baseaddress_kbdsf 0x74370000) +#set(baseaddress_kbdeo 0x743b0000) #unwanted, should vanish when rerunning the script +#set(baseaddress_kbdrost 0x74390000) #unwanted, should vanish when rerunning the script +#set(baseaddress_kbdsf 0x74370000) #unwanted, should vanish when rerunning the script set(baseaddress_kbsdll 0x74340000) set(baseaddress_kernel32_vista 0x74320000) set(baseaddress_ksuser 0x742f0000) @@ -196,7 +196,7 @@ set(baseaddress_load_notifications 0x73cd0000) set(baseaddress_loadperf 0x73ca0000) set(baseaddress_localmon 0x73c40000) set(baseaddress_localspl 0x73b50000) -set(baseaddress_localspl_apitest 0x73b20000) +set(baseaddress_localspl_apitest.dll 0x73b20000) #module name corrected manually set(baseaddress_localui 0x73ad0000) set(baseaddress_lpk 0x73aa0000) set(baseaddress_lsasrv 0x73a20000) diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake index 00b8d491251..3ddc970ad77 100644 --- a/sdk/cmake/baseaddress_dwarf.cmake +++ b/sdk/cmake/baseaddress_dwarf.cmake @@ -177,8 +177,8 @@ set(baseaddress_itss 0x738e0000) set(baseaddress_joy 0x73890000) set(baseaddress_jscript 0x735b0000) set(baseaddress_jsproxy 0x73560000) -set(baseaddress_kbdeo 0x73540000) -set(baseaddress_kbdrost 0x73520000) +#set(baseaddress_kbdeo 0x73540000) #unwanted, should vanish when rerunning the script +#set(baseaddress_kbdrost 0x73520000) #unwanted, should vanish when rerunning the script set(baseaddress_kbsdll 0x734f0000) set(baseaddress_kernel32_vista 0x734c0000) set(baseaddress_ksuser 0x73490000) @@ -191,7 +191,7 @@ set(baseaddress_load_notifications 0x72b70000) set(baseaddress_loadperf 0x72b30000) set(baseaddress_localmon 0x72ae0000) set(baseaddress_localspl 0x72a60000) -set(baseaddress_localspl_apitest 0x72a20000) +set(baseaddress_localspl_apitest.dll 0x72a20000) #module name corrected manually set(baseaddress_localui 0x729e0000) set(baseaddress_lpk 0x72990000) set(baseaddress_lsasrv 0x728d0000) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index a4dee3b4993..13860cfef0c 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -177,8 +177,8 @@ set(baseaddress_itss 0x78080000) set(baseaddress_joy 0x78040000) set(baseaddress_jscript 0x77f90000) set(baseaddress_jsproxy 0x77f70000) -set(baseaddress_kbdeo 0x77f50000) -set(baseaddress_kbdrost 0x77f30000) +#set(baseaddress_kbdeo 0x77f50000) #unwanted, should vanish when rerunning the script +#set(baseaddress_kbdrost 0x77f30000) #unwanted, should vanish when rerunning the script set(baseaddress_kbsdll 0x77f10000) set(baseaddress_kernel32_vista 0x77ef0000) set(baseaddress_ksuser 0x77ed0000) @@ -191,7 +191,7 @@ set(baseaddress_load_notifications 0x77bf0000) set(baseaddress_loadperf 0x77bd0000) set(baseaddress_localmon 0x77bb0000) set(baseaddress_localspl 0x77b80000) -set(baseaddress_localspl_apitest 0x77b60000) +set(baseaddress_localspl_apitest.dll 0x77b60000) #module name corrected manually set(baseaddress_localui 0x77b30000) set(baseaddress_lpk 0x779f0000) set(baseaddress_lsasrv 0x77990000) diff --git a/sdk/cmake/baseaddress_msvc_x64.cmake b/sdk/cmake/baseaddress_msvc_x64.cmake index a9a251aef1d..3f69f4e018f 100644 --- a/sdk/cmake/baseaddress_msvc_x64.cmake +++ b/sdk/cmake/baseaddress_msvc_x64.cmake @@ -174,7 +174,7 @@ set(baseaddress_itss 0x7FF19500000) set(baseaddress_joy 0x7FF19000000) set(baseaddress_jscript 0x7FF18500000) # 000A4000 set(baseaddress_jsproxy 0x7FF17500000) -set(baseaddress_kbdeo 0x7FF17000000) +#set(baseaddress_kbdeo 0x7FF17000000) #unwanted, should vanish when rerunning the script set(baseaddress_kbsdll 0x7FF16500000) set(baseaddress_kernel32_vista 0x7FF15500000) set(baseaddress_ksuser 0x7FF14500000) @@ -187,7 +187,7 @@ set(baseaddress_load_notifications 0x7FF10000000) set(baseaddress_loadperf 0x7FF0F500000) set(baseaddress_localmon 0x7FF0F000000) set(baseaddress_localspl 0x7FF0E500000) -set(baseaddress_localspl_apitest 0x7FF0E000000) +set(baseaddress_localspl_apitest.dll 0x7FF0E000000) #module name corrected manually set(baseaddress_localui 0x7FF0D500000) set(baseaddress_lpk 0x7FF0C500000) set(baseaddress_lsasrv 0x7FF0B500000) diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py index 51e89d0870d..e7a691424da 100644 --- a/sdk/tools/gen_baseaddress.py +++ b/sdk/tools/gen_baseaddress.py @@ -120,6 +120,7 @@ EXCLUDE = ( 'kbdazel.dll', 'kbdbe.dll', 'kbdbga.dll', + 'kbdbgm.dll', 'kbdbgt.dll', 'kbdblr.dll', 'kbdbr.dll', @@ -131,6 +132,8 @@ EXCLUDE = ( 'kbdcz1.dll', 'kbdda.dll', 'kbddv.dll', + 'kbdeo.dll', + 'kbdes.dll', 'kbdest.dll', 'kbdfc.dll', 'kbdfi.dll', @@ -140,6 +143,7 @@ EXCLUDE = ( 'kbdgneo.dll', 'kbdgr.dll', 'kbdgr1.dll', + 'kbdgrist.dll', 'kbdhe.dll', 'kbdheb.dll', 'kbdhu.dll', @@ -151,8 +155,10 @@ EXCLUDE = ( 'kbdinmal.dll', 'kbdir.dll', 'kbdit.dll', + 'kbdja.dll', 'kbdjpn.dll', 'kbdkaz.dll', + 'kbdko.dll', 'kbdkor.dll', 'kbdla.dll', 'kbdlt1.dll', @@ -164,9 +170,13 @@ EXCLUDE = ( 'kbdpl1.dll', 'kbdpo.dll', 'kbdro.dll', + 'kbdrost.dll', 'kbdru.dll', 'kbdru1.dll', + 'kbdsf.dll', 'kbdsg.dll', + 'kbdsk.dll', + 'kbdsk1.dll', 'kbdsl.dll', 'kbdsl1.dll', 'kbdsp.dll',

1 year, 9 months

[reactos] 01/01: [CMDUTILS] Add Italian (it-IT) translation for WHERE command

by Carlo Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d57c6c91cdf2854b73b9… commit 6d57c6c91cdf2854b73b9696cd45f41322449368 Author: Carlo Bramini <30959007+carlo-bramini(a)users.noreply.github.com> AuthorDate: Thu Feb 23 10:57:28 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Mar 1 22:05:04 2023 +0100 [CMDUTILS] Add Italian (it-IT) translation for WHERE command --- base/applications/cmdutils/where/lang/it-IT.rc | 61 ++++++++++++++++++++++++++ base/applications/cmdutils/where/where.rc | 3 ++ 2 files changed, 64 insertions(+) diff --git a/base/applications/cmdutils/where/lang/it-IT.rc b/base/applications/cmdutils/where/lang/it-IT.rc new file mode 100644 index 00000000000..d98e722b157 --- /dev/null +++ b/base/applications/cmdutils/where/lang/it-IT.rc @@ -0,0 +1,61 @@ +/* + * PROJECT: ReactOS WHERE command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Italian resource file + * TRANSLATOR: Copyright 2023 Carlo Bramini + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Sintassi: WHERE [opzioni] criteri...\n\ +\n\ +Descrizione:\n\ + Visualizza il percorso dei file corrispondenti ai criteri di ricerca.\n\ + Per impostazione predefinita, questo strumento esegue la ricerca\n\ + utilizzando i criteri e i percorsi della variabile d'ambiente PATH.\n\ +\n\ +Opzioni:\n\ + /F Visualizza tutti i file corrispondenti tra virgolette.\n\ + /Q Effettua la ricerca senza visualizzare l'elenco dei file e\n\ + i messaggi.\n\ + /R dir Avvia la ricerca dalla directory specificata ed esegue la ricerca\n\ + in modo ricorsivo.\n\ + /T Visualizza la dimensione dei file e la data dell'ultima modifica\n\ + di tutti di file corrispondenti ai criteri di ricerca.\n\ + criteri Specifica i criteri di ricerca per i file. I caratteri jolly * e ?\n\ + possono essere usati per la ricerca.\n\ + Anche i formati ""$env:pattern"" e ""path:pattern"" possono essere\n\ + utilizzati, dove ""env"" rappresenta una variabile d'ambiente\n\ + che contiene i percorsi di ricerca. Non usare questi formati con\n\ + l'opzione /R. La ricerca viene eseguita anche aggiungendo\n\ + l'estensione della variabile PATHEXT allo schema.\n\ + /? Visualizza questo messaggio.\n\ +\n\ +NOTA: Questo strumento ritorna un livello di errore 0 se la ricerca viene\n\ + completata con dei file trovati, 1 se nessun file corrisponde ai criteri\n\ + oppure 2 se si verifica un errore.\n\ +\n\ +Esempi:\n\ + WHERE myfile*.exe\n\ + WHERE /F /T mspaint\n\ + WHERE $WINDIR:notepad myfile???\n\ + WHERE C:\\ReactOS;C:\\ReactOS\\system32:exp*.exe\n\ + WHERE /R ""C:\\Program Files"" *.dll\n" + + IDS_BAD_ARG "ERRORE: argomento non valido - '%ls'.\n" + IDS_NOT_FOUND "INFO: Impossibile trovare i file per i criteri specificati.\n" + IDS_FILE_INFO "%10I64u %-12ls %-12ls %ls\n" + IDS_WANT_VALUE "ERRORE: Valore necessario per '%ls'.\n" + IDS_TYPE_HELP "Digitare ""WHERE /?"" per la guida di utilizzo.\n" + IDS_ENVPAT_WITH_R "ERRORE: ""$env:pattern"" non utilizzabile con /R.\n" + IDS_PATHPAT_WITH_R "ERRORE: formato ""path:pattern"" non utilizzabile con /R.\n" + IDS_BAD_PATHPAT "ERRORE: criteri errati specificati in ""path:pattern"".\n" + IDS_OUTOFMEMORY "ERRORE: Memoria esaurita.\n" + IDS_BAD_ENVVAR "ERRORE: variabile d'ambiente ""%ls"" non trovata.\n" + IDS_CANT_FOUND "ERRORE: il sistema non ha trovato il file specificato.\n" + IDS_BAD_DIR "ERRORE: percorso specificato non valido.\n" + IDS_BAD_NAME "ERRORE: il nome del file, il nome della directory o la sintassi del nome del volume sono errati.\n" + IDS_TOO_MANY "ERRORE: opzione '%ls' non consentita oltre '%u' volte.\n" +END diff --git a/base/applications/cmdutils/where/where.rc b/base/applications/cmdutils/where/where.rc index b3593949726..115d90a45b6 100644 --- a/base/applications/cmdutils/where/where.rc +++ b/base/applications/cmdutils/where/where.rc @@ -14,6 +14,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif

1 year, 9 months

[reactos] 01/01: [NOTEPAD] Don't reset Find/Replace if lpstrFindWhat is set (#5104)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8c7bd6898ec15bb8420b… commit f8c7bd6898ec15bb8420b7c7a2683759b67ddcd7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Mar 1 20:17:27 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 1 20:17:27 2023 +0900 [NOTEPAD] Don't reset Find/Replace if lpstrFindWhat is set (#5104) We don't want to reset the status of the checkboxes even if the Find/Replace dialog was closed. If lpstrFindWhat is set, do not reset the Find/Replace settings at DIALOG_SearchDialog. CORE-18837 --- base/applications/notepad/dialog.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 72bb17a88dd..0d4272b1bb5 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -1048,15 +1048,17 @@ static VOID DIALOG_SearchDialog(FINDPROC pfnProc) return; } - ZeroMemory(&Globals.find, sizeof(Globals.find)); - Globals.find.lStructSize = sizeof(Globals.find); - Globals.find.hwndOwner = Globals.hMainWnd; - Globals.find.hInstance = Globals.hInstance; - Globals.find.lpstrFindWhat = Globals.szFindText; - Globals.find.wFindWhatLen = ARRAY_SIZE(Globals.szFindText); - Globals.find.lpstrReplaceWith = Globals.szReplaceText; - Globals.find.wReplaceWithLen = ARRAY_SIZE(Globals.szReplaceText); - Globals.find.Flags = FR_DOWN; + if (!Globals.find.lpstrFindWhat) + { + ZeroMemory(&Globals.find, sizeof(Globals.find)); + Globals.find.lStructSize = sizeof(Globals.find); + Globals.find.hwndOwner = Globals.hMainWnd; + Globals.find.lpstrFindWhat = Globals.szFindText; + Globals.find.wFindWhatLen = ARRAY_SIZE(Globals.szFindText); + Globals.find.lpstrReplaceWith = Globals.szReplaceText; + Globals.find.wReplaceWithLen = ARRAY_SIZE(Globals.szReplaceText); + Globals.find.Flags = FR_DOWN; + } /* We only need to create the modal FindReplace dialog which will */ /* notify us of incoming events using hMainWnd Window Messages */

1 year, 9 months

[reactos] 01/01: [NOTEPAD] Fix NOTEPAD_FindTextAt (#5103)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c7233e01587afde3d7b5… commit 8c7233e01587afde3d7b53961857dc8a1454a411 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Mar 1 19:57:10 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 1 19:57:10 2023 +0900 [NOTEPAD] Fix NOTEPAD_FindTextAt (#5103) The whole-word search of Notepad had a bug around punctuation. For example, the text "Windows" didn't match in the text "MS-DOS,Windows,ReactOS". Use _istalnum instead of _istspace. Fix the position to check. _istalnum matches an alphabet letter or numeric digit. CORE-18837 --- base/applications/notepad/main.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index 52370736318..f4312159731 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -109,30 +109,36 @@ static int NOTEPAD_MenuCommand(WPARAM wParam) */ static BOOL -NOTEPAD_FindTextAt(FINDREPLACE *pFindReplace, LPCTSTR pszText, int iTextLength, DWORD dwPosition) +NOTEPAD_FindTextAt(FINDREPLACE *pFindReplace, LPCTSTR pszText, INT iTextLength, DWORD dwPosition) { BOOL bMatches; size_t iTargetLength; + LPCTSTR pchPosition; - if ((!pFindReplace) || (!pszText)) - { + if (!pFindReplace || !pszText) return FALSE; - } iTargetLength = _tcslen(pFindReplace->lpstrFindWhat); + pchPosition = &pszText[dwPosition]; /* Make proper comparison */ if (pFindReplace->Flags & FR_MATCHCASE) - bMatches = !_tcsncmp(&pszText[dwPosition], pFindReplace->lpstrFindWhat, iTargetLength); + bMatches = !_tcsncmp(pchPosition, pFindReplace->lpstrFindWhat, iTargetLength); else - bMatches = !_tcsnicmp(&pszText[dwPosition], pFindReplace->lpstrFindWhat, iTargetLength); + bMatches = !_tcsnicmp(pchPosition, pFindReplace->lpstrFindWhat, iTargetLength); - if (bMatches && pFindReplace->Flags & FR_WHOLEWORD) + if (bMatches && (pFindReplace->Flags & FR_WHOLEWORD)) { - if ((dwPosition > 0) && !_istspace(pszText[dwPosition-1])) - bMatches = FALSE; - if ((dwPosition < (DWORD) iTextLength - 1) && !_istspace(pszText[dwPosition+1])) - bMatches = FALSE; + if (dwPosition > 0) + { + if (_istalnum(*(pchPosition - 1)) || *(pchPosition - 1) == _T('_')) + bMatches = FALSE; + } + if ((INT)dwPosition + iTargetLength < iTextLength) + { + if (_istalnum(pchPosition[iTargetLength]) || pchPosition[iTargetLength] == _T('_')) + bMatches = FALSE; + } } return bMatches;

1 year, 9 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 March 2023