Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [TASKKILL] Merge our updated terminate_processes() function with the one from Wine, using __REACTOS__ defines to separate the changes.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5d599505d51504e973c5… commit a5d599505d51504e973c537fada60580557716b5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Apr 3 18:40:00 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Apr 3 18:40:00 2020 +0200 [TASKKILL] Merge our updated terminate_processes() function with the one from Wine, using __REACTOS__ defines to separate the changes. We note that in effect it completely contains the functionality of Wine's send_close_messages(), so we keep that latter disabled. --- base/applications/cmdutils/taskkill/taskkill.c | 205 +++++++------------------ 1 file changed, 52 insertions(+), 153 deletions(-) diff --git a/base/applications/cmdutils/taskkill/taskkill.c b/base/applications/cmdutils/taskkill/taskkill.c index b78d461a6fa..75706a66491 100644 --- a/base/applications/cmdutils/taskkill/taskkill.c +++ b/base/applications/cmdutils/taskkill/taskkill.c @@ -3,6 +3,7 @@ * * Copyright 2008 Andrew Riedi * Copyright 2010 Andrew Nguyen + * Copyright 2020 He Yang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -52,7 +53,7 @@ static PWCHAR opList[] = {opForceTerminate, opImage, opPID, opHelp, opTerminateC #define OP_PARAM_HELP 3 #define OP_PARAM_TERMINATE_CHILD 4 -#endif +#endif // __REACTOS__ struct pid_close_info { @@ -229,151 +230,7 @@ static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) * A PID of zero causes taskkill to warn about the inability to terminate * system processes. */ - -#ifdef __REACTOS__ - -static int terminate_processes(BOOL force_termination) -{ - DWORD *pid_list, pid_list_size; - DWORD self_pid = GetCurrentProcessId(); - unsigned int i; - int status_code = 0; - - pid_list = enumerate_processes(&pid_list_size); - if (!pid_list) - { - taskkill_message(STRING_ENUM_FAILED); - return 1; - } - - for (i = 0; i < task_count; i++) - { - WCHAR *p = task_list[i]; - BOOL is_numeric = TRUE; - - /* Determine whether the string is not numeric. */ - while (*p) - { - if (!isdigitW(*p++)) - { - is_numeric = FALSE; - break; - } - } - - if (is_numeric) - { - DWORD pid = atoiW(task_list[i]); - - if (pid == self_pid) - { - taskkill_message(STRING_SELF_TERMINATION); - status_code = 1; - continue; - } - - if (force_termination) - { - HANDLE process; - process = OpenProcess(PROCESS_TERMINATE, FALSE, pid); - if (!process) - { - taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); - status_code = 128; - continue; - } - - if (!TerminateProcess(process, 0)) - { - taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); - status_code = 1; - CloseHandle(process); - continue; - } - - taskkill_message_printfW(STRING_TERM_PID_SEARCH, pid); - CloseHandle(process); - } - else - { - struct pid_close_info info = {pid}; - - EnumWindows(pid_enum_proc, (LPARAM)&info); - if (info.found) - taskkill_message_printfW(STRING_CLOSE_PID_SEARCH, pid); - else - { - taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); - status_code = 128; - } - } - } - else - { - DWORD index; - BOOL found_process = FALSE; - - for (index = 0; index < pid_list_size; index++) - { - WCHAR process_name[MAX_PATH]; - - if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) && - !strcmpiW(process_name, task_list[i])) - { - found_process = TRUE; - - if (pid_list[index] == self_pid) - { - taskkill_message(STRING_SELF_TERMINATION); - status_code = 1; - continue; - } - - if (force_termination) - { - HANDLE process; - - process = OpenProcess(PROCESS_TERMINATE, FALSE, pid_list[index]); - if (!process) - { - taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); - status_code = 128; - continue; - } - - if (!TerminateProcess(process, 0)) - { - taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); - status_code = 1; - CloseHandle(process); - continue; - } - - taskkill_message_printfW(STRING_TERM_PROC_SEARCH, task_list[i], pid_list[index]); - CloseHandle(process); - } - else - { - struct pid_close_info info = {pid_list[index]}; - EnumWindows(pid_enum_proc, (LPARAM)&info); - taskkill_message_printfW(STRING_CLOSE_PROC_SRCH, process_name, pid_list[index]); - } - } - } - - if (!found_process) - { - taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); - status_code = 128; - } - } - } - - HeapFree(GetProcessHeap(), 0, pid_list); - return status_code; -} - -#else +#ifndef __REACTOS__ static int send_close_messages(void) { @@ -464,7 +321,13 @@ static int send_close_messages(void) return status_code; } +#endif // __REACTOS__ + +#ifdef __REACTOS__ +static int terminate_processes(BOOL force_termination) +#else static int terminate_processes(void) +#endif { DWORD *pid_list, pid_list_size; DWORD self_pid = GetCurrentProcessId(); @@ -496,7 +359,9 @@ static int terminate_processes(void) if (is_numeric) { DWORD pid = atoiW(task_list[i]); +#ifndef __REACTOS__ HANDLE process; +#endif if (pid == self_pid) { @@ -505,6 +370,11 @@ static int terminate_processes(void) continue; } +#ifdef __REACTOS__ + if (force_termination) + { + HANDLE process; +#endif process = OpenProcess(PROCESS_TERMINATE, FALSE, pid); if (!process) { @@ -523,6 +393,22 @@ static int terminate_processes(void) taskkill_message_printfW(STRING_TERM_PID_SEARCH, pid); CloseHandle(process); +#ifdef __REACTOS__ + } + else + { + struct pid_close_info info = { pid }; + + EnumWindows(pid_enum_proc, (LPARAM)&info); + if (info.found) + taskkill_message_printfW(STRING_CLOSE_PID_SEARCH, pid); + else + { + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + } + } +#endif } else { @@ -536,7 +422,11 @@ static int terminate_processes(void) if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) && !strcmpiW(process_name, task_list[i])) { +#ifdef __REACTOS__ + found_process = TRUE; +#else HANDLE process; +#endif if (pid_list[index] == self_pid) { @@ -545,6 +435,11 @@ static int terminate_processes(void) continue; } +#ifdef __REACTOS__ + if (force_termination) + { + HANDLE process; +#endif process = OpenProcess(PROCESS_TERMINATE, FALSE, pid_list[index]); if (!process) { @@ -561,9 +456,20 @@ static int terminate_processes(void) continue; } +#ifndef __REACTOS__ found_process = TRUE; +#endif taskkill_message_printfW(STRING_TERM_PROC_SEARCH, task_list[i], pid_list[index]); CloseHandle(process); +#ifdef __REACTOS__ + } + else + { + struct pid_close_info info = { pid_list[index] }; + EnumWindows(pid_enum_proc, (LPARAM)&info); + taskkill_message_printfW(STRING_CLOSE_PROC_SRCH, process_name, pid_list[index]); + } +#endif } } @@ -579,9 +485,6 @@ static int terminate_processes(void) return status_code; } -#endif // __REACTOS__ - - static BOOL add_to_task_list(WCHAR *name) { static unsigned int list_size = 16; @@ -849,16 +752,12 @@ int wmain(int argc, WCHAR *argv[]) } #ifdef __REACTOS__ - status_code = terminate_processes(force_termination); - #else - if (force_termination) status_code = terminate_processes(); else status_code = send_close_messages(); - #endif HeapFree(GetProcessHeap(), 0, task_list);

4 years, 8 months

[reactos] 01/01: [UTILMAN] Implement the Registry management code skeleton (#2456)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6f83a91b85a146ecdf67… commit e6f83a91b85a146ecdf675f9c21e83b15f28f015 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Apr 3 17:46:30 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 3 17:46:30 2020 +0200 [UTILMAN] Implement the Registry management code skeleton (#2456) The following SaveAppSettings(), QueryAppSettings() and InitAppRegKey() are helper functions. This is merely a base Registry skeleton for Utility Manager as more work on it has to come later. --- base/applications/utilman/CMakeLists.txt | 1 + base/applications/utilman/precomp.h | 46 ++++++- base/applications/utilman/registry.c | 202 +++++++++++++++++++++++++++++++ 3 files changed, 248 insertions(+), 1 deletion(-) diff --git a/base/applications/utilman/CMakeLists.txt b/base/applications/utilman/CMakeLists.txt index 90a909e9dd0..6f0addb1bd0 100644 --- a/base/applications/utilman/CMakeLists.txt +++ b/base/applications/utilman/CMakeLists.txt @@ -3,6 +3,7 @@ list(APPEND SOURCE dialog.c process.c about.c + registry.c precomp.h) add_rc_deps(utilman.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/utilman.ico) diff --git a/base/applications/utilman/precomp.h b/base/applications/utilman/precomp.h index fba37387efc..fcfe045ea47 100644 --- a/base/applications/utilman/precomp.h +++ b/base/applications/utilman/precomp.h @@ -2,7 +2,7 @@ * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Pre-compiled header file - * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + * COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com) */ #ifndef _UTILMAN_H @@ -50,6 +50,43 @@ typedef struct _UTILMAN_STATE BOOL bState; } UTILMAN_STATE, *PUTILMAN_STATE; +typedef struct _REGISTRY_SETTINGS +{ + /* Accessibility Registry settings */ + LPCWSTR wszAppPath; + DWORD dwAppType; + DWORD dwClientControlCode; + LPCWSTR wszAppName; + LPCWSTR wszErrorOnLaunch; + BOOL bHideClient; + BOOL bStartWithUtilman; + BOOL bStartWithROS; + LPCWSTR wszHungRespondAction; + DWORD dwHungTimeOut; + + /* Utility Manager Registry settings */ + BOOL bShowWarning; +} REGISTRY_SETTINGS, *PREGISTRY_SETTINGS; + +typedef struct _REGISTRY_DATA +{ + /* On-Screen Keyboard Registry data */ + LPCWSTR lpwsOskPath; + LPCWSTR lpwszOskDisplayName; + + /* Magnify Registry data */ + LPCWSTR lpwszMagnifyPath; + LPCWSTR lpwszMagnifyDisplayName; +} REGISTRY_DATA, *PREGISTRY_DATA; + +/* ENUMERATIONS ***************************************************************/ + +typedef enum _WRITE_REGISTRY +{ + REGISTRY_ACCESSIBILITY, + REGISTRY_UTILMAN +} WRITE_REGISTRY, *PWRITE_REGISTRY; + /* DECLARATIONS ***************************************************************/ /* dialog.c */ @@ -68,8 +105,15 @@ BOOL CloseProcess(IN LPCWSTR lpProcessName); VOID ShowAboutDlg(HWND hDlgParent); INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); +/* registry.c */ +BOOL InitAppRegKey(IN HKEY hPredefinedKey, IN LPCWSTR lpwszSubKey, OUT PHKEY phKey, OUT LPDWORD lpdwDisposition); +BOOL QueryAppSettings(IN HKEY hKey, IN LPCWSTR lpwszSubKey, IN LPCWSTR lpwszRegValue, OUT PVOID ReturnedData, IN OUT LPDWORD lpdwSizeData); +BOOL SaveAppSettings(IN HKEY hKey, IN LPCWSTR lpwszRegValue, IN DWORD dwRegType, IN PVOID Data, IN DWORD cbSize); + /* Struct variable declaration */ extern UTILMAN_GLOBALS Globals; +extern REGISTRY_SETTINGS Settings; +extern REGISTRY_DATA RegData; #endif /* _UTILMAN_H */ diff --git a/base/applications/utilman/registry.c b/base/applications/utilman/registry.c new file mode 100644 index 00000000000..d7a31781260 --- /dev/null +++ b/base/applications/utilman/registry.c @@ -0,0 +1,202 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Registry functions for Utility Manager settings management + * COPYRIGHT: Copyright 2020 Bișoc George (fraizeraust99 at gmail dot com) + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +/* GLOBALS ********************************************************************/ + +UTILMAN_GLOBALS Globals; +REGISTRY_DATA RegData; +REGISTRY_SETTINGS Settings; + +/* DEFINES ********************************************************************/ + +#define ACCESS_UTILMAN_KEY L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Accessibility\\Utility Manager" +#define UTILMAN_KEY L"SOFTWARE\\Microsoft\\Utility Manager" +#define OSK_KEY L"On-Screen Keyboard" +#define MAGNIFIER_KEY L"Magnifier" + +/* FUNCTIONS ******************************************************************/ + +/** + * @InitAppRegKey + * + * Initialize a key. The function may not necessarily create it but open the key + * if it already exists. The disposition pointed lpdwDisposition determines that. + * This is a function helper. + * + * @param[in] hPredefinedKey + * The predefined key (e.g. HKEY_CLASSES_ROOT). + * + * @param[in] lpwszSubKey + * The path to the sub key to be created. + * + * @param[out] phKey + * A pointer that receives a handle to the key given by the function. + * + * @param[out] lpdwDisposition + * A pointer that receives the disposition given by the function. + * + * @return + * Returns TRUE if the function successfully created a key (or opened it), + * FALSE otherwise for failure. + * + */ +BOOL InitAppRegKey(IN HKEY hPredefinedKey, + IN LPCWSTR lpwszSubKey, + OUT PHKEY phKey, + OUT LPDWORD lpdwDisposition) +{ + LONG lResult; + + lResult = RegCreateKeyExW(hPredefinedKey, + lpwszSubKey, + 0, + NULL, + 0, + KEY_WRITE, + NULL, + phKey, + lpdwDisposition); + if (lResult != ERROR_SUCCESS) + { + DPRINT("InitAppRegKey(): Failed to create the following key (or open the key) of path \"%S\". The error code is \"%li\".\n", lpwszSubKey, lResult); + return FALSE; + } + + return TRUE; +} + +/** + * @QueryAppSettings + * + * Query the setting from the application's key. This is a function helper. + * + * @param[in] hKey + * A handle to a key. + * + * @param[in] lpwszSubKey + * The path to a sub-key. + * + * @param[in] lpwszRegValue + * The registry value where we need to get the data from. + * + * @param[out] ReturnedData + * An arbitrary pointer that receives the returned data. Being arbitrary, + * the data can be of any type. + * + * @param[inout] lpdwSizeData + * A pointer to the returned data pointed by ReturnedData parameter that + * retrieves the size of the aforementioned data, in bytes. + * + * @return + * Returns TRUE if the function successfully loaded the value we wanted, + * FALSE otherwise for failure. + * + */ +BOOL QueryAppSettings(IN HKEY hKey, + IN LPCWSTR lpwszSubKey, + IN LPCWSTR lpwszRegValue, + OUT PVOID ReturnedData, + IN OUT LPDWORD lpdwSizeData) +{ + LONG lResult; + HKEY hKeyQueryValue; + + lResult = RegOpenKeyExW(hKey, + lpwszSubKey, + 0, + KEY_READ, + &hKeyQueryValue); + if (lResult != ERROR_SUCCESS) + { + DPRINT("QueryAppSettings(): Failed to open the key of path \"%S\". The error code is \"%li\".\n", lpwszSubKey, lResult); + return FALSE; + } + + lResult = RegQueryValueExW(hKeyQueryValue, + lpwszRegValue, + NULL, + NULL, + (LPBYTE)&ReturnedData, + lpdwSizeData); + if (lResult != ERROR_SUCCESS) + { + DPRINT("QueryAppSettings(): Failed to query the data from value \"%S\". The error code is \"%li\".\n", lpwszRegValue, lResult); + RegCloseKey(hKeyQueryValue); + return FALSE; + } + + RegCloseKey(hKeyQueryValue); + return TRUE; +} + +/** + * @SaveAppSettings + * + * Save an application's setting data to the Registry. This is a function helper. + * + * @param[in] hKey + * A handle to a key. + * + * @param[in] lpwszRegValue + * The path to the sub key where the value needs to be created. + * + * @param[out] dwRegType + * The type of registry value to be created (e.g. a REG_DWORD). + * + * @param[in] Data + * A pointer to an arbitrary data for the value to be set. Being arbitrary, + * the data can be of any type (in conformity with the registry type pointed by + * dwRegType) otherwise the function might lead to a undefined behaviour. + * + * @param[in] cbSize + * The size of the buffer data pointed by Data parameter, in bytes. + * + * @return + * Returns TRUE if the function successfully saved the application's setting, + * FALSE otherwise for failure. + * + */ +BOOL SaveAppSettings(IN HKEY hKey, + IN LPCWSTR lpwszRegValue, + IN DWORD dwRegType, + IN PVOID Data, + IN DWORD cbSize) +{ + LONG lResult; + HKEY hKeySetValue; + + lResult = RegOpenKeyExW(hKey, + NULL, + 0, + KEY_SET_VALUE, + &hKeySetValue); + if (lResult != ERROR_SUCCESS) + { + DPRINT("SaveAppSettings(): Failed to open the key, the error code is \"%li\"!\n", lResult); + return FALSE; + } + + lResult = RegSetValueExW(hKeySetValue, + lpwszRegValue, + 0, + dwRegType, + (LPBYTE)&Data, + cbSize); + if (lResult != ERROR_SUCCESS) + { + DPRINT("SaveAppSettings(): Failed to set the \"%S\" value with data, the error code is \"%li\"!\n", lpwszRegValue, lResult); + RegCloseKey(hKeySetValue); + return FALSE; + } + + RegCloseKey(hKeySetValue); + return TRUE; +}

4 years, 8 months

[reactos] 01/01: [TASKKILL] Improve taskkill utility (#2459)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5874c66e41391e25f9d61… commit 5874c66e41391e25f9d612694d4fa73e584fed91 Author: He Yang <1160386205(a)qq.com> AuthorDate: Fri Apr 3 10:37:53 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 3 17:37:53 2020 +0200 [TASKKILL] Improve taskkill utility (#2459) Make the argument process of command utility "taskkill" behave same as what Windows does. Now options are no longer detected as parameters when placed after options that accept one. For example, `taskkill /im /f` will no longer regard `/f` as a process name. If `/?` and `/f` options appear more than once, an error will be reported, telling they are not allowed more than once. (e.g. `taskkill /f /pid 1000 /f`) If only one option `/f` is given without `/pid` or `/im`, an eerror will be reported, telling that one must specify `/pid` or `/im`. (e.g. `taskkill /f`) Additional changes: - Combine SendCloseMessages() and TerminateProcesses() functions. - Protect new written code with `#ifdef __REACTOS__` --- base/applications/cmdutils/taskkill/lang/de-DE.rc | 2 + base/applications/cmdutils/taskkill/lang/en-US.rc | 2 + base/applications/cmdutils/taskkill/lang/it-IT.rc | 2 + base/applications/cmdutils/taskkill/lang/pl-PL.rc | 2 + base/applications/cmdutils/taskkill/lang/ro-RO.rc | 2 + base/applications/cmdutils/taskkill/lang/ru-RU.rc | 2 + base/applications/cmdutils/taskkill/lang/sq-AL.rc | 2 + base/applications/cmdutils/taskkill/lang/tr-TR.rc | 2 + base/applications/cmdutils/taskkill/lang/zh-CN.rc | 7 +- base/applications/cmdutils/taskkill/lang/zh-TW.rc | 2 + base/applications/cmdutils/taskkill/taskkill.c | 320 ++++++++++++++++++++++ base/applications/cmdutils/taskkill/taskkill.h | 3 + 12 files changed, 347 insertions(+), 1 deletion(-) diff --git a/base/applications/cmdutils/taskkill/lang/de-DE.rc b/base/applications/cmdutils/taskkill/lang/de-DE.rc index ea43a9bae17..54a408fcc8a 100644 --- a/base/applications/cmdutils/taskkill/lang/de-DE.rc +++ b/base/applications/cmdutils/taskkill/lang/de-DE.rc @@ -16,4 +16,6 @@ STRINGTABLE STRING_ENUM_FAILED, "Fehler: Prozessliste kann nicht aufgebaut werden.\n" STRING_TERMINATE_FAILED, "Fehler: Prozess ""%1"" kann nicht beendet werden.\n" STRING_SELF_TERMINATION, "Fehler: Der Prozess kann sich nicht selbst beenden.\n" + STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n" } diff --git a/base/applications/cmdutils/taskkill/lang/en-US.rc b/base/applications/cmdutils/taskkill/lang/en-US.rc index 1e87249cb11..e34b34bad25 100644 --- a/base/applications/cmdutils/taskkill/lang/en-US.rc +++ b/base/applications/cmdutils/taskkill/lang/en-US.rc @@ -16,4 +16,6 @@ STRINGTABLE STRING_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" STRING_TERMINATE_FAILED, "Error: Unable to terminate process ""%1"".\n" STRING_SELF_TERMINATION, "Error: Process self-termination is not permitted.\n" + STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n" } diff --git a/base/applications/cmdutils/taskkill/lang/it-IT.rc b/base/applications/cmdutils/taskkill/lang/it-IT.rc index 0a2cb322ae7..886c4a9a3c1 100644 --- a/base/applications/cmdutils/taskkill/lang/it-IT.rc +++ b/base/applications/cmdutils/taskkill/lang/it-IT.rc @@ -23,4 +23,6 @@ STRINGTABLE STRING_ENUM_FAILED, "Errore: Impossibile enumerare la lista dei processi.\n" STRING_TERMINATE_FAILED, "Errore: Impossibile terminare il processo ""%1"".\n" STRING_SELF_TERMINATION, "Errore: L'auto-terminazione non è consentita.\n" + STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n" } diff --git a/base/applications/cmdutils/taskkill/lang/pl-PL.rc b/base/applications/cmdutils/taskkill/lang/pl-PL.rc index c907dc72b62..d66da03ec6e 100644 --- a/base/applications/cmdutils/taskkill/lang/pl-PL.rc +++ b/base/applications/cmdutils/taskkill/lang/pl-PL.rc @@ -16,4 +16,6 @@ STRINGTABLE STRING_ENUM_FAILED, "Błąd: Nie można wyliczyć listy procesów.\n" STRING_TERMINATE_FAILED, "Błąd: Nie można zakończyć procesu ""%1"".\n" STRING_SELF_TERMINATION, "Błąd: Proces nie może zakończyć sam siebie.\n" + STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n" } diff --git a/base/applications/cmdutils/taskkill/lang/ro-RO.rc b/base/applications/cmdutils/taskkill/lang/ro-RO.rc index d050c6b4b80..649dfc47ed2 100644 --- a/base/applications/cmdutils/taskkill/lang/ro-RO.rc +++ b/base/applications/cmdutils/taskkill/lang/ro-RO.rc @@ -18,4 +18,6 @@ STRINGTABLE STRING_ENUM_FAILED, "Eroare: Procesele nu au putut fi enumerate.\n" STRING_TERMINATE_FAILED, "Eroare: Procesul «%1» nu poate fi oprit.\n" STRING_SELF_TERMINATION, "Eroare: Auto-terminarea nu este permisă.\n" + STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n" } diff --git a/base/applications/cmdutils/taskkill/lang/ru-RU.rc b/base/applications/cmdutils/taskkill/lang/ru-RU.rc index 5002db0732f..9a671e98b45 100644 --- a/base/applications/cmdutils/taskkill/lang/ru-RU.rc +++ b/base/applications/cmdutils/taskkill/lang/ru-RU.rc @@ -18,4 +18,6 @@ STRINGTABLE STRING_ENUM_FAILED, "Ошибка: Не удается получить список процессов.\n" STRING_TERMINATE_FAILED, "Ошибка: Не удается завершить процесс ""%1"".\n" STRING_SELF_TERMINATION, "Ошибка: Процесс не может завершить сам себя.\n" + STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n" } diff --git a/base/applications/cmdutils/taskkill/lang/sq-AL.rc b/base/applications/cmdutils/taskkill/lang/sq-AL.rc index c4ee3dd1bc3..85878177488 100644 --- a/base/applications/cmdutils/taskkill/lang/sq-AL.rc +++ b/base/applications/cmdutils/taskkill/lang/sq-AL.rc @@ -20,4 +20,6 @@ STRINGTABLE STRING_ENUM_FAILED, "Gabim: Në pamundësi për të numëruar listën proceseve.\n" STRING_TERMINATE_FAILED, "Gabim: Pamundur mbyllja e proceseve ""%1"".\n" STRING_SELF_TERMINATION, "Gabim: Procesi vetë-përfundimi nuk është i lejuar.\n" + STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n" } diff --git a/base/applications/cmdutils/taskkill/lang/tr-TR.rc b/base/applications/cmdutils/taskkill/lang/tr-TR.rc index 97ebbc186a8..fec4c4a07de 100644 --- a/base/applications/cmdutils/taskkill/lang/tr-TR.rc +++ b/base/applications/cmdutils/taskkill/lang/tr-TR.rc @@ -18,4 +18,6 @@ STRINGTABLE STRING_ENUM_FAILED, "Yanlışlık: İşlem dizelgesi numaralandırılamaz.\n" STRING_TERMINATE_FAILED, "Yanlışlık: ""%1"" işlemi sonlandırılamaz.\n" STRING_SELF_TERMINATION, "Yanlışlık: İşlemi kendi kendine sonlandırmaya izin verilmedi.\n" + STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n" } diff --git a/base/applications/cmdutils/taskkill/lang/zh-CN.rc b/base/applications/cmdutils/taskkill/lang/zh-CN.rc index f6980a6932d..e6b2c272d1d 100644 --- a/base/applications/cmdutils/taskkill/lang/zh-CN.rc +++ b/base/applications/cmdutils/taskkill/lang/zh-CN.rc @@ -1,4 +1,7 @@ -/* Simplified Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +/* Simplified Chinese translation by +Henry Tang Ih 2016 (henrytang2(a)hotmail.com) +He Yang 2020 (1160386205(a)qq.com) + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -18,4 +21,6 @@ STRINGTABLE STRING_ENUM_FAILED, "错误: 无法枚举进程列表。\n" STRING_TERMINATE_FAILED, "错误: 无法终止进程 ""%1""。\n" STRING_SELF_TERMINATION, "错误: 不允许终止自身。\n" + STRING_PARAM_TOO_MUCH, "错误：无效语法。选项 '%1' 不允许超过 '%2!d!' 次。\n" + STRING_INVALID_SYNTAX, "错误：无效语法。\n" } diff --git a/base/applications/cmdutils/taskkill/lang/zh-TW.rc b/base/applications/cmdutils/taskkill/lang/zh-TW.rc index afc52383bab..16b37cae210 100644 --- a/base/applications/cmdutils/taskkill/lang/zh-TW.rc +++ b/base/applications/cmdutils/taskkill/lang/zh-TW.rc @@ -18,4 +18,6 @@ STRINGTABLE STRING_ENUM_FAILED, "錯誤: 無法枚舉處理序清單。\n" STRING_TERMINATE_FAILED, "錯誤: 無法終止處理序 ""%1""。\n" STRING_SELF_TERMINATION, "錯誤: 不允許自我終止的處理序。\n" + STRING_PARAM_TOO_MUCH, "Error: Invalid syntax. '%1' option is not allowed more than '%2!d!' time(s).\n" + STRING_INVALID_SYNTAX, "Error: Invalid syntax.\n" } diff --git a/base/applications/cmdutils/taskkill/taskkill.c b/base/applications/cmdutils/taskkill/taskkill.c index 59ce98dc6dc..b78d461a6fa 100644 --- a/base/applications/cmdutils/taskkill/taskkill.c +++ b/base/applications/cmdutils/taskkill/taskkill.c @@ -34,6 +34,26 @@ static BOOL force_termination = FALSE; static WCHAR **task_list; static unsigned int task_count; +#ifdef __REACTOS__ + +static WCHAR opForceTerminate[] = L"f"; +static WCHAR opImage[] = L"im"; +static WCHAR opPID[] = L"pid"; +static WCHAR opHelp[] = L"?"; +static WCHAR opTerminateChildren[] = L"t"; + +static PWCHAR opList[] = {opForceTerminate, opImage, opPID, opHelp, opTerminateChildren}; + +#define OP_PARAM_INVALID -1 + +#define OP_PARAM_FORCE_TERMINATE 0 +#define OP_PARAM_IMAGE 1 +#define OP_PARAM_PID 2 +#define OP_PARAM_HELP 3 +#define OP_PARAM_TERMINATE_CHILD 4 + +#endif + struct pid_close_info { DWORD pid; @@ -208,6 +228,153 @@ static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) * * A PID of zero causes taskkill to warn about the inability to terminate * system processes. */ + + +#ifdef __REACTOS__ + +static int terminate_processes(BOOL force_termination) +{ + DWORD *pid_list, pid_list_size; + DWORD self_pid = GetCurrentProcessId(); + unsigned int i; + int status_code = 0; + + pid_list = enumerate_processes(&pid_list_size); + if (!pid_list) + { + taskkill_message(STRING_ENUM_FAILED); + return 1; + } + + for (i = 0; i < task_count; i++) + { + WCHAR *p = task_list[i]; + BOOL is_numeric = TRUE; + + /* Determine whether the string is not numeric. */ + while (*p) + { + if (!isdigitW(*p++)) + { + is_numeric = FALSE; + break; + } + } + + if (is_numeric) + { + DWORD pid = atoiW(task_list[i]); + + if (pid == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + + if (force_termination) + { + HANDLE process; + process = OpenProcess(PROCESS_TERMINATE, FALSE, pid); + if (!process) + { + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + continue; + } + + if (!TerminateProcess(process, 0)) + { + taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); + status_code = 1; + CloseHandle(process); + continue; + } + + taskkill_message_printfW(STRING_TERM_PID_SEARCH, pid); + CloseHandle(process); + } + else + { + struct pid_close_info info = {pid}; + + EnumWindows(pid_enum_proc, (LPARAM)&info); + if (info.found) + taskkill_message_printfW(STRING_CLOSE_PID_SEARCH, pid); + else + { + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + } + } + } + else + { + DWORD index; + BOOL found_process = FALSE; + + for (index = 0; index < pid_list_size; index++) + { + WCHAR process_name[MAX_PATH]; + + if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) && + !strcmpiW(process_name, task_list[i])) + { + found_process = TRUE; + + if (pid_list[index] == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + + if (force_termination) + { + HANDLE process; + + process = OpenProcess(PROCESS_TERMINATE, FALSE, pid_list[index]); + if (!process) + { + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + continue; + } + + if (!TerminateProcess(process, 0)) + { + taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); + status_code = 1; + CloseHandle(process); + continue; + } + + taskkill_message_printfW(STRING_TERM_PROC_SEARCH, task_list[i], pid_list[index]); + CloseHandle(process); + } + else + { + struct pid_close_info info = {pid_list[index]}; + EnumWindows(pid_enum_proc, (LPARAM)&info); + taskkill_message_printfW(STRING_CLOSE_PROC_SRCH, process_name, pid_list[index]); + } + } + } + + if (!found_process) + { + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + } + } + } + + HeapFree(GetProcessHeap(), 0, pid_list); + return status_code; +} + +#else + static int send_close_messages(void) { DWORD *pid_list, pid_list_size; @@ -412,6 +579,9 @@ static int terminate_processes(void) return status_code; } +#endif // __REACTOS__ + + static BOOL add_to_task_list(WCHAR *name) { static unsigned int list_size = 16; @@ -440,6 +610,146 @@ static BOOL add_to_task_list(WCHAR *name) return TRUE; } +#ifdef __REACTOS__ + +static int get_argument_type(WCHAR* argument) +{ + int i; + + if (argument[0] != L'/' && argument[0] != L'-') + { + return OP_PARAM_INVALID; + } + argument++; + + for (i = 0; i < _countof(opList); i++) + { + if (!strcmpiW(opList[i], argument)) + { + return i; + } + } + return OP_PARAM_INVALID; +} + +/* FIXME +argument T not supported +*/ + +static BOOL process_arguments(int argc, WCHAR* argv[]) +{ + BOOL has_im = FALSE, has_pid = FALSE, has_help = FALSE; + + if (argc > 1) + { + int i; + for (i = 1; i < argc; i++) + { + int argument = get_argument_type(argv[i]); + + switch (argument) + { + case OP_PARAM_FORCE_TERMINATE: + { + if (force_termination == TRUE) + { + // -f already specified + taskkill_message_printfW(STRING_PARAM_TOO_MUCH, argv[i], 1); + taskkill_message(STRING_USAGE); + return FALSE; + } + force_termination = TRUE; + break; + } + case OP_PARAM_IMAGE: + case OP_PARAM_PID: + { + if (!argv[i + 1]) + { + taskkill_message_printfW(STRING_MISSING_PARAM, argv[i]); + taskkill_message(STRING_USAGE); + return FALSE; + } + + if (argument == OP_PARAM_IMAGE) + has_im = TRUE; + if (argument == OP_PARAM_PID) + has_pid = TRUE; + + if (has_im && has_pid) + { + taskkill_message(STRING_MUTUAL_EXCLUSIVE); + taskkill_message(STRING_USAGE); + return FALSE; + } + + if (get_argument_type(argv[i + 1]) != OP_PARAM_INVALID) + { + taskkill_message_printfW(STRING_MISSING_PARAM, argv[i]); + taskkill_message(STRING_USAGE); + return FALSE; + } + + if (!add_to_task_list(argv[++i])) // add next parameters to task_list + return FALSE; + + break; + } + case OP_PARAM_HELP: + { + if (has_help == TRUE) + { + // -? already specified + taskkill_message_printfW(STRING_PARAM_TOO_MUCH, argv[i], 1); + taskkill_message(STRING_USAGE); + return FALSE; + } + has_help = TRUE; + break; + } + case OP_PARAM_TERMINATE_CHILD: + { + WINE_FIXME("argument T not supported\n"); + break; + } + case OP_PARAM_INVALID: + default: + { + taskkill_message(STRING_INVALID_OPTION); + taskkill_message(STRING_USAGE); + return FALSE; + } + } + } + } + + if (has_help) + { + if (argc > 2) // any parameters other than -? is specified + { + taskkill_message(STRING_INVALID_SYNTAX); + taskkill_message(STRING_USAGE); + return FALSE; + } + else + { + taskkill_message(STRING_USAGE); + exit(0); + } + } + else if ((!has_im) && (!has_pid)) // has_help == FALSE + { + // both has_im and has_pid are missing (maybe -fi option is missing too, if implemented later) + taskkill_message(STRING_MISSING_OPTION); + taskkill_message(STRING_USAGE); + return FALSE; + } + + return TRUE; +} + +#else + /* FIXME Argument processing does not match behavior observed on Windows. * Stringent argument counting and processing is performed, and unrecognized * options are detected as parameters when placed after options that accept one. */ @@ -526,6 +836,8 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) return TRUE; } +#endif // __REACTOS__ + int wmain(int argc, WCHAR *argv[]) { int status_code = 0; @@ -536,11 +848,19 @@ int wmain(int argc, WCHAR *argv[]) return 1; } +#ifdef __REACTOS__ + + status_code = terminate_processes(force_termination); + +#else + if (force_termination) status_code = terminate_processes(); else status_code = send_close_messages(); +#endif + HeapFree(GetProcessHeap(), 0, task_list); return status_code; } diff --git a/base/applications/cmdutils/taskkill/taskkill.h b/base/applications/cmdutils/taskkill/taskkill.h index 7972a156f3c..03312fa8c9c 100644 --- a/base/applications/cmdutils/taskkill/taskkill.h +++ b/base/applications/cmdutils/taskkill/taskkill.h @@ -35,3 +35,6 @@ #define STRING_ENUM_FAILED 112 #define STRING_TERMINATE_FAILED 113 #define STRING_SELF_TERMINATION 114 +#define STRING_PARAM_TOO_MUCH 115 +#define STRING_INVALID_SYNTAX 116 +

4 years, 8 months

[reactos] 01/01: [WIN32K:NTUSER] ntuser.h: Rename NtUserWaitForInputIdle() 3rd parameter (#2499)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ded98b846e4e39ba6f8ca… commit ded98b846e4e39ba6f8ca2e84ce145523335ddfb Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Apr 3 15:06:25 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 3 15:06:25 2020 +0200 [WIN32K:NTUSER] ntuser.h: Rename NtUserWaitForInputIdle() 3rd parameter (#2499) Addendum to 568b6d05. --- win32ss/include/ntuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index d92796dd3d9..9485f574487 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -3499,7 +3499,7 @@ NTAPI NtUserWaitForInputIdle( IN HANDLE hProcess, IN DWORD dwMilliseconds, - IN BOOL Unknown2); /* Always FALSE */ + IN BOOL bSharedWow); /* Always FALSE */ DWORD NTAPI

4 years, 8 months

[reactos] 01/01: [WINETESTS] Remove forced _WIN32_WINNT defines (#2463)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=803b5e1371f6066a6cc70… commit 803b5e1371f6066a6cc708775c359fb07a02068d Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Apr 3 14:01:22 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 3 14:01:22 2020 +0200 [WINETESTS] Remove forced _WIN32_WINNT defines (#2463) Only comctl32 is affected. Import https://source.winehq.org/git/wine.git/commit/be3cda6ec0856d143d4737ee93068… --- modules/rostests/winetests/comctl32/subclass.c | 2 -- modules/rostests/winetests/kernel32/sync.c | 3 --- modules/rostests/winetests/kernel32/thread.c | 5 ----- modules/rostests/winetests/kernel32/timer.c | 4 ---- modules/rostests/winetests/kernel32/version.c | 5 ----- modules/rostests/winetests/psapi/psapi_main.c | 5 ----- modules/rostests/winetests/user32/broadcast.c | 4 ---- modules/rostests/winetests/user32/class.c | 5 ----- modules/rostests/winetests/user32/menu.c | 4 ---- 9 files changed, 37 deletions(-) diff --git a/modules/rostests/winetests/comctl32/subclass.c b/modules/rostests/winetests/comctl32/subclass.c index fc778d67115..b2b47319b16 100644 --- a/modules/rostests/winetests/comctl32/subclass.c +++ b/modules/rostests/winetests/comctl32/subclass.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0501 /* For SetWindowSubclass/etc */ - #include <assert.h> #include <stdarg.h> diff --git a/modules/rostests/winetests/kernel32/sync.c b/modules/rostests/winetests/kernel32/sync.c index fced98bf217..9056c3d1bbe 100644 --- a/modules/rostests/winetests/kernel32/sync.c +++ b/modules/rostests/winetests/kernel32/sync.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __REACTOS__ -#define _WIN32_WINNT 0x500 -#endif #include <stdarg.h> #include <stdlib.h> #include <stdio.h> diff --git a/modules/rostests/winetests/kernel32/thread.c b/modules/rostests/winetests/kernel32/thread.c index b0bee53b1c5..85a86581de5 100644 --- a/modules/rostests/winetests/kernel32/thread.c +++ b/modules/rostests/winetests/kernel32/thread.c @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */ -#ifndef __REACTOS__ -#define _WIN32_WINNT 0x0600 -#endif - #include <assert.h> #include <stdarg.h> #include <stdio.h> diff --git a/modules/rostests/winetests/kernel32/timer.c b/modules/rostests/winetests/kernel32/timer.c index be4c9e9f2df..d2a6138c97a 100644 --- a/modules/rostests/winetests/kernel32/timer.c +++ b/modules/rostests/winetests/kernel32/timer.c @@ -18,10 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __REACTOS__ -#define _WIN32_WINNT 0x0501 -#endif - #include "wine/test.h" #include "winbase.h" diff --git a/modules/rostests/winetests/kernel32/version.c b/modules/rostests/winetests/kernel32/version.c index 39f869b993d..5f7a9bb03f5 100644 --- a/modules/rostests/winetests/kernel32/version.c +++ b/modules/rostests/winetests/kernel32/version.c @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Needed for PRODUCT_* defines and GetProductInfo() */ -#ifndef __REACTOS__ -#define _WIN32_WINNT 0x0600 -#endif - #include "wine/test.h" #include "winbase.h" #include "winternl.h" diff --git a/modules/rostests/winetests/psapi/psapi_main.c b/modules/rostests/winetests/psapi/psapi_main.c index 92853348594..68f0045199f 100644 --- a/modules/rostests/winetests/psapi/psapi_main.c +++ b/modules/rostests/winetests/psapi/psapi_main.c @@ -19,11 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* 0x0600 makes PROCESS_ALL_ACCESS not compatible with pre-Vista versions */ -#ifndef __REACTOS__ -#define _WIN32_WINNT 0x0500 -#endif - #include <stdarg.h> #include "ntstatus.h" diff --git a/modules/rostests/winetests/user32/broadcast.c b/modules/rostests/winetests/user32/broadcast.c index 91afcc28fdf..f80d455cba3 100644 --- a/modules/rostests/winetests/user32/broadcast.c +++ b/modules/rostests/winetests/user32/broadcast.c @@ -18,10 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __REACTOS__ -#define _WIN32_WINNT 0x0501 -#endif - #include <stdarg.h> #include <stdio.h> diff --git a/modules/rostests/winetests/user32/class.c b/modules/rostests/winetests/user32/class.c index d8cf14a3cda..43c32162e08 100644 --- a/modules/rostests/winetests/user32/class.c +++ b/modules/rostests/winetests/user32/class.c @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* To get CS_DROPSHADOW with the MSVC headers */ -#ifndef __REACTOS__ -#define _WIN32_WINNT 0x0501 -#endif - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/modules/rostests/winetests/user32/menu.c b/modules/rostests/winetests/user32/menu.c index a7a8b8a4f24..95a5e21d2c4 100644 --- a/modules/rostests/winetests/user32/menu.c +++ b/modules/rostests/winetests/user32/menu.c @@ -19,10 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __REACTOS__ -#define _WIN32_WINNT 0x0501 -#endif - #include <stdarg.h> #include <stdio.h> #include <string.h>

4 years, 8 months

[reactos] 01/01: [PSDK] guiddef.h: Remove unwanted '&& !defined(CINTERFACE)' (#2492)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c986e17a069de3d108bd… commit 8c986e17a069de3d108bdfbdb154a70a1b4bac83 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Apr 3 13:59:34 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 3 13:59:34 2020 +0200 [PSDK] guiddef.h: Remove unwanted '&& !defined(CINTERFACE)' (#2492) Cherry-pick https://source.winehq.org/git/wine.git/commit/4626db2bb2a61cdceb00e0e346628… Import https://source.winehq.org/git/wine.git/commit/54f58769fee73a55675d503e0281e… https://source.winehq.org/git/wine.git/commit/34f3e7793b40d0eac60c373f66f26… --- sdk/include/psdk/guiddef.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/include/psdk/guiddef.h b/sdk/include/psdk/guiddef.h index 143546270f2..0bc3d30bda4 100644 --- a/sdk/include/psdk/guiddef.h +++ b/sdk/include/psdk/guiddef.h @@ -107,21 +107,21 @@ typedef GUID FMTID,*LPFMTID; #endif /* ndef __IID_DEFINED__ */ -#if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef __cplusplus #define REFGUID const GUID & #define REFCLSID const CLSID & #define REFIID const IID & #define REFFMTID const FMTID & -#else /* !defined(__cplusplus) && !defined(CINTERFACE) */ +#else #define REFGUID const GUID* __MIDL_CONST #define REFCLSID const CLSID* __MIDL_CONST #define REFIID const IID* __MIDL_CONST #define REFFMTID const FMTID* __MIDL_CONST -#endif /* !defined(__cplusplus) && !defined(CINTERFACE) */ +#endif #if !defined(__midl) && !defined(__WIDL__) #include <string.h> -#if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef __cplusplus __inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) { @@ -137,7 +137,7 @@ __inline int IsEqualGUID(REFGUID rguid1, REFGUID rguid2) return !memcmp(&rguid1, &rguid2, sizeof(GUID)); } -#else /* defined(__cplusplus) && !defined(CINTERFACE) */ +#else #define InlineIsEqualGUID(rguid1, rguid2) \ (((unsigned long *)rguid1)[0] == ((unsigned long *)rguid2)[0] && \ @@ -146,10 +146,10 @@ __inline int IsEqualGUID(REFGUID rguid1, REFGUID rguid2) ((unsigned long *)rguid1)[3] == ((unsigned long *)rguid2)[3]) #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) -#endif /* defined(__cplusplus) && !defined(CINTERFACE) */ +#endif #endif /* __midl && __WIDL__ */ -#if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef __cplusplus #include <string.h> #if !defined _SYS_GUID_OPERATOR_EQ_ && !defined _NO_SYS_GUID_OPERATOR_EQ_ #define _SYS_GUID_OPERATOR_EQ_

4 years, 8 months

[reactos] 01/01: [RPCRT4] Handle ERROR_BAD_NETPATH failure if an RPC pipe connection is done on an non-existing UNC path.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76ebd0d054b16c9a41f05… commit 76ebd0d054b16c9a41f0536f197e835f8d766694 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Apr 2 19:55:35 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Apr 3 13:33:03 2020 +0200 [RPCRT4] Handle ERROR_BAD_NETPATH failure if an RPC pipe connection is done on an non-existing UNC path. Addendum to 5274857d (see originally commit 13f41d74). CORE-6561 --- dll/win32/rpcrt4/rpc_transport.c | 5 +++++ dll/win32/rpcrt4/rpcrt4_ros.diff | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/dll/win32/rpcrt4/rpc_transport.c b/dll/win32/rpcrt4/rpc_transport.c index e77cb287be9..88f027d9990 100644 --- a/dll/win32/rpcrt4/rpc_transport.c +++ b/dll/win32/rpcrt4/rpc_transport.c @@ -174,6 +174,11 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, } TRACE("connection failed, error=%x\n", err); return RPC_S_SERVER_TOO_BUSY; +#ifdef __REACTOS__ + } else if (err == ERROR_BAD_NETPATH) { + TRACE("connection failed, error=%x\n", err); + return RPC_S_SERVER_UNAVAILABLE; +#endif } if (!wait || !WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { err = GetLastError(); diff --git a/dll/win32/rpcrt4/rpcrt4_ros.diff b/dll/win32/rpcrt4/rpcrt4_ros.diff index c1ae133a864..83aaa1ec610 100644 --- a/dll/win32/rpcrt4/rpcrt4_ros.diff +++ b/dll/win32/rpcrt4/rpcrt4_ros.diff @@ -118,6 +118,16 @@ diff -pudN e:\wine\dlls\rpcrt4/rpc_transport.c e:\reactos\dll\win32\rpcrt4/rpc_t static RpcConnection *rpcrt4_spawn_connection(RpcConnection *old_connection); /**** ncacn_np support ****/ +@@ -174,6 +174,9 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, + } + TRACE("connection failed, error=%x\n", err); + return RPC_S_SERVER_TOO_BUSY; ++ } else if (err == ERROR_BAD_NETPATH) { ++ TRACE("connection failed, error=%x\n", err); ++ return RPC_S_SERVER_UNAVAILABLE; + } + if (!wait || !WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { + err = GetLastError(); @@ -237,14 +258,24 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc return r; }

4 years, 8 months

[reactos] 01/01: [NTUser] Fix Strings and Format to Hooks

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=568b6d0558d047df1826d… commit 568b6d0558d047df1826d7438448432643d7fe5c Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Fri Apr 3 03:58:29 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Fri Apr 3 03:58:29 2020 -0500 [NTUser] Fix Strings and Format to Hooks Allocate heap instead of data segment to be used for callbacks on user side. Move and correct initial hook call out setup. Use it in more than one hook call. This fixes issues with strings out of alignment and use of kernel pointers. See CORE-13907 and CORE-16769. KsStudio still needs retested. Small wow update. --- win32ss/user/ntuser/callback.c | 23 ++++-- win32ss/user/ntuser/callback.h | 1 + win32ss/user/ntuser/message.c | 153 ++++++++++++++++++++++++++++++++++++- win32ss/user/ntuser/window.c | 83 ++------------------ win32ss/user/user32/windows/hook.c | 32 +++++--- 5 files changed, 195 insertions(+), 97 deletions(-) diff --git a/win32ss/user/ntuser/callback.c b/win32ss/user/ntuser/callback.c index 1497d72a892..7bcc65f5962 100644 --- a/win32ss/user/ntuser/callback.c +++ b/win32ss/user/ntuser/callback.c @@ -610,7 +610,12 @@ co_IntCallHookProc(INT HookId, { pCWP = (CWPSTRUCT*) lParam; ArgumentLength = sizeof(CWP_Struct); - lParamSize = lParamMemorySize(pCWP->message, pCWP->wParam, pCWP->lParam); + if ( pCWP->message == WM_CREATE || pCWP->message == WM_NCCREATE ) + { + lParamSize = sizeof(CREATESTRUCTW); + } + else + lParamSize = lParamMemorySize(pCWP->message, pCWP->wParam, pCWP->lParam); ArgumentLength += lParamSize; break; } @@ -618,7 +623,12 @@ co_IntCallHookProc(INT HookId, { pCWPR = (CWPRETSTRUCT*) lParam; ArgumentLength = sizeof(CWPR_Struct); - lParamSize = lParamMemorySize(pCWPR->message, pCWPR->wParam, pCWPR->lParam); + if ( pCWPR->message == WM_CREATE || pCWPR->message == WM_NCCREATE ) + { + lParamSize = sizeof(CREATESTRUCTW); + } + else + lParamSize = lParamMemorySize(pCWPR->message, pCWPR->wParam, pCWPR->lParam); ArgumentLength += lParamSize; break; } @@ -639,7 +649,7 @@ co_IntCallHookProc(INT HookId, Argument = IntCbAllocateMemory(ArgumentLength); if (NULL == Argument) { - ERR("HookProc callback failed: out of memory\n"); + ERR("HookProc callback %d failed: out of memory %d\n",HookId,ArgumentLength); goto Fault_Exit; } Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Argument; @@ -671,9 +681,10 @@ co_IntCallHookProc(INT HookId, CbtCreatewndExtra = (PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS) Extra; RtlCopyMemory( &CbtCreatewndExtra->Cs, CbtCreateWnd->lpcs, sizeof(CREATESTRUCTW) ); CbtCreatewndExtra->WndInsertAfter = CbtCreateWnd->hwndInsertAfter; - CbtCreatewndExtra->Cs.lpszClass = CbtCreateWnd->lpcs->lpszClass; - CbtCreatewndExtra->Cs.lpszName = CbtCreateWnd->lpcs->lpszName; + CbtCreatewndExtra->Cs.lpszClass = CbtCreateWnd->lpcs->lpszClass; + CbtCreatewndExtra->Cs.lpszName = CbtCreateWnd->lpcs->lpszName; Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + //ERR("HCBT_CREATEWND: hWnd %p Csw %p Name %p Class %p\n", Common->wParam, CbtCreateWnd->lpcs, CbtCreateWnd->lpcs->lpszName, CbtCreateWnd->lpcs->lpszClass); break; case HCBT_CLICKSKIPPED: RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MOUSEHOOKSTRUCT)); @@ -754,7 +765,7 @@ co_IntCallHookProc(INT HookId, { if ( iTheId != HookId ) // Hook ID can change. { - ERR("Failure to make Callback %d! Status 0x%x\n",HookId,Status); + ERR("Failure to make Callback %d! Status 0x%x ArgumentLength %d\n",HookId,Status,ArgumentLength); iTheId = HookId; } goto Fault_Exit; diff --git a/win32ss/user/ntuser/callback.h b/win32ss/user/ntuser/callback.h index 2eee4e9b4dd..c83be89a976 100644 --- a/win32ss/user/ntuser/callback.h +++ b/win32ss/user/ntuser/callback.h @@ -75,3 +75,4 @@ HANDLE FASTCALL co_IntCopyImage(HANDLE,UINT,INT,INT,UINT); BOOL FASTCALL co_IntSetWndIcons(VOID); VOID FASTCALL co_IntDeliverUserAPC(VOID); VOID FASTCALL co_IntSetupOBM(VOID); +BOOL FASTCALL IntMsgCreateStructW(PWND,CREATESTRUCTW*,CREATESTRUCTW*,PVOID*,PVOID*); diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index aad83242943..5c6a3fc66a4 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -577,37 +577,184 @@ GetWakeMask(UINT first, UINT last ) return mask; } +// +// Pass Strings to User Heap Space for Message Hook Callbacks. +// +BOOL +FASTCALL +IntMsgCreateStructW( + PWND Window, + CREATESTRUCTW *pCsw, + CREATESTRUCTW *Cs, + PVOID *ppszClass, + PVOID *ppszName ) +{ + PLARGE_STRING WindowName; + PUNICODE_STRING ClassName; + PVOID pszClass = NULL, pszName = NULL; + + /* Fill the new CREATESTRUCTW */ + RtlCopyMemory(pCsw, Cs, sizeof(CREATESTRUCTW)); + pCsw->style = Window->style; /* HCBT_CREATEWND needs the real window style */ + + WindowName = (PLARGE_STRING) Cs->lpszName; + ClassName = (PUNICODE_STRING) Cs->lpszClass; + + // Based on the assumption this is from "unicode source" user32, ReactOS, answer is yes. + if (!IS_ATOM(ClassName->Buffer)) + { + if (ClassName->Length) + { + if (Window->state & WNDS_ANSICREATOR) + { + ANSI_STRING AnsiString; + AnsiString.MaximumLength = (USHORT)RtlUnicodeStringToAnsiSize(ClassName)+sizeof(CHAR); + pszClass = UserHeapAlloc(AnsiString.MaximumLength); + if (!pszClass) + { + ERR("UserHeapAlloc() failed!\n"); + return FALSE; + } + RtlZeroMemory(pszClass, AnsiString.MaximumLength); + AnsiString.Buffer = (PCHAR)pszClass; + RtlUnicodeStringToAnsiString(&AnsiString, ClassName, FALSE); + } + else + { + UNICODE_STRING UnicodeString; + UnicodeString.MaximumLength = ClassName->Length + sizeof(UNICODE_NULL); + pszClass = UserHeapAlloc(UnicodeString.MaximumLength); + if (!pszClass) + { + ERR("UserHeapAlloc() failed!\n"); + return FALSE; + } + RtlZeroMemory(pszClass, UnicodeString.MaximumLength); + UnicodeString.Buffer = (PWSTR)pszClass; + RtlCopyUnicodeString(&UnicodeString, ClassName); + } + *ppszClass = pszClass; + pCsw->lpszClass = UserHeapAddressToUser(pszClass); + } + else + { + pCsw->lpszClass = NULL; + } + } + else + { + pCsw->lpszClass = ClassName->Buffer; + } + if (WindowName->Length) + { + UNICODE_STRING Name; + Name.Buffer = WindowName->Buffer; + Name.Length = (USHORT)min(WindowName->Length, MAXUSHORT); // FIXME: LARGE_STRING truncated + Name.MaximumLength = (USHORT)min(WindowName->MaximumLength, MAXUSHORT); + + if (Window->state & WNDS_ANSICREATOR) + { + ANSI_STRING AnsiString; + AnsiString.MaximumLength = (USHORT)RtlUnicodeStringToAnsiSize(&Name) + sizeof(CHAR); + pszName = UserHeapAlloc(AnsiString.MaximumLength); + if (!pszName) + { + ERR("UserHeapAlloc() failed!\n"); + return FALSE; + } + RtlZeroMemory(pszName, AnsiString.MaximumLength); + AnsiString.Buffer = (PCHAR)pszName; + RtlUnicodeStringToAnsiString(&AnsiString, &Name, FALSE); + } + else + { + UNICODE_STRING UnicodeString; + UnicodeString.MaximumLength = Name.Length + sizeof(UNICODE_NULL); + pszName = UserHeapAlloc(UnicodeString.MaximumLength); + if (!pszName) + { + ERR("UserHeapAlloc() failed!\n"); + return FALSE; + } + RtlZeroMemory(pszName, UnicodeString.MaximumLength); + UnicodeString.Buffer = (PWSTR)pszName; + RtlCopyUnicodeString(&UnicodeString, &Name); + } + *ppszName = pszName; + pCsw->lpszName = UserHeapAddressToUser(pszName); + } + else + { + pCsw->lpszName = NULL; + } + + return TRUE; +} + static VOID FASTCALL -IntCallWndProc( PWND Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +IntCallWndProc( PWND Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam ) { BOOL SameThread = FALSE; CWPSTRUCT CWP; + PVOID pszClass = NULL, pszName = NULL; + CREATESTRUCTW Csw; + + //// Check for a hook to eliminate overhead. //// + if ( !ISITHOOKED(WH_CALLWNDPROC) && !(Window->head.rpdesk->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROC)) ) + return; if (Window->head.pti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) SameThread = TRUE; + if ( Msg == WM_CREATE || Msg == WM_NCCREATE ) + { // + // String pointers are in user heap space, like WH_CBT HCBT_CREATEWND. + // + if (!IntMsgCreateStructW( Window, &Csw, (CREATESTRUCTW *)lParam, &pszClass, &pszName )) + return; + lParam = (LPARAM)&Csw; + } + CWP.hwnd = hWnd; CWP.message = Msg; CWP.wParam = wParam; CWP.lParam = lParam; co_HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, SameThread, (LPARAM)&CWP ); + + if (pszName) UserHeapFree(pszName); + if (pszClass) UserHeapFree(pszClass); } static VOID FASTCALL -IntCallWndProcRet ( PWND Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *uResult) +IntCallWndProcRet( PWND Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *uResult ) { BOOL SameThread = FALSE; CWPRETSTRUCT CWPR; + PVOID pszClass = NULL, pszName = NULL; + CREATESTRUCTW Csw; + + if ( !ISITHOOKED(WH_CALLWNDPROCRET) && !(Window->head.rpdesk->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET)) ) + return; if (Window->head.pti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) SameThread = TRUE; + if ( Msg == WM_CREATE || Msg == WM_NCCREATE ) + { + if (!IntMsgCreateStructW( Window, &Csw, (CREATESTRUCTW *)lParam, &pszClass, &pszName )) + return; + lParam = (LPARAM)&Csw; + } + CWPR.hwnd = hWnd; CWPR.message = Msg; CWPR.wParam = wParam; CWPR.lParam = lParam; CWPR.lResult = uResult ? (*uResult) : 0; co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); + + if (pszName) UserHeapFree(pszName); + if (pszClass) UserHeapFree(pszClass); } static LRESULT handle_internal_message( PWND pWnd, UINT msg, WPARAM wparam, LPARAM lparam ) @@ -2893,7 +3040,7 @@ DWORD APIENTRY NtUserWaitForInputIdle( IN HANDLE hProcess, IN DWORD dwMilliseconds, - IN BOOL Unknown2) + IN BOOL bSharedWow) { PEPROCESS Process; PPROCESSINFO W32Process; diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 9994a6b23ea..c70b6081191 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2102,6 +2102,10 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, UserDereferenceObject(Window); ObDereferenceObject(WinSta); + /* NCCREATE, WM_NCCALCSIZE and Hooks need the original values */ + Cs->lpszName = (LPCWSTR) WindowName; + Cs->lpszClass = (LPCWSTR) ClassName; + //// Check for a hook to eliminate overhead. //// if ( ISITHOOKED(WH_CBT) || (pti->rpdesk->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_CBT)) ) { @@ -2114,79 +2118,10 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, goto cleanup; } - /* Fill the new CREATESTRUCTW */ - RtlCopyMemory(pCsw, Cs, sizeof(CREATESTRUCTW)); - pCsw->style = Window->style; /* HCBT_CREATEWND needs the real window style */ - - // Based on the assumption this is from "unicode source" user32, ReactOS, answer is yes. - if (!IS_ATOM(ClassName->Buffer)) - { - if (Window->state & WNDS_ANSICREATOR) - { - ANSI_STRING AnsiString; - AnsiString.MaximumLength = (USHORT)RtlUnicodeStringToAnsiSize(ClassName)+sizeof(CHAR); - pszClass = UserHeapAlloc(AnsiString.MaximumLength); - if (!pszClass) - { - ERR("UserHeapAlloc() failed!\n"); - goto cleanup; - } - RtlZeroMemory(pszClass, AnsiString.MaximumLength); - AnsiString.Buffer = (PCHAR)pszClass; - RtlUnicodeStringToAnsiString(&AnsiString, ClassName, FALSE); - } - else - { - UNICODE_STRING UnicodeString; - UnicodeString.MaximumLength = ClassName->Length + sizeof(UNICODE_NULL); - pszClass = UserHeapAlloc(UnicodeString.MaximumLength); - if (!pszClass) - { - ERR("UserHeapAlloc() failed!\n"); - goto cleanup; - } - RtlZeroMemory(pszClass, UnicodeString.MaximumLength); - UnicodeString.Buffer = (PWSTR)pszClass; - RtlCopyUnicodeString(&UnicodeString, ClassName); - } - pCsw->lpszClass = UserHeapAddressToUser(pszClass); - } - if (WindowName->Length) + if (!IntMsgCreateStructW( Window, pCsw, Cs, &pszClass, &pszName ) ) { - UNICODE_STRING Name; - Name.Buffer = WindowName->Buffer; - Name.Length = (USHORT)min(WindowName->Length, MAXUSHORT); // FIXME: LARGE_STRING truncated - Name.MaximumLength = (USHORT)min(WindowName->MaximumLength, MAXUSHORT); - - if (Window->state & WNDS_ANSICREATOR) - { - ANSI_STRING AnsiString; - AnsiString.MaximumLength = (USHORT)RtlUnicodeStringToAnsiSize(&Name) + sizeof(CHAR); - pszName = UserHeapAlloc(AnsiString.MaximumLength); - if (!pszName) - { - ERR("UserHeapAlloc() failed!\n"); - goto cleanup; - } - RtlZeroMemory(pszName, AnsiString.MaximumLength); - AnsiString.Buffer = (PCHAR)pszName; - RtlUnicodeStringToAnsiString(&AnsiString, &Name, FALSE); - } - else - { - UNICODE_STRING UnicodeString; - UnicodeString.MaximumLength = Name.Length + sizeof(UNICODE_NULL); - pszName = UserHeapAlloc(UnicodeString.MaximumLength); - if (!pszName) - { - ERR("UserHeapAlloc() failed!\n"); - goto cleanup; - } - RtlZeroMemory(pszName, UnicodeString.MaximumLength); - UnicodeString.Buffer = (PWSTR)pszName; - RtlCopyUnicodeString(&UnicodeString, &Name); - } - pCsw->lpszName = UserHeapAddressToUser(pszName); + ERR("IntMsgCreateStructW() failed!\n"); + goto cleanup; } pCbtCreate->lpcs = pCsw; @@ -2207,10 +2142,6 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, hwndInsertAfter = pCbtCreate->hwndInsertAfter; } - /* NCCREATE and WM_NCCALCSIZE need the original values */ - Cs->lpszName = (LPCWSTR) WindowName; - Cs->lpszClass = (LPCWSTR) ClassName; - if ((Cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) { if (ParentWindow != co_GetDesktopWindow(Window)) diff --git a/win32ss/user/user32/windows/hook.c b/win32ss/user/user32/windows/hook.c index f525bf1cc5a..78b1a37acb3 100644 --- a/win32ss/user/user32/windows/hook.c +++ b/win32ss/user/user32/windows/hook.c @@ -554,8 +554,8 @@ NTSTATUS WINAPI User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength) { PHOOKPROC_CALLBACK_ARGUMENTS Common; - CREATESTRUCTW Csw; - CBT_CREATEWNDW CbtCreatewndw; + CREATESTRUCTW *pCsw = NULL; + CBT_CREATEWNDW *pCbtCreatewndw = NULL; PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra = NULL; KBDLLHOOKSTRUCT KeyboardLlData, *pKeyboardLlData; MSLLHOOKSTRUCT MouseLlData, *pMouseLlData; @@ -608,12 +608,18 @@ User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength) case HCBT_CREATEWND: CbtCreatewndExtra = (PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS) ((PCHAR) Common + Common->lParam); - RtlCopyMemory(&Csw, &CbtCreatewndExtra->Cs, sizeof(CREATESTRUCTW)); - CbtCreatewndw.lpcs = &Csw; - CbtCreatewndw.hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; + + pCbtCreatewndw = (CBT_CREATEWNDW*)HeapAlloc(GetProcessHeap(), 0, sizeof(CBT_CREATEWNDW)); + RtlCopyMemory(pCbtCreatewndw, CbtCreatewndExtra, sizeof(CBT_CREATEWNDW)); + + pCsw = (CREATESTRUCTW*)HeapAlloc(GetProcessHeap(), 0, sizeof(CREATESTRUCTW)); + RtlCopyMemory(pCsw, &CbtCreatewndExtra->Cs, sizeof(CREATESTRUCTW)); + + pCbtCreatewndw->lpcs = pCsw; + pCbtCreatewndw->hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; wParam = Common->wParam; - lParam = (LPARAM) &CbtCreatewndw; - //ERR("HCBT_CREATEWND: hWnd 0x%x Name 0x%x Class 0x%x\n", Common->wParam, Csw.lpszName, Csw.lpszClass); + lParam = (LPARAM) pCbtCreatewndw; + //ERR("HCBT_CREATEWND: hWnd %p Csw %p Name %p Class %p\n", Common->wParam, pCsw, pCsw->lpszName, pCsw->lpszClass); break; case HCBT_CLICKSKIPPED: pMHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); @@ -665,11 +671,13 @@ User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength) switch(Common->Code) { case HCBT_CREATEWND: - CbtCreatewndExtra->WndInsertAfter = CbtCreatewndw.hwndInsertAfter; - CbtCreatewndExtra->Cs.x = CbtCreatewndw.lpcs->x; - CbtCreatewndExtra->Cs.y = CbtCreatewndw.lpcs->y; - CbtCreatewndExtra->Cs.cx = CbtCreatewndw.lpcs->cx; - CbtCreatewndExtra->Cs.cy = CbtCreatewndw.lpcs->cy; + CbtCreatewndExtra->WndInsertAfter = pCbtCreatewndw->hwndInsertAfter; + CbtCreatewndExtra->Cs.x = pCbtCreatewndw->lpcs->x; + CbtCreatewndExtra->Cs.y = pCbtCreatewndw->lpcs->y; + CbtCreatewndExtra->Cs.cx = pCbtCreatewndw->lpcs->cx; + CbtCreatewndExtra->Cs.cy = pCbtCreatewndw->lpcs->cy; + HeapFree(GetProcessHeap(), 0, pCsw); + HeapFree(GetProcessHeap(), 0, pCbtCreatewndw); break; } break;

4 years, 8 months

[reactos] 01/01: [SYSDM] Cumulative update 2020-04-01 for SMBIOS parser (#2495)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61a54aef9ec885b9bad61… commit 61a54aef9ec885b9bad61adbca66d9a7f0fcc3d3 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Apr 2 20:57:53 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 2 19:57:53 2020 +0200 [SYSDM] Cumulative update 2020-04-01 for SMBIOS parser (#2495) --- dll/cpl/sysdm/smbios.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 3 deletions(-) diff --git a/dll/cpl/sysdm/smbios.c b/dll/cpl/sysdm/smbios.c index 663c6d3b84f..5bbcb8d883d 100644 --- a/dll/cpl/sysdm/smbios.c +++ b/dll/cpl/sysdm/smbios.c @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/sysdm/smbios.c * PURPOSE: Retrieve device or motherboard name identifier from DMI/SMBIOS - * COPYRIGHT: Copyright 2018-2019 Stanislav Motylkov <x86corez(a)gmail.com> + * COPYRIGHT: Copyright 2018-2020 Stanislav Motylkov <x86corez(a)gmail.com> * */ @@ -39,6 +39,28 @@ IsPunctuation( return (chr <= L' ' || chr == L'.' || chr == L','); } +static +BOOL IsDigitStrA(PCHAR DmiString) +{ + PCHAR c = DmiString; + if (!c) + { + return FALSE; + } + while (*c) + { + if (*c >= '0' && *c <= '9') + { + c++; + } + else + { + return FALSE; + } + } + return TRUE; +} + /* * Trim redundant characters */ @@ -246,12 +268,19 @@ BOOL IsGenericSystemName(PCWSTR ven, PCWSTR dev, BOOL * bRemove) { L"LTD Delovoy Office", TRUE, FALSE }, { L"Motherboard by ZOTAC", TRUE, FALSE }, // various boards + { L"Type2 - Board Manufacturer", TRUE, TRUE }, { L"Type2 - Board Vendor Name1", TRUE, TRUE }, + { L"BASE_BOARD_MANUFACTURER", TRUE, TRUE }, + { L"$(DEFAULT_STRING)", TRUE, TRUE }, { L"DEPO Computers", TRUE, FALSE }, { L"-", TRUE, TRUE }, + { L"N/A", TRUE, TRUE }, { L"OEM", TRUE, TRUE }, { L"O.E.M", TRUE, TRUE }, + { L"empty", TRUE, TRUE }, + { L"insyde", TRUE, FALSE }, { L"Unknow", TRUE, TRUE }, + { L"Not Applicable", TRUE, TRUE }, // distinguish between Oracle and older VirtualBox releases (Sun, etc.) { L"innotek GmbH", TRUE, FALSE }, }; @@ -275,12 +304,16 @@ BOOL IsGenericSystemName(PCWSTR ven, PCWSTR dev, BOOL * bRemove) { L"HuronRiver Platform", TRUE, FALSE }, { L"SandyBridge Platform", TRUE, FALSE }, { L"Broadwell Platform", TRUE, FALSE }, + { L"Kabylake Platform", TRUE, FALSE }, { L"Sabine Platform", TRUE, FALSE }, // various boards { L"Base Board Product Name", TRUE, TRUE }, { L"Base Board Version", TRUE, TRUE }, { L"Type2 - Board Product Name1", TRUE, TRUE }, + { L"Type2 - Board Product Name", TRUE, TRUE }, { L"Type2 - Board Version", TRUE, TRUE }, + { L"MODEL_NAME", TRUE, TRUE }, + { L"$(DEFAULT_STRING)", TRUE, TRUE }, { L"*", TRUE, TRUE }, { L"T", TRUE, TRUE }, { L"GEG", TRUE, TRUE }, @@ -289,6 +322,7 @@ BOOL IsGenericSystemName(PCWSTR ven, PCWSTR dev, BOOL * bRemove) { L"OEM", TRUE, TRUE }, { L"INVA", TRUE, TRUE }, { L"O.E.M", TRUE, TRUE }, + { L"empty", TRUE, TRUE }, { L"DNSNB", TRUE, FALSE }, { L"12345", TRUE, FALSE }, { L"``````", TRUE, TRUE }, @@ -296,6 +330,7 @@ BOOL IsGenericSystemName(PCWSTR ven, PCWSTR dev, BOOL * bRemove) { L"Desktop", FALSE, TRUE }, { L"Invalid", FALSE, TRUE }, { L"Reserved", TRUE, TRUE }, + { L"Not Applicable", TRUE, TRUE }, { L"HaierComputer", TRUE, FALSE }, { L"DEPO Computers", TRUE, FALSE }, { L"InsydeH2O EFI BIOS", TRUE, TRUE }, @@ -430,6 +465,29 @@ BOOL TrimNonPrintable(PCHAR DmiString) return FALSE; } +/* TrimNonPrintable function wrapper. It does special preprocessing + * so the function returns FALSE in some corner cases, making the parser + * use system strings anyway (instead of board strings). */ +static +BOOL TrimNonPrintableProd(PCHAR DmiString) +{ + PCHAR c; + + if (!DmiString) + { + return FALSE; + } + + /* Special handling for HP with broken revision */ + c = strstr(DmiString, "(\xFF\xFF"); + if (c > DmiString) + { + *c = 0; + } + + return TrimNonPrintable(DmiString); +} + BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) { static const VENDOR_LONG_NAME LongNames[] = @@ -442,13 +500,19 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) { L"Silicon Graphics International", L"SGI" }, { L"Intel(R) Client Systems", L"Intel" }, { L"InformationComputerSystems", L"ICS" }, + { L"Bernecker + Rainer Industrie-Elektronik", L"Bernecker & Rainer" }, { L"CHUWI INNOVATION AND TECHNOLOGY", L"CHUWI" }, + { L"CHUWI INNOVATION LIMITED", L"CHUWI" }, + { L"CHUWI INNOVATION LIMITED", L"CHUWI" }, { L"http://www.abit.com.tw/", L"ABIT" }, + { L"http:\\\\www.abit.com.tw", L"ABIT" }, { L"www.abit.com.tw", L"ABIT" }, { L"CASPER BILGISAYAR SISTEMLERI A.S", L"Casper" }, { L"Colorful Technology And Development", L"Colorful" }, { L"Colorful Yu Gong Technology And Development", L"Colorful Yu Gong" }, { L"HaierComputer", L"Haier" }, + { L"Haier Information Technology (Shen Zhen)", L"Haier" }, + { L"HASEECOMPUTERS", L"Hasee" }, { L"HELIOS BUSINESS COMPUTER", L"HELIOS" }, { L"Shanghai Zongzhi InfoTech", L"Zongzhi" }, { L"TSING HUA TONGFANG CO.,LTD", L"TSINGHUA TONGFANG" }, @@ -466,16 +530,20 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) { L"Systems", FALSE }, { L"Microsystems", FALSE }, { L"Infosystems", FALSE }, + { L"Digital", FALSE }, { L"Electronics", FALSE }, { L"Electric", FALSE }, + { L"Elektronik", FALSE }, { L"Software", FALSE }, { L"Foundation", FALSE }, { L"International", FALSE }, { L"Interantonal", FALSE }, // on purpose (some MSI boards) { L"INTERANTIONAL", FALSE }, // on purpose (some MSI boards) { L"Industrial", FALSE }, + { L"Industrie", FALSE }, { L"Information", FALSE }, { L"Informatica", FALSE }, + { L"Produkte", FALSE }, { L"Technology", FALSE }, { L"Tecohnology", FALSE }, // on purpose (some Gigabyte boards) { L"Technologies", FALSE }, @@ -486,6 +554,7 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) { L"Co", FALSE }, { L"Corp", FALSE }, { L"Crop", FALSE }, + { L"LLC", FALSE }, { L"Ltd", FALSE }, { L"LTDA", FALSE }, { L"GmbH", FALSE }, @@ -501,6 +570,7 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) { L"OOO", TRUE }, { L"CJSC", FALSE }, { L"INT'L", FALSE }, + { L"INTL", FALSE }, { L"plc", FALSE }, }; PVOID SMBiosBuf; @@ -518,7 +588,7 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) } TrimNonPrintable(DmiStrings[SYS_VENDOR]); - bTrimProduct = TrimNonPrintable(DmiStrings[SYS_PRODUCT]); + bTrimProduct = TrimNonPrintableProd(DmiStrings[SYS_PRODUCT]); TrimNonPrintable(DmiStrings[SYS_VERSION]); bTrimFamily = TrimNonPrintable(DmiStrings[SYS_FAMILY]); TrimNonPrintable(DmiStrings[BOARD_VENDOR]); @@ -542,7 +612,7 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) !wcscmp(dev, ven) || bGenericName) { - BOOL bGenericVen = FALSE, bGenericDev = (wcslen(dev) == 0 || !wcscmp(dev, ven) || bTrimProduct); + BOOL bGenericVen = FALSE, bRemoveVen = FALSE, bGenericDev = (wcslen(dev) == 0 || !wcscmp(dev, ven) || bTrimProduct); if (bGenericName && IsGenericSystemName(ven, NULL, &bRemove)) { @@ -551,6 +621,7 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) *ven = 0; } bGenericVen = TRUE; + bRemoveVen = bRemove; } if (bGenericName && IsGenericSystemName(NULL, dev, &bRemove)) { @@ -575,6 +646,11 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) if (IsGenericSystemName(ven, NULL, &bRemove) && bRemove) { *ven = 0; + + if (bGenericVen && !bRemoveVen) + { + GetSMBiosStringW(DmiStrings[SYS_VENDOR], ven, _countof(ven), TRUE); + } } if (IsGenericSystemName(NULL, dev, &bRemove) && bRemove) { @@ -606,6 +682,15 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) } } } + else if (DmiStrings[BOARD_NAME] != NULL) + { + GetSMBiosStringW(DmiStrings[BOARD_NAME], dev, _countof(dev), TRUE); + + if (IsGenericSystemName(NULL, dev, &bRemove) && bRemove) + { + *dev = 0; + } + } if (wcslen(ven) == 0 && wcslen(dev) == 0) { @@ -691,8 +776,10 @@ BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) strcmp(tmpstr, "LENOVO") && strstr(tmpstr, "LENOVO ") == NULL && strstr(tmpstr, "LENOVO PRODUCT") == NULL && + strstr(tmpstr, "LENOVOPRODUCT") == NULL && strstr(tmpstr, "INVALID") == NULL && strncmp(tmpstr, " ", 3) && + (strlen(tmpstr) >= 3 || !IsDigitStrA(tmpstr)) && strstr(DmiStrings[SYS_VERSION], "Rev ") == NULL && strstr(DmiStrings[SYS_VERSION], "1.") == NULL && wcsistr(dev, L"System ") == NULL && // includes System x and ThinkSystem

4 years, 8 months

[reactos] 01/01: [RPCRT4] Addendum to support for remote pipes names in ncacn_pipe_name() (24cd7bbe). CORE-6561 CORE-13442

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5274857da98c5b1a4f602… commit 5274857da98c5b1a4f6021f54ef8cbe1c3218376 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Apr 2 18:25:44 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Apr 2 18:35:39 2020 +0200 [RPCRT4] Addendum to support for remote pipes names in ncacn_pipe_name() (24cd7bbe). CORE-6561 CORE-13442 - Call GetComputerNameA() only when a non-empty server name has been provided, thus slightly improving speed for the most common case when local calls (with an empty server name) are done. - When a server name is passed, trim any leading UNC server prefix since the latter will be restored when building the pipe name string. --- dll/win32/rpcrt4/rpc_transport.c | 21 +++++++++++++++++---- dll/win32/rpcrt4/rpcrt4_ros.diff | 20 +++++++++++++++++--- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dll/win32/rpcrt4/rpc_transport.c b/dll/win32/rpcrt4/rpc_transport.c index aee897644c9..e77cb287be9 100644 --- a/dll/win32/rpcrt4/rpc_transport.c +++ b/dll/win32/rpcrt4/rpc_transport.c @@ -262,18 +262,31 @@ static char *ncacn_pipe_name(const char *endpoint) static const char prefix[] = "\\\\"; static const char local[] = "."; char ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD bufLen = ARRAY_SIZE(ComputerName); #else static const char prefix[] = "\\\\."; #endif char *pipe_name; #ifdef __REACTOS__ - DWORD bufLen = ARRAYSIZE(ComputerName); - - GetComputerNameA(ComputerName, &bufLen); + if (server != NULL && *server != 0) + { + /* Trim any leading UNC server prefix. */ + if (server[0] == '\\' && server[1] == '\\') + server += 2; - if (server == NULL || *server == 0 || stricmp(ComputerName, server) == 0) + /* If the server represents the local computer, use instead + * the local prefix to avoid a round in UNC name resolution. */ + if (GetComputerNameA(ComputerName, &bufLen) && + (stricmp(ComputerName, server) == 0)) + { server = local; + } + } + else + { + server = local; + } #endif /* protseq=ncacn_np: named pipes */ diff --git a/dll/win32/rpcrt4/rpcrt4_ros.diff b/dll/win32/rpcrt4/rpcrt4_ros.diff index ea7412c191c..c1ae133a864 100644 --- a/dll/win32/rpcrt4/rpcrt4_ros.diff +++ b/dll/win32/rpcrt4/rpcrt4_ros.diff @@ -129,13 +129,27 @@ diff -pudN e:\wine\dlls\rpcrt4/rpc_transport.c e:\reactos\dll\win32\rpcrt4/rpc_t + static const char prefix[] = "\\\\"; + static const char local[] = "."; + char ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; ++ DWORD bufLen = ARRAY_SIZE(ComputerName); char *pipe_name; -+ DWORD bufLen = ARRAYSIZE(ComputerName); + -+ GetComputerNameA(ComputerName, &bufLen); ++ if (server != NULL && *server != 0) ++ { ++ /* Trim any leading UNC server prefix. */ ++ if (server[0] == '\\' && server[1] == '\\') ++ server += 2; + -+ if (server == NULL || *server == 0 || stricmp(ComputerName, server) == 0) ++ /* If the server represents the local computer, use instead ++ * the local prefix to avoid a round in UNC name resolution. */ ++ if (GetComputerNameA(ComputerName, &bufLen) && ++ (stricmp(ComputerName, server) == 0)) ++ { + server = local; ++ } ++ } ++ else ++ { ++ server = local; ++ } /* protseq=ncacn_np: named pipes */ - pipe_name = I_RpcAllocate(sizeof(prefix) + strlen(endpoint));

4 years, 8 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 April 2020