Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [IPHLPAPI] Silence obsolete FIXME in GetAdaptersAddresses (#5834)
by Doug Lyons 26 Oct '23

26 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4eace8d762426e9ca7de0… commit 4eace8d762426e9ca7de0b357eb92d17299d9a9b Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Oct 26 11:45:44 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 26 16:45:44 2023 +0000 [IPHLPAPI] Silence obsolete FIXME in GetAdaptersAddresses (#5834) --- dll/win32/iphlpapi/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/iphlpapi/address.c b/dll/win32/iphlpapi/address.c index fb40963c7d4..e3ac92588c5 100644 --- a/dll/win32/iphlpapi/address.c +++ b/dll/win32/iphlpapi/address.c @@ -331,8 +331,8 @@ GetAdaptersAddresses( DWORD MIN_SIZE = 15 * 1024; PIP_ADAPTER_ADDRESSES PreviousAA = NULL; - FIXME("GetAdaptersAddresses - Semi Stub: Family %u, Flags 0x%08x, Reserved %p, pAdapterAddress %p, pOutBufLen %p.\n", - Family, Flags, Reserved, pAdapterAddresses, pOutBufLen); + TRACE("Family %u, Flags 0x%08x, Reserved %p, pAdapterAddress %p, pOutBufLen %p\n", + Family, Flags, Reserved, pAdapterAddresses, pOutBufLen); if (!pOutBufLen) return ERROR_INVALID_PARAMETER;

1 0

[reactos] 01/01: [SHELL32][SDK] Implement IsSuspendAllowed (#5831)
by Katayama Hirofumi MZ 26 Oct '23

26 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=995f56d1d34a8a8a93dea… commit 995f56d1d34a8a8a93deac5fb576f767a8552a85 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 26 23:27:45 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 26 23:27:45 2023 +0900 [SHELL32][SDK] Implement IsSuspendAllowed (#5831) - Add IsShutdownAllowed helper function. - Add IsSuspendAllowed prototype to <undocshell.h>. - Implement IsSuspendAllowed function. --- dll/win32/shell32/stubs.cpp | 11 ----------- dll/win32/shell32/utils.cpp | 14 ++++++++++++++ sdk/include/reactos/undocshell.h | 1 + 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index f8518336906..9ca95825c7f 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -783,17 +783,6 @@ DAD_DragEnterEx2(HWND hwndTarget, return FALSE; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -IsSuspendAllowed(VOID) -{ - FIXME("IsSuspendAllowed() stub\n"); - return FALSE; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 57ade40713e..f10cb11e290 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -164,6 +164,20 @@ Quit: return ret; } +BOOL IsShutdownAllowed(VOID) +{ + return SHTestTokenPrivilegeW(NULL, SE_SHUTDOWN_NAME); +} + +/************************************************************************* + * IsSuspendAllowed (SHELL32.53) + */ +BOOL WINAPI IsSuspendAllowed(VOID) +{ + TRACE("()\n"); + return IsShutdownAllowed() && IsPwrSuspendAllowed(); +} + /************************************************************************* * SHGetShellStyleHInstance (SHELL32.749) */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 1577466ab9f..5b6953e9204 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -697,6 +697,7 @@ SHInvokePrivilegedFunctionW( BOOL WINAPI SHTestTokenPrivilegeW(_In_opt_ HANDLE hToken, _In_z_ LPCWSTR lpName); +BOOL WINAPI IsSuspendAllowed(VOID); /***************************************************************************** * Shell32 resources

1 0

[reactos] 01/01: [REGEDIT] Improve error handling (#5833)
by Katayama Hirofumi MZ 26 Oct '23

26 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be8a6f8af19b7b9f7be29… commit be8a6f8af19b7b9f7be29ea6b81ed8da029daa2c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 26 19:57:42 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 26 19:57:42 2023 +0900 [REGEDIT] Improve error handling (#5833) - Don't exit the main program on error. - Improve output_message function. - Use output_message instead of some error_exit function calls. CORE-19188 --- base/applications/regedit/regedit.c | 8 +++++--- base/applications/regedit/regproc.c | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/base/applications/regedit/regedit.c b/base/applications/regedit/regedit.c index 35fa13f037d..0e3cc27f669 100644 --- a/base/applications/regedit/regedit.c +++ b/base/applications/regedit/regedit.c @@ -37,9 +37,7 @@ static void output_writeconsole(const WCHAR *str, DWORD wlen) #ifdef __REACTOS__ /* This is win32gui application, don't ever try writing to console. * For the console version we have a separate reg.exe application. */ - WCHAR AppStr[255]; - LoadStringW(hInst, IDS_APP_TITLE, AppStr, ARRAY_SIZE(AppStr)); - MessageBoxW(NULL, str, AppStr, MB_OK | MB_ICONINFORMATION); + MessageBoxW(NULL, str, NULL, MB_ICONERROR); #else DWORD count; @@ -219,7 +217,11 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) break; } default: +#ifdef __REACTOS__ + output_message(STRING_UNHANDLED_ACTION); +#else error_exit(STRING_UNHANDLED_ACTION); +#endif break; } } diff --git a/base/applications/regedit/regproc.c b/base/applications/regedit/regproc.c index f140b672381..1ef1fc9e6c2 100644 --- a/base/applications/regedit/regproc.c +++ b/base/applications/regedit/regproc.c @@ -1105,11 +1105,23 @@ void delete_registry_key(WCHAR *reg_key_name) if (!(key_class = parse_key_name(reg_key_name, &key_name))) { if (key_name) *(key_name - 1) = 0; +#ifdef __REACTOS__ + output_message(STRING_INVALID_SYSTEM_KEY, reg_key_name); + return; +#else error_exit(STRING_INVALID_SYSTEM_KEY, reg_key_name); +#endif } if (!key_name || !*key_name) +#ifdef __REACTOS__ + { + output_message(STRING_DELETE_FAILED, reg_key_name); + return; + } +#else error_exit(STRING_DELETE_FAILED, reg_key_name); +#endif #ifdef __REACTOS__ SHDeleteKey(key_class, key_name); @@ -1460,7 +1472,12 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) if (!file) { _wperror(L"regedit"); +#ifdef __REACTOS__ + output_message(STRING_CANNOT_OPEN_FILE, file_name); + return NULL; +#else error_exit(STRING_CANNOT_OPEN_FILE, file_name); +#endif } } @@ -1506,6 +1523,10 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) return FALSE; fp = REGPROC_open_export_file(file_name, unicode); +#ifdef __REACTOS__ + if (!fp) + return TRUE; /* Error message is already displayed */ +#endif export_registry_data(fp, key, path, unicode); export_newline(fp, unicode); fclose(fp); @@ -1522,6 +1543,10 @@ static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode) WCHAR *class_name; fp = REGPROC_open_export_file(file_name, unicode); +#ifdef __REACTOS__ + if (!fp) + return TRUE; /* Error message is already displayed */ +#endif for (i = 0; i < ARRAY_SIZE(classes); i++) {

1 0

[reactos] 01/01: [REGEDIT] Use <strsafe.h> functions strictly Part 2 (#5832)
by Katayama Hirofumi MZ 26 Oct '23

26 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fea414b9ed2cc7a81fdda… commit fea414b9ed2cc7a81fddad18bc90f9d023beee15 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 26 10:39:12 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 26 10:39:12 2023 +0900 [REGEDIT] Use <strsafe.h> functions strictly Part 2 (#5832) Follow-up to #5825. Use StringCchPrintfW instead of swprintf. CORE-18876 --- base/applications/regedit/regproc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/base/applications/regedit/regproc.c b/base/applications/regedit/regproc.c index 8311a477712..f140b672381 100644 --- a/base/applications/regedit/regproc.c +++ b/base/applications/regedit/regproc.c @@ -1191,7 +1191,8 @@ static size_t export_value_name(FILE *fp, WCHAR *name, size_t len, BOOL unicode) WCHAR *str = REGPROC_escape_string(name, len, &line_len); WCHAR *buf = malloc((line_len + 4) * sizeof(WCHAR)); #ifdef __REACTOS__ - line_len = swprintf(buf, L"\"%s\"=", str); + StringCchPrintfW(buf, line_len + 4, L"\"%s\"=", str); + line_len = wcslen(buf); #else line_len = swprintf(buf, line_len + 4, L"\"%s\"=", str); #endif @@ -1218,7 +1219,7 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) str = REGPROC_escape_string(data, len, &line_len); *buf = malloc((line_len + 3) * sizeof(WCHAR)); #ifdef __REACTOS__ - swprintf(*buf, L"\"%s\"", str); + StringCchPrintfW(*buf, line_len + 3, L"\"%s\"", str); #else swprintf(*buf, line_len + 3, L"\"%s\"", str); #endif @@ -1229,7 +1230,7 @@ static void export_dword_data(WCHAR **buf, DWORD *data) { *buf = malloc(15 * sizeof(WCHAR)); #ifdef __REACTOS__ - swprintf(*buf, L"dword:%08x", *data); + StringCchPrintfW(*buf, 15, L"dword:%08x", *data); #else swprintf(*buf, 15, L"dword:%08x", *data); #endif @@ -1249,7 +1250,8 @@ static size_t export_hex_data_type(FILE *fp, DWORD type, BOOL unicode) { WCHAR *buf = malloc(15 * sizeof(WCHAR)); #ifdef __REACTOS__ - line_len = swprintf(buf, L"hex(%x):", type); + StringCchPrintfW(buf, 15, L"hex(%x):", type); + line_len = wcslen(buf); #else line_len = swprintf(buf, 15, L"hex(%x):", type); #endif @@ -1280,7 +1282,8 @@ static void export_hex_data(FILE *fp, WCHAR **buf, DWORD type, DWORD line_len, for (i = 0, pos = 0; i < size; i++) { #ifdef __REACTOS__ - pos += swprintf(*buf + pos, L"%02x", ((BYTE *)data)[i]); + StringCchPrintfW(*buf + pos, 3, L"%02x", ((BYTE *)data)[i]); + pos += wcslen(*buf + pos); #else pos += swprintf(*buf + pos, 3, L"%02x", ((BYTE *)data)[i]); #endif @@ -1346,7 +1349,7 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, subkey_path = malloc((path_len + subkey_len + 2) * sizeof(WCHAR)); #ifdef __REACTOS__ - swprintf(subkey_path, L"%s\\%s", path, subkey_name); + StringCchPrintfW(subkey_path, path_len + subkey_len + 2, L"%s\\%s", path, subkey_name); #else swprintf(subkey_path, path_len + subkey_len + 2, L"%s\\%s", path, subkey_name); #endif @@ -1360,7 +1363,7 @@ static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode) buf = malloc((lstrlenW(name) + 7) * sizeof(WCHAR)); #ifdef __REACTOS__ - swprintf(buf, L"\r\n[%s]\r\n", name); + StringCchPrintfW(buf, lstrlenW(name) + 7, L"\r\n[%s]\r\n", name); #else swprintf(buf, lstrlenW(name) + 7, L"\r\n[%s]\r\n", name); #endif

1 0

[reactos] 01/01: [REGEDIT] Use <strsafe.h> functions strictly (#5825)
by Katayama Hirofumi MZ 26 Oct '23

26 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8cef980ab96b7027120f7… commit 8cef980ab96b7027120f759ccd467bbaa278302b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 26 10:09:31 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 26 10:09:31 2023 +0900 [REGEDIT] Use <strsafe.h> functions strictly (#5825) Use safer functions for buffer manipulation to avoid buffer overflow/overrun. CORE-18876 --- base/applications/regedit/childwnd.c | 9 +++++---- base/applications/regedit/edit.c | 26 ++++++++++++++------------ base/applications/regedit/find.c | 21 ++++++++++----------- base/applications/regedit/framewnd.c | 8 +++++--- base/applications/regedit/security.c | 3 +-- base/applications/regedit/txtproc.c | 5 +++-- 6 files changed, 38 insertions(+), 34 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index 67a88bc90a5..d77ed1899b3 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -177,7 +177,7 @@ static void SuggestKeys(HKEY hRootKey, LPCWSTR pszKeyPath, LPWSTR pszSuggestions RegCloseKey(hOtherKey); bFound = TRUE; - wcscpy(szLastFound, szBuffer); + StringCbCopyW(szLastFound, sizeof(szLastFound), szBuffer); pszKeyPath = szLastFound; } } @@ -258,10 +258,11 @@ UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath, BOOL bSelectNone) if (fullPath) { /* set (correct) the address bar text */ - if (keyPath[0] != L'\0') - swprintf(fullPath, L"%s%s%s", rootName, keyPath[0]==L'\\'?L"":L"\\", keyPath); + if (keyPath[0] != UNICODE_NULL) + StringCbPrintfW(fullPath, cbFullPath, L"%s%s%s", rootName, + ((keyPath[0] == L'\\') ? L"" : L"\\"), keyPath); else - fullPath = wcscpy(fullPath, rootName); + StringCbCopyW(fullPath, cbFullPath, rootName); SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath); diff --git a/base/applications/regedit/edit.c b/base/applications/regedit/edit.c index d84361c7a0a..8805ccb35e7 100644 --- a/base/applications/regedit/edit.c +++ b/base/applications/regedit/edit.c @@ -50,10 +50,10 @@ void error(HWND hwnd, INT resId, ...) hInstance = GetModuleHandle(0); if (!LoadStringW(hInstance, IDS_ERROR, title, ARRAY_SIZE(title))) - wcscpy(title, L"Error"); + StringCbCopyW(title, sizeof(title), L"Error"); if (!LoadStringW(hInstance, resId, errfmt, ARRAY_SIZE(errfmt))) - wcscpy(errfmt, L"Unknown error string!"); + StringCbCopyW(errfmt, sizeof(errfmt), L"Unknown error string!"); va_start(ap, resId); _vsnwprintf(errstr, ARRAY_SIZE(errstr), errfmt, ap); @@ -66,7 +66,7 @@ static void error_code_messagebox(HWND hwnd, DWORD error_code) { WCHAR title[256]; if (!LoadStringW(hInst, IDS_ERROR, title, ARRAY_SIZE(title))) - wcscpy(title, L"Error"); + StringCbCopyW(title, sizeof(title), L"Error"); ErrorMessageBox(hwnd, title, error_code); } @@ -81,13 +81,13 @@ void warning(HWND hwnd, INT resId, ...) hInstance = GetModuleHandle(0); if (!LoadStringW(hInstance, IDS_WARNING, title, ARRAY_SIZE(title))) - wcscpy(title, L"Warning"); + StringCbCopyW(title, sizeof(title), L"Warning"); if (!LoadStringW(hInstance, resId, errfmt, ARRAY_SIZE(errfmt))) - wcscpy(errfmt, L"Unknown error string!"); + StringCbCopyW(errfmt, sizeof(errfmt), L"Unknown error string!"); va_start(ap, resId); - _vsnwprintf(errstr, ARRAY_SIZE(errstr), errfmt, ap); + StringCbVPrintfW(errstr, sizeof(errstr), errfmt, ap); va_end(ap); MessageBoxW(hwnd, errstr, title, MB_OK | MB_ICONSTOP); @@ -304,7 +304,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, buffer); } CheckRadioButton (hwndDlg, IDC_FORMAT_HEX, IDC_FORMAT_DEC, IDC_FORMAT_HEX); - swprintf(ValueString, L"%lx", dwordValueData); + StringCbPrintfW(ValueString, sizeof(ValueString), L"%lx", dwordValueData); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, ValueString); SendMessage(GetDlgItem(hwndDlg, IDC_VALUE_DATA), EM_SETSEL, 0, -1); SetFocus(GetDlgItem(hwndDlg, IDC_VALUE_DATA)); @@ -327,7 +327,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP } } } - swprintf(ValueString, L"%lx", Value); + StringCbPrintfW(ValueString, sizeof(ValueString), L"%lx", Value); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, ValueString); return TRUE; } @@ -347,7 +347,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP } } } - swprintf(ValueString, L"%lu", Value); + StringCbPrintfW(ValueString, sizeof(ValueString), L"%lu", Value); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, ValueString); return TRUE; } @@ -1491,6 +1491,7 @@ LONG RenameKey(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpNewName) LPCWSTR s; LPWSTR lpNewSubKey = NULL; LONG Ret = 0; + SIZE_T cbNewSubKey; if (!lpSubKey) return Ret; @@ -1499,11 +1500,12 @@ LONG RenameKey(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpNewName) if (s) { s++; - lpNewSubKey = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (s - lpSubKey + wcslen(lpNewName) + 1) * sizeof(WCHAR)); + cbNewSubKey = (s - lpSubKey + wcslen(lpNewName) + 1) * sizeof(WCHAR); + lpNewSubKey = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, cbNewSubKey); if (lpNewSubKey != NULL) { - memcpy(lpNewSubKey, lpSubKey, (s - lpSubKey) * sizeof(WCHAR)); - wcscpy(lpNewSubKey + (s - lpSubKey), lpNewName); + StringCbCopyNW(lpNewSubKey, cbNewSubKey, lpSubKey, (s - lpSubKey) * sizeof(WCHAR)); + StringCbCatW(lpNewSubKey, cbNewSubKey, lpNewName); lpNewName = lpNewSubKey; } else diff --git a/base/applications/regedit/find.c b/base/applications/regedit/find.c index 444f4a25952..9405271a916 100644 --- a/base/applications/regedit/find.c +++ b/base/applications/regedit/find.c @@ -144,7 +144,7 @@ BOOL RegFindRecurse( if(wcslen(pszSubKey) >= _countof(szSubKey)) return FALSE; - wcscpy(szSubKey, pszSubKey); + StringCbCopyW(szSubKey, sizeof(szSubKey), pszSubKey); hSubKey = NULL; lResult = RegOpenKeyExW(hKey, szSubKey, 0, KEY_ALL_ACCESS, &hSubKey); @@ -304,14 +304,14 @@ BOOL RegFindRecurse( ppszFoundValueName)) { LPWSTR psz = *ppszFoundSubKey; - *ppszFoundSubKey = malloc( - (wcslen(szSubKey) + wcslen(psz) + 2) * sizeof(WCHAR)); + SIZE_T cbFoundSubKey = (wcslen(szSubKey) + wcslen(psz) + 2) * sizeof(WCHAR); + *ppszFoundSubKey = malloc(cbFoundSubKey); if (*ppszFoundSubKey == NULL) goto err; if (szSubKey[0]) { - wcscpy(*ppszFoundSubKey, szSubKey); - wcscat(*ppszFoundSubKey, s_backslash); + StringCbCopyW(*ppszFoundSubKey, cbFoundSubKey, szSubKey); + StringCbCatW(*ppszFoundSubKey, cbFoundSubKey, s_backslash); } else **ppszFoundSubKey = 0; @@ -368,7 +368,7 @@ BOOL RegFindWalk( ppszFoundValueName)) return TRUE; - wcscpy(szSubKey, pszSubKey); + StringCbCopyW(szSubKey, sizeof(szSubKey), pszSubKey); while(szSubKey[0] != 0) { if (DoEvents()) @@ -460,15 +460,14 @@ BOOL RegFindWalk( ppszFoundSubKey, ppszFoundValueName)) { LPWSTR psz = *ppszFoundSubKey; - *ppszFoundSubKey = malloc( - (wcslen(szSubKey) + wcslen(psz) + 2) * - sizeof(WCHAR)); + SIZE_T cbFoundSubKey = (wcslen(szSubKey) + wcslen(psz) + 2) * sizeof(WCHAR); + *ppszFoundSubKey = malloc(cbFoundSubKey); if (*ppszFoundSubKey == NULL) goto err; if (szSubKey[0]) { - wcscpy(*ppszFoundSubKey, szSubKey); - wcscat(*ppszFoundSubKey, s_backslash); + StringCbCopyW(*ppszFoundSubKey, cbFoundSubKey, szSubKey); + StringCbCatW(*ppszFoundSubKey, cbFoundSubKey, s_backslash); } else **ppszFoundSubKey = 0; diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index 6b5b1c28cfb..6f382a072cd 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -138,7 +138,7 @@ static void OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu) { WCHAR str[100]; - wcscpy(str, L""); + str[0] = UNICODE_NULL; if (nFlags & MF_POPUP) { if (hSysMenu != GetMenu(hWnd)) @@ -814,6 +814,7 @@ BOOL CopyKeyName(HWND hWnd, HKEY hRootKey, LPCWSTR keyName) WCHAR szBuffer[512]; HGLOBAL hGlobal; LPWSTR s; + SIZE_T cbGlobal; if (!OpenClipboard(hWnd)) goto done; @@ -825,12 +826,13 @@ BOOL CopyKeyName(HWND hWnd, HKEY hRootKey, LPCWSTR keyName) if (!GetKeyName(szBuffer, ARRAY_SIZE(szBuffer), hRootKey, keyName)) goto done; - hGlobal = GlobalAlloc(GMEM_MOVEABLE, (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + cbGlobal = (wcslen(szBuffer) + 1) * sizeof(WCHAR); + hGlobal = GlobalAlloc(GMEM_MOVEABLE, cbGlobal); if (!hGlobal) goto done; s = GlobalLock(hGlobal); - wcscpy(s, szBuffer); + StringCbCopyW(s, cbGlobal, szBuffer); GlobalUnlock(hGlobal); SetClipboardData(CF_UNICODETEXT, hGlobal); diff --git a/base/applications/regedit/security.c b/base/applications/regedit/security.c index 71251583e9c..0ea90092d91 100644 --- a/base/applications/regedit/security.c +++ b/base/applications/regedit/security.c @@ -782,8 +782,7 @@ CRegKeySecurity_fnConstructor(LPWSTR lpRegKey, obj->ObjectInfo = *ObjectInfo; obj->Btn = Btn; obj->hRootKey = hRootKey; - wcscpy(obj->szRegKey, - lpRegKey); + StringCbCopyW(obj->szRegKey, sizeof(obj->szRegKey), lpRegKey); } else SetLastError(ERROR_NOT_ENOUGH_MEMORY); diff --git a/base/applications/regedit/txtproc.c b/base/applications/regedit/txtproc.c index f5e3ea041c2..092930e6f7a 100644 --- a/base/applications/regedit/txtproc.c +++ b/base/applications/regedit/txtproc.c @@ -194,8 +194,9 @@ static WCHAR * txt_build_subkey_path(LPCWSTR path, DWORD path_len, LPCWSTR subkey_name, DWORD subkey_len) { WCHAR *subkey_path; - subkey_path = malloc((path_len + subkey_len + 2) * sizeof(WCHAR)); - swprintf(subkey_path, L"%s\\%s", path, subkey_name); + SIZE_T cb_subkey_path = (path_len + subkey_len + 2) * sizeof(WCHAR); + subkey_path = malloc(cb_subkey_path); + StringCbPrintfW(subkey_path, cb_subkey_path, L"%s\\%s", path, subkey_name); return subkey_path; }

1 0

[reactos] 01/01: [SYSSETUP] syssetup.rc improve URLs (#5810)
by Joachim Henze 24 Oct '23

24 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9360423cc22d1b5a8f064… commit 9360423cc22d1b5a8f064895ba2390edc6dea045 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Tue Oct 24 22:59:28 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 24 20:59:28 2023 +0000 [SYSSETUP] syssetup.rc improve URLs (#5810) Reformat those URLs in a way that allows new lines to be added, or existing lines to be removed or changed, without the need to touch any neighbor line. This will also allow git blame to work much better in the future. Fix outdated URLs: http://www.icu-project.org -> http://icu.unicode.org https://fedorahosted.org/liberation-fonts -> http://pagure.io/liberation-fonts I checked: all of the URLs do still work as good as before. * Update ext2fsd links in syssetup.rc and media/doc --- dll/win32/syssetup/syssetup.rc | 17 ++++++++++++++++- media/doc/3rd Party Files.txt | 3 ++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc index 77cec6efc3b..206e9a0c206 100644 --- a/dll/win32/syssetup/syssetup.rc +++ b/dll/win32/syssetup/syssetup.rc @@ -33,7 +33,22 @@ IDI_ICON5 ICON "resources/5.ico" STRINGTABLE BEGIN - IDS_ACKPROJECTS "Wine - http://www.winehq.org\nFreeType - http://www.freetype.org\nSYSLINUX - http://syslinux.zytor.com\nMinGW - http://www.mingw.org\nBochs - http://bochs.sourceforge.net\nMesa3D - http://www.mesa3d.org\nadns - http://www.gnu.org/software/adns\nICU - http://www.icu-project.org/\nGraphApp - http://enchantia.com/software/graphapp/\nExt2 - http://www.ext2fsd.com/\nGNU FreeFont - http://savannah.gnu.org/projects/freefont/\nDejaVu Fonts - http://dejavu.sourceforge.net\nLi [...] + IDS_ACKPROJECTS "Wine - http://winehq.org\ +\nFreeType - http://freetype.org\ +\nSYSLINUX - http://syslinux.zytor.com\ +\nMinGW - http://mingw.org\ +\nBochs - http://bochs.sourceforge.net\ +\nMesa3D - http://mesa3d.org\ +\nadns - http://gnu.org/software/adns\ +\nICU - http://icu.unicode.org\ +\nGraphApp - http://enchantia.com/software/graphapp\ +\nExt2 - http://sourceforge.net/projects/ext2fsd\ +\nGNU FreeFont - http://savannah.gnu.org/projects/freefont\ +\nDejaVu Fonts - http://dejavu.sourceforge.net\ +\nLiberation(tm) Fonts - http://pagure.io/liberation-fonts\ +\nBtrfs - https://github.com/maharmstone/btrfs\ +\nTango Desktop Project - http://tango.freedesktop.org/Tango_Desktop_Project\ +" END IDR_GPL RT_TEXT "COPYING" diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index f1633295bfa..b39199a5cd6 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -93,7 +93,8 @@ Path: drivers/filesystems/ext2 Path: sdk/lib/fslib/ext2lib Used Version: 0.69 License: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) -URL: http://www.ext2fsd.com +URL: https://web.archive.org/web/20210516213924/http://www.ext2fsd.com +URL: https://sourceforge.net/projects/ext2fsd Title: NFSv4.1 Client for Windows Path: base/services/nfsd

1 0

[reactos] 09/09: [NTOS:MM] Add ASSERTs for VAD table locking
by Timo Kreuzer 24 Oct '23

24 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d831bc4fab38300e36765… commit d831bc4fab38300e36765cf591059c8fd5752926 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Oct 10 02:41:19 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 24 21:45:27 2023 +0300 [NTOS:MM] Add ASSERTs for VAD table locking --- ntoskrnl/mm/ARM3/vadnode.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/ntoskrnl/mm/ARM3/vadnode.c b/ntoskrnl/mm/ARM3/vadnode.c index 050e1c92235..53b8fa83dbd 100644 --- a/ntoskrnl/mm/ARM3/vadnode.c +++ b/ntoskrnl/mm/ARM3/vadnode.c @@ -43,6 +43,74 @@ CHAR MmReadWrite[32] = /* FUNCTIONS ******************************************************************/ +extern MM_AVL_TABLE MiRosKernelVadRoot; + +#if DBG + +static +VOID +MiDbgAssertIsLockedForRead(_In_ PMM_AVL_TABLE Table) +{ + if (Table == &MmSectionBasedRoot) + { + /* Need to hold MmSectionBasedMutex */ + ASSERT(MmSectionBasedMutex.Owner == KeGetCurrentThread()); + } + else if (Table == &MiRosKernelVadRoot) + { + /* Need to hold either the system working-set lock or + the idle process' AddressCreationLock */ + ASSERT(PsGetCurrentThread()->OwnsSystemWorkingSetExclusive || + PsGetCurrentThread()->OwnsSystemWorkingSetShared || + (PsIdleProcess->AddressCreationLock.Owner == KeGetCurrentThread())); + } + else + { + /* Need to hold either the process working-set lock or + the current process' AddressCreationLock */ + PEPROCESS Process = CONTAINING_RECORD(Table, EPROCESS, VadRoot); + ASSERT(MI_WS_OWNER(Process) || + (Process->AddressCreationLock.Owner == KeGetCurrentThread())); + } +} + +static +VOID +MiDbgAssertIsLockedForWrite(_In_ PMM_AVL_TABLE Table) +{ + if (Table == &MmSectionBasedRoot) + { + /* Need to hold MmSectionBasedMutex */ + ASSERT(MmSectionBasedMutex.Owner == KeGetCurrentThread()); + } + else if (Table == &MiRosKernelVadRoot) + { + /* Need to hold both the system working-set lock exclusive and + the idle process' AddressCreationLock */ + ASSERT(PsGetCurrentThread()->OwnsSystemWorkingSetExclusive); + ASSERT(PsIdleProcess->AddressCreationLock.Owner == KeGetCurrentThread()); + } + else + { + /* Need to hold both the process working-set lock exclusive and + the current process' AddressCreationLock */ + PEPROCESS Process = CONTAINING_RECORD(Table, EPROCESS, VadRoot); + ASSERT(Process == PsGetCurrentProcess()); + ASSERT(PsGetCurrentThread()->OwnsProcessWorkingSetExclusive); + ASSERT(Process->AddressCreationLock.Owner == KeGetCurrentThread()); + } +} + +#define ASSERT_LOCKED_FOR_READ(Table) MiDbgAssertIsLockedForRead(Table) +#define ASSERT_LOCKED_FOR_WRITE(Table) MiDbgAssertIsLockedForWrite(Table) + +#else // DBG + +#define ASSERT_LOCKED_FOR_READ(Table) +#define ASSERT_LOCKED_FOR_WRITE(Table) + +#endif // DBG + PMMVAD NTAPI MiLocateAddress(IN PVOID VirtualAddress) @@ -52,6 +120,8 @@ MiLocateAddress(IN PVOID VirtualAddress) PMM_AVL_TABLE Table = &PsGetCurrentProcess()->VadRoot; TABLE_SEARCH_RESULT SearchResult; + ASSERT_LOCKED_FOR_READ(Table); + /* Start with the the hint */ FoundVad = (PMMVAD)Table->NodeHint; if (!FoundVad) return NULL; @@ -69,6 +139,8 @@ MiLocateAddress(IN PVOID VirtualAddress) /* We found it, update the hint */ ASSERT(FoundVad != NULL); ASSERT((Vpn >= FoundVad->StartingVpn) && (Vpn <= FoundVad->EndingVpn)); + + /* We allow this (atomic) update without exclusive lock, because it's a hint only */ Table->NodeHint = FoundVad; return FoundVad; } @@ -82,6 +154,8 @@ MiCheckForConflictingNode(IN ULONG_PTR StartVpn, { PMMADDRESS_NODE ParentNode, CurrentNode; + ASSERT_LOCKED_FOR_READ(Table); + /* If the tree is empty, there is no conflict */ if (Table->NumberGenericTableElements == 0) return TableEmptyTree; @@ -132,6 +206,8 @@ MiInsertNode(IN PMM_AVL_TABLE Table, { PMMVAD_LONG Vad; + ASSERT_LOCKED_FOR_WRITE(Table); + /* Insert it into the tree */ RtlpInsertAvlTreeNode(Table, NewNode, Parent, Result); @@ -186,6 +262,8 @@ MiInsertVad(IN PMMVAD Vad, TABLE_SEARCH_RESULT Result; PMMADDRESS_NODE Parent = NULL; + ASSERT_LOCKED_FOR_WRITE(VadRoot); + /* Validate the VAD and set it as the current hint */ ASSERT(Vad->EndingVpn >= Vad->StartingVpn); VadRoot->NodeHint = Vad; @@ -348,6 +426,8 @@ MiInsertBasedSection(IN PSECTION Section) PMMADDRESS_NODE Parent = NULL; ASSERT(Section->Address.EndingVpn >= Section->Address.StartingVpn); + ASSERT_LOCKED_FOR_WRITE(&MmSectionBasedRoot); + /* Find the parent VAD and where this child should be inserted */ Result = RtlpFindAvlTableNodeOrParent(&MmSectionBasedRoot, (PVOID)Section->Address.StartingVpn, &Parent); ASSERT(Result != TableFoundNode); @@ -362,6 +442,8 @@ MiRemoveNode(IN PMMADDRESS_NODE Node, { PMMVAD_LONG Vad; + ASSERT_LOCKED_FOR_WRITE(Table); + /* Call the AVL code */ RtlpDeleteAvlTreeNode(Table, Node); @@ -509,6 +591,8 @@ MiFindEmptyAddressRangeInTree(IN SIZE_T Length, ULONG_PTR PageCount, AlignmentVpn, LowVpn, HighestVpn; ASSERT(Length != 0); + ASSERT_LOCKED_FOR_READ(Table); + /* Calculate page numbers for the length, alignment, and starting address */ PageCount = BYTES_TO_PAGES(Length); AlignmentVpn = Alignment >> PAGE_SHIFT; @@ -605,6 +689,8 @@ MiFindEmptyAddressRangeDownTree(IN SIZE_T Length, ULONG_PTR LowVpn, HighVpn, AlignmentVpn; PFN_NUMBER PageCount; + ASSERT_LOCKED_FOR_READ(Table); + /* Sanity checks */ ASSERT(BoundaryAddress); ASSERT(BoundaryAddress <= ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS)); @@ -719,6 +805,8 @@ MiFindEmptyAddressRangeDownBasedTree(IN SIZE_T Length, PMMADDRESS_NODE Node, LowestNode; ULONG_PTR LowVpn, BestVpn; + ASSERT_LOCKED_FOR_READ(Table); + /* Sanity checks */ ASSERT(Table == &MmSectionBasedRoot); ASSERT(BoundaryAddress);

1 0

[reactos] 08/09: [NTOS:MM] Lock kernel address space in MiInitSystemMemoryAreas
by Timo Kreuzer 24 Oct '23

24 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23589e9bf14afe5763a1f… commit 23589e9bf14afe5763a1fede921b1f67ef949246 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Oct 10 02:33:53 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 24 21:45:27 2023 +0300 [NTOS:MM] Lock kernel address space in MiInitSystemMemoryAreas This is required to satisfy VAD locking rules. --- ntoskrnl/mm/mminit.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/mminit.c b/ntoskrnl/mm/mminit.c index 3e58ad9bbc8..009383992b7 100644 --- a/ntoskrnl/mm/mminit.c +++ b/ntoskrnl/mm/mminit.c @@ -1,4 +1,4 @@ -/* +/* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/mm/mminit.c @@ -68,6 +68,8 @@ MiInitSystemMemoryAreas(VOID) // Create all the static memory areas. // + MmLockAddressSpace(MmGetKernelAddressSpace()); + #ifdef _M_AMD64 // Reserved range FFFF800000000000 - FFFFF68000000000 MiCreateArm3StaticMemoryArea((PVOID)MI_REAL_SYSTEM_RANGE_START, PTE_BASE - MI_REAL_SYSTEM_RANGE_START, FALSE); @@ -118,6 +120,8 @@ MiInitSystemMemoryAreas(VOID) // KUSER_SHARED_DATA MiCreateArm3StaticMemoryArea((PVOID)KI_USER_SHARED_DATA, PAGE_SIZE, FALSE); #endif /* _X86_ */ + + MmUnlockAddressSpace(MmGetKernelAddressSpace()); } CODE_SEG("INIT")

1 0

[reactos] 07/09: [NTOS:MM] Attach to the target process in MmMapViewOfSection
by Timo Kreuzer 24 Oct '23

24 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07ad8c4c11d72f9603cef… commit 07ad8c4c11d72f9603cef8ad667664a7ce9a44f6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 9 21:45:01 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 24 21:45:27 2023 +0300 [NTOS:MM] Attach to the target process in MmMapViewOfSection This is required to satisfy VAD locking rules. --- ntoskrnl/mm/section.c | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 35c36d45cfa..ff77ef77077 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4008,6 +4008,8 @@ MmMapViewOfSection(IN PVOID SectionObject, PMMSUPPORT AddressSpace; NTSTATUS Status = STATUS_SUCCESS; BOOLEAN NotAtBase = FALSE; + BOOLEAN IsAttached = FALSE; + KAPC_STATE ApcState; if (MiIsRosSectionObject(SectionObject) == FALSE) { @@ -4031,6 +4033,12 @@ MmMapViewOfSection(IN PVOID SectionObject, return STATUS_INVALID_PAGE_PROTECTION; } + if (PsGetCurrentProcess() != Process) + { + KeStackAttachProcess(&Process->Pcb, &ApcState); + IsAttached = TRUE; + } + /* FIXME: We should keep this, but it would break code checking equality */ Protect &= ~PAGE_NOCACHE; @@ -4097,15 +4105,15 @@ MmMapViewOfSection(IN PVOID SectionObject, /* Fail if the user requested a fixed base address. */ if ((*BaseAddress) != NULL) { - MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; + Status = STATUS_CONFLICTING_ADDRESSES; + goto Exit; } /* Otherwise find a gap to map the image. */ ImageBase = (ULONG_PTR)MmFindGap(AddressSpace, PAGE_ROUND_UP(ImageSize), MM_VIRTMEM_GRANULARITY, FALSE); if (ImageBase == 0) { - MmUnlockAddressSpace(AddressSpace); - return STATUS_CONFLICTING_ADDRESSES; + Status = STATUS_CONFLICTING_ADDRESSES; + goto Exit; } /* Remember that we loaded image at a different base address */ NotAtBase = TRUE; @@ -4136,8 +4144,7 @@ MmMapViewOfSection(IN PVOID SectionObject, MmUnlockSectionSegment(&SectionSegments[i]); } - MmUnlockAddressSpace(AddressSpace); - return Status; + goto Exit; } } @@ -4160,22 +4167,22 @@ MmMapViewOfSection(IN PVOID SectionObject, if ((Protect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) && !(Section->InitialPageProtection & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE))) { - MmUnlockAddressSpace(AddressSpace); - return STATUS_SECTION_PROTECTION; + Status = STATUS_SECTION_PROTECTION; + goto Exit; } /* check for read access */ if ((Protect & (PAGE_READONLY|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_WRITECOPY)) && !(Section->InitialPageProtection & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY))) { - MmUnlockAddressSpace(AddressSpace); - return STATUS_SECTION_PROTECTION; + Status = STATUS_SECTION_PROTECTION; + goto Exit; } /* check for execute access */ if ((Protect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) && !(Section->InitialPageProtection & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY))) { - MmUnlockAddressSpace(AddressSpace); - return STATUS_SECTION_PROTECTION; + Status = STATUS_SECTION_PROTECTION; + goto Exit; } if (SectionOffset == NULL) @@ -4189,8 +4196,8 @@ MmMapViewOfSection(IN PVOID SectionObject, if ((ViewOffset % PAGE_SIZE) != 0) { - MmUnlockAddressSpace(AddressSpace); - return STATUS_MAPPED_ALIGNMENT; + Status = STATUS_MAPPED_ALIGNMENT; + goto Exit; } if ((*ViewSize) == 0) @@ -4219,18 +4226,24 @@ MmMapViewOfSection(IN PVOID SectionObject, MmUnlockSectionSegment(Segment); if (!NT_SUCCESS(Status)) { - MmUnlockAddressSpace(AddressSpace); - return Status; + goto Exit; } } - MmUnlockAddressSpace(AddressSpace); - if (NotAtBase) Status = STATUS_IMAGE_NOT_AT_BASE; else Status = STATUS_SUCCESS; +Exit: + + MmUnlockAddressSpace(AddressSpace); + + if (IsAttached) + { + KeUnstackDetachProcess(&ApcState); + } + return Status; }

1 0

[reactos] 06/09: [NTOS:MM] Fix MmFreeMemoryArea
by Timo Kreuzer 24 Oct '23

24 Oct '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=601bb49c0d276447fd643… commit 601bb49c0d276447fd6435a8f70cc0f190db681a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 9 22:24:01 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Oct 24 21:45:27 2023 +0300 [NTOS:MM] Fix MmFreeMemoryArea - Stay attached while deleting the VAD node - Acquire the appropriate working set lock when deleting a VAD node - Both are needed for locking correctness --- ntoskrnl/mm/marea.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index ab8bff4a18e..281226c4afc 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -300,8 +300,7 @@ MmFreeMemoryArea( PEPROCESS CurrentProcess = PsGetCurrentProcess(); PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - if (Process != NULL && - Process != CurrentProcess) + if ((Process != NULL) && (Process != CurrentProcess)) { KeAttachProcess(&Process->Pcb); } @@ -337,12 +336,6 @@ MmFreeMemoryArea( } } - if (Process != NULL && - Process != CurrentProcess) - { - KeDetachProcess(); - } - //if (MemoryArea->VadNode.StartingVpn < (ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT if (MemoryArea->Vad) { @@ -357,14 +350,23 @@ MmFreeMemoryArea( ASSERT(MemoryArea->VadNode.u.VadFlags.Spare != 0); if (((PMMVAD)MemoryArea->Vad)->u.VadFlags.Spare == 1) { + MiLockProcessWorkingSet(PsGetCurrentProcess(), PsGetCurrentThread()); MiRemoveNode((PMMADDRESS_NODE)&MemoryArea->VadNode, &Process->VadRoot); + MiUnlockProcessWorkingSet(PsGetCurrentProcess(), PsGetCurrentThread()); } MemoryArea->Vad = NULL; } else { + MiLockWorkingSet(PsGetCurrentThread(), &MmSystemCacheWs); MiRemoveNode((PMMADDRESS_NODE)&MemoryArea->VadNode, &MiRosKernelVadRoot); + MiUnlockWorkingSet(PsGetCurrentThread(), &MmSystemCacheWs); + } + + if ((Process != NULL) && (Process != CurrentProcess)) + { + KeDetachProcess(); } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs