Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [INCLUDE][SHELL32_APITEST] Add SHLimitInputEdit testcase (#2053)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cc8e7db4bda80dda3774… commit 6cc8e7db4bda80dda3774bb58de016ca9f54289d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 18 20:02:18 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 20:02:18 2019 +0900 [INCLUDE][SHELL32_APITEST] Add SHLimitInputEdit testcase (#2053) - Add IItemNameLimits interface into shobjidl.idl. - Add a testcase for shell32!SHLimitInputEdit function. CORE-11701 --- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../rostests/apitests/shell32/SHLimitInputEdit.cpp | 367 +++++++++++++++++++++ modules/rostests/apitests/shell32/resource.rc | 11 + modules/rostests/apitests/shell32/testlist.c | 2 + sdk/include/psdk/shobjidl.idl | 18 + 5 files changed, 399 insertions(+) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index f8d8c84e8d8..f1cd11fefaa 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -27,6 +27,7 @@ list(APPEND SOURCE ShellExecCmdLine.cpp ShellExecuteEx.cpp ShellState.cpp + SHLimitInputEdit.cpp menu.cpp shelltest.cpp shelltest.h) diff --git a/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp new file mode 100644 index 00000000000..2b08bd55226 --- /dev/null +++ b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp @@ -0,0 +1,367 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SHLimitInputEdit + * PROGRAMMER: Katayama Hirofumi MZ + */ + +#include "shelltest.h" +#include <shobjidl.h> +#include <shlwapi.h> + +class CShellFolder + : public IShellFolder + , public IItemNameLimits +{ +public: + LONG m_cRefs; + + CShellFolder(INT iMaxNameLen = 0, BOOL bDisabled = FALSE) + : m_cRefs(1) + , m_iMaxNameLen(iMaxNameLen) + , m_bDisabled(bDisabled) + { + trace("CShellFolder\n"); + } + + virtual ~CShellFolder() + { + trace("~CShellFolder\n"); + } + + /*** IUnknown methods ***/ + + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject); + STDMETHODIMP_(ULONG) AddRef(); + STDMETHODIMP_(ULONG) Release(); + + /*** IShellFolder methods ***/ + + STDMETHODIMP ParseDisplayName( + HWND hwnd, + IBindCtx *pbc, + LPWSTR pszDisplayName, + ULONG *pchEaten, + PIDLIST_RELATIVE *ppidl, + ULONG *pdwAttributes) + { + trace("ParseDisplayName\n"); + return E_NOTIMPL; + } + + STDMETHODIMP EnumObjects( + HWND hwnd, + SHCONTF grfFlags, + IEnumIDList **ppenumIDList) + { + trace("EnumObjects\n"); + return E_NOTIMPL; + } + + STDMETHODIMP BindToObject( + PCUIDLIST_RELATIVE pidl, + IBindCtx *pbc, + REFIID riid, + void **ppv) + { + trace("BindToObject\n"); + return E_NOTIMPL; + } + + STDMETHODIMP BindToStorage( + PCUIDLIST_RELATIVE pidl, + IBindCtx *pbc, + REFIID riid, + void **ppv) + { + trace("BindToStorage\n"); + return E_NOTIMPL; + } + + STDMETHODIMP CompareIDs( + LPARAM lParam, + PCUIDLIST_RELATIVE pidl1, + PCUIDLIST_RELATIVE pidl2) + { + trace("CompareIDs\n"); + return E_NOTIMPL; + } + + STDMETHODIMP CreateViewObject( + HWND hwndOwner, + REFIID riid, + void **ppv) + { + trace("CreateViewObject\n"); + return E_NOTIMPL; + } + + STDMETHODIMP GetAttributesOf( + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + SFGAOF *rgfInOut) + { + trace("GetAttributesOf\n"); + return E_NOTIMPL; + } + + STDMETHODIMP GetUIObjectOf( + HWND hwndOwner, + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + REFIID riid, + UINT *rgfReserved, + void **ppv) + { + trace("GetUIObjectOf\n"); + return E_NOTIMPL; + } + + STDMETHODIMP GetDisplayNameOf( + PCUITEMID_CHILD pidl, + SHGDNF uFlags, + STRRET *pName) + { + trace("GetDisplayNameOf\n"); + return E_NOTIMPL; + } + + STDMETHODIMP SetNameOf( + HWND hwnd, + PCUITEMID_CHILD pidl, + LPCWSTR pszName, + SHGDNF uFlags, + PITEMID_CHILD *ppidlOut) + { + trace("SetNameOf\n"); + return E_NOTIMPL; + } + + /*** IItemNameLimits methods ***/ + + STDMETHODIMP GetMaxLength( + LPCWSTR pszName, + int *piMaxNameLen); + + STDMETHODIMP GetValidCharacters( + LPWSTR *ppwszValidChars, + LPWSTR *ppwszInvalidChars); + +protected: + INT m_iMaxNameLen; + BOOL m_bDisabled; +}; + +STDMETHODIMP CShellFolder::QueryInterface(REFIID riid, void **ppvObject) +{ + trace("QueryInterface\n"); + + if (!ppvObject) + return E_POINTER; + + if (IsEqualIID(riid, IID_IShellFolder) || IsEqualIID(riid, IID_IUnknown)) + { + trace("IID_IShellFolder\n"); + *ppvObject = static_cast<IShellFolder *>(this); + AddRef(); + return S_OK; + } + if (IsEqualIID(riid, IID_IItemNameLimits)) + { + trace("IID_IItemNameLimits\n"); + *ppvObject = static_cast<IItemNameLimits *>(this); + AddRef(); + return S_OK; + } + + return E_NOINTERFACE; +} + +STDMETHODIMP_(ULONG) CShellFolder::AddRef() +{ + trace("AddRef\n"); + return ++m_cRefs; +} + +STDMETHODIMP_(ULONG) CShellFolder::Release() +{ + trace("Release\n"); + + if (--m_cRefs == 0) + { + //delete this; + return 0; + } + return m_cRefs; +} + +STDMETHODIMP CShellFolder::GetMaxLength( + LPCWSTR pszName, + int *piMaxNameLen) +{ + trace("GetMaxLength('%S', %p (%d))\n", pszName, piMaxNameLen, *piMaxNameLen); + + if (!piMaxNameLen) + return E_POINTER; + + *piMaxNameLen = m_iMaxNameLen; + return S_OK; +} + +STDMETHODIMP CShellFolder::GetValidCharacters( + LPWSTR *ppwszValidChars, + LPWSTR *ppwszInvalidChars) +{ + trace("GetValidCharacters(%p, %p)\n", ppwszValidChars, ppwszInvalidChars); + + if (m_bDisabled) + return E_NOTIMPL; + + if (ppwszInvalidChars) + { + SHStrDupW(L"/:*?\"<>|", ppwszInvalidChars); + } + if (ppwszValidChars) + { + *ppwszValidChars = NULL; + } + return S_OK; +} + +static INT_PTR CALLBACK +DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg != WM_INITDIALOG) + return FALSE; + + HWND hEdt1 = GetDlgItem(hwnd, edt1); + INT n; + HRESULT hr; + WCHAR szText[64]; + + _SEH2_TRY + { + hr = SHLimitInputEdit(hEdt1, NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hr = 0xDEAD; + } + _SEH2_END; + ok_int(hr, 0xDEAD); + + { + CShellFolder sf(123, FALSE); + + ok_long(sf.m_cRefs, 1); + + SendMessageW(hEdt1, EM_LIMITTEXT, 234, 0); + + trace("GWLP_WNDPROC: %p\n", (void *)GetWindowLongPtr(hEdt1, GWLP_WNDPROC)); + + hr = SHLimitInputEdit(hEdt1, &sf); + ok_int(hr, S_OK); + + ok_long(sf.m_cRefs, 1); + + trace("GWLP_WNDPROC: %p\n", (void *)GetWindowLongPtr(hEdt1, GWLP_WNDPROC)); + + n = (INT)SendMessageW(hEdt1, EM_GETLIMITTEXT, 0, 0); + ok_int(n, 234); + } + + { + CShellFolder sf(345, TRUE); + + hr = SHLimitInputEdit(hEdt1, &sf); + ok_int(hr, E_NOTIMPL); + + n = (INT)SendMessageW(hEdt1, EM_GETLIMITTEXT, 0, 0); + ok_int(n, 234); + } + + { + CShellFolder sf(999, FALSE); + + ok_long(sf.m_cRefs, 1); + + SetWindowTextW(hEdt1, L"TEST/TEST"); + hr = SHLimitInputEdit(hEdt1, &sf); + ok_int(hr, S_OK); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"TEST/TEST"); + + ok_long(sf.m_cRefs, 1); + + n = (INT)SendMessageW(hEdt1, EM_GETLIMITTEXT, 0, 0); + ok_int(n, 234); + + SetWindowTextW(hEdt1, L""); + SendMessageW(hEdt1, WM_CHAR, L'A', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"A"); + + SendMessageW(hEdt1, WM_CHAR, L'/', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"A"); + + SendMessageW(hEdt1, WM_CHAR, L'/', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"A"); + + SendMessageW(hEdt1, WM_CHAR, L'A', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"AA"); + } + + { + CShellFolder sf(4, FALSE); + + ok_long(sf.m_cRefs, 1); + + SetWindowTextW(hEdt1, L"ABC"); + hr = SHLimitInputEdit(hEdt1, &sf); + + SendMessageW(hEdt1, WM_CHAR, L'D', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"DABC"); + + SendMessageW(hEdt1, WM_CHAR, L'E', 1); + GetWindowTextW(hEdt1, szText, _countof(szText)); + ok_wstr(szText, L"DEABC"); + + ok_long(sf.m_cRefs, 1); + } + + EndDialog(hwnd, IDABORT); + return TRUE; +} + +START_TEST(SHLimitInputEdit) +{ + HRESULT hr; + + _SEH2_TRY + { + hr = SHLimitInputEdit(NULL, NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hr = 0xDEAD; + } + _SEH2_END; + ok_int(hr, 0xDEAD); + + _SEH2_TRY + { + hr = SHLimitInputEdit((HWND)0xDEAD, NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hr = 0xDEAD; + } + _SEH2_END; + ok_int(hr, 0xDEAD); + + DialogBoxW(GetModuleHandleW(NULL), L"SHLIMIT", NULL, DialogProc); +} diff --git a/modules/rostests/apitests/shell32/resource.rc b/modules/rostests/apitests/shell32/resource.rc index 89a0f853a89..f57af647e3d 100644 --- a/modules/rostests/apitests/shell32/resource.rc +++ b/modules/rostests/apitests/shell32/resource.rc @@ -1,5 +1,16 @@ #include <windef.h> +#include <winuser.h> +#include <dlgs.h> LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 ICON "1.ico" + +SHLIMIT DIALOG 0, 0, 122, 84 +CAPTION "SHLIMIT" +STYLE DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +FONT 9, "Tahoma" +{ + CONTROL "edt1", edt1, "EDIT", ES_AUTOHSCROLL | ES_MULTILINE | WS_BORDER | WS_TABSTOP, 19, 18, 80, 14 + LTEXT "stc1", stc1, 24, 49, 72, 21 +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index b16ace6cc23..a274688b0f5 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -21,6 +21,7 @@ extern void func_SHCreateFileExtractIconW(void); extern void func_ShellExecCmdLine(void); extern void func_ShellExecuteEx(void); extern void func_ShellState(void); +extern void func_SHLimitInputEdit(void); extern void func_SHParseDisplayName(void); const struct test winetest_testlist[] = @@ -43,6 +44,7 @@ const struct test winetest_testlist[] = { "ShellExecCmdLine", func_ShellExecCmdLine }, { "ShellExecuteEx", func_ShellExecuteEx }, { "ShellState", func_ShellState }, + { "SHLimitInputEdit", func_SHLimitInputEdit }, { "SHParseDisplayName", func_SHParseDisplayName }, { 0, 0 } }; diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index c540f232e00..1fa2e3940b5 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -4745,4 +4745,22 @@ interface IUserNotification2 : IUnknown [in, string] LPCWSTR pszSoundName); }; +/***************************************************************************** + * IItemNameLimits interface + */ + +[ + uuid(1df0d7f1-b267-4d28-8b10-12e23202a5c4) +] +interface IItemNameLimits : IUnknown +{ + HRESULT GetValidCharacters( + [out, string] LPWSTR *ppwszValidChars, + [out, string] LPWSTR *ppwszInvalidChars); + + HRESULT GetMaxLength( + [in, string] LPCWSTR pszName, + [out] int *piMaxNameLen); +}; + #endif // __REACTOS__

5 years, 1 month

[reactos] 01/01: [RDBSSLIB] RxFirstCanonicalize(): Fix pointer arithmetic

by Victor Martinez

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9420daee3dc926a347feb… commit 9420daee3dc926a347feb379b1c5fb1ecffc10ee Author: Victor Martinez <vicmarcal(a)gmail.com> AuthorDate: Sun Nov 17 17:09:51 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Nov 18 08:20:49 2019 +0100 [RDBSSLIB] RxFirstCanonicalize(): Fix pointer arithmetic CORE-13383 --- sdk/lib/drivers/rdbsslib/rdbss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 489d3116570..851b0f543a3 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -6074,7 +6074,7 @@ RxFirstCanonicalize( } } - if (EndOfString - FirstSlash <= sizeof(WCHAR)) + if (EndOfString - FirstSlash <= 1) { Status = STATUS_OBJECT_NAME_INVALID; }

5 years, 1 month

[reactos] 01/01: [USER32_APITEST] Add DM_REPOSITION testcase (#2043)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bef841c3eebf6e2f67f56… commit bef841c3eebf6e2f67f56f1857caed52f765d486 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 18 10:46:36 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 18 10:46:36 2019 +0900 [USER32_APITEST] Add DM_REPOSITION testcase (#2043) CORE-16490 --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + modules/rostests/apitests/user32/DM_REPOSITION.c | 98 ++++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + modules/rostests/apitests/user32/user32_apitest.rc | 7 ++ 4 files changed, 108 insertions(+) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 24a6921472b..302a084934e 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -8,6 +8,7 @@ list(APPEND SOURCE CreateWindowEx.c DeferWindowPos.c DestroyCursorIcon.c + DM_REPOSITION.c DrawIconEx.c desktop.c EmptyClipboard.c diff --git a/modules/rostests/apitests/user32/DM_REPOSITION.c b/modules/rostests/apitests/user32/DM_REPOSITION.c new file mode 100644 index 00000000000..70d7c9e7632 --- /dev/null +++ b/modules/rostests/apitests/user32/DM_REPOSITION.c @@ -0,0 +1,98 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test for DM_REPOSITION + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" +#include <windowsx.h> + +static BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) +{ + RECT rc, rcWork; + INT cx, cy; + HMONITOR hMon; + MONITORINFO mi = { sizeof(mi) }; + + /* get monitor info */ + hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); + ok(hMon != NULL, "hMon is NULL\n"); + ok_int(GetMonitorInfoW(hMon, &mi), TRUE); + rcWork = mi.rcWork; + + /* get size */ + GetWindowRect(hwnd, &rc); + cx = rc.right - rc.left; + cy = rc.bottom - rc.top; + + /* move */ + ok_int(SetWindowPos(hwnd, NULL, rcWork.left - 80, rcWork.top - 80, 0, 0, + SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOOWNERZORDER | + SWP_NOZORDER), TRUE); + ok_int(GetWindowRect(hwnd, &rc), TRUE); + ok_long(rc.left, rcWork.left - 80); + ok_long(rc.top, rcWork.top - 80); + ok_long(rc.right, rc.left + cx); + ok_long(rc.bottom, rc.top + cy); + + /* reposition */ + ok_int(SendMessageW(hwnd, DM_REPOSITION, 0, 0), 0); + ok_int(GetWindowRect(hwnd, &rc), TRUE); + ok_long(rc.left, rcWork.left); + ok_long(rc.top, rcWork.top); + ok_long(rc.right, rc.left + cx); + ok_long(rc.bottom, rc.top + cy); + + /* move */ + ok_int(SetWindowPos(hwnd, NULL, + rcWork.right - cx + 80, rcWork.bottom - cy + 80, 0, 0, + SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOOWNERZORDER | + SWP_NOZORDER), TRUE); + ok_int(GetWindowRect(hwnd, &rc), TRUE); + ok_long(rc.left, rcWork.right - cx + 80); + ok_long(rc.top, rcWork.bottom - cy + 80); + ok_long(rc.right, rc.left + cx); + ok_long(rc.bottom, rc.top + cy); + + /* reposition */ + ok_int(SendMessageW(hwnd, DM_REPOSITION, 0, 0), 0); + ok_int(GetWindowRect(hwnd, &rc), TRUE); + ok_long(rc.left, rcWork.right - cx); + ok_long(rc.top, rcWork.bottom - cy - 4); + ok_long(rc.right, rc.left + cx); + ok_long(rc.bottom, rc.top + cy); + + /* quit */ + PostMessage(hwnd, WM_COMMAND, IDOK, 0); + return TRUE; +} + +static void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + switch (id) + { + case IDOK: + case IDCANCEL: + EndDialog(hwnd, id); + break; + } +} + +static INT_PTR CALLBACK +DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + HANDLE_MSG(hwnd, WM_INITDIALOG, OnInitDialog); + HANDLE_MSG(hwnd, WM_COMMAND, OnCommand); + } + return 0; +} + +START_TEST(DM_REPOSITION) +{ + HMODULE hMod = GetModuleHandle(NULL); + ok(hMod != NULL, "\n"); + DialogBox(hMod, TEXT("REPOSITION"), NULL, DialogProc); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index 0118bf23b69..5803f028e69 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -10,6 +10,7 @@ extern void func_CreateIconFromResourceEx(void); extern void func_CreateWindowEx(void); extern void func_DeferWindowPos(void); extern void func_DestroyCursorIcon(void); +extern void func_DM_REPOSITION(void); extern void func_DrawIconEx(void); extern void func_desktop(void); extern void func_EmptyClipboard(void); @@ -57,6 +58,7 @@ const struct test winetest_testlist[] = { "CreateWindowEx", func_CreateWindowEx }, { "DeferWindowPos", func_DeferWindowPos }, { "DestroyCursorIcon", func_DestroyCursorIcon }, + { "DM_REPOSITION", func_DM_REPOSITION }, { "DrawIconEx", func_DrawIconEx }, { "desktop", func_desktop }, { "EmptyClipboard", func_EmptyClipboard }, diff --git a/modules/rostests/apitests/user32/user32_apitest.rc b/modules/rostests/apitests/user32/user32_apitest.rc index 85b88e08da5..8f56c8c8647 100644 --- a/modules/rostests/apitests/user32/user32_apitest.rc +++ b/modules/rostests/apitests/user32/user32_apitest.rc @@ -31,3 +31,10 @@ FONT 8, "MS Shell Dlg" CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 65, 98, 60, 14 CONTROL "Cancel", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 187, 100, 60, 14 } + +REPOSITION DIALOG 0, 0, 200, 150 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "DM_REPOSITION" +FONT 8, "MS Shell Dlg" +{ +}

5 years, 1 month

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.16

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=203a6babdffffe21c0ae6… commit 203a6babdffffe21c0ae6081e460fff5798bb436 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 18 10:36:06 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Nov 18 10:36:06 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.16 Tahoma Bold. Version 0.008 khmz. 11px QUOTATION MARK. 11px LATIN CAPITAL LETTER F. 11px CYRILLIC CAPITAL LETTER BE. 11px CYRILLIC CAPITAL LETTER DE. 11px CYRILLIC SMALL LETTER SHA. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 160488 -> 160488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 35cc64dc7a9..1b0ef28bdd9 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

5 years, 1 month

[reactos] 01/01: [MEDIA][FONTS] Improve tahoma.ttf (Cyrillic and Latin) No.15

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d7f134f9430ea5ec9e59… commit 7d7f134f9430ea5ec9e59ff012eb996ae08b1ef9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 18 10:27:29 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Nov 18 10:27:29 2019 +0900 [MEDIA][FONTS] Improve tahoma.ttf (Cyrillic and Latin) No.15 Tahoma font. Version 0.011 khmz. 11px LATIN CAPITAL LETTER R. 11px LATIN CAPITAL LETTER R WITH ACUTE. 11px LATIN CAPITAL LETTER R WITH CARON. 11px LATIN SMALL LETTER K. 11px CYRILLIC CAPITAL LETTER U. 11px CYRILLIC SMALL LETTER TSE. CORE-8408 --- media/fonts/tahoma.ttf | Bin 155304 -> 155304 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index a855d864036..80db951662a 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

5 years, 1 month

[reactos] 02/02: [KDBG] If no parameters are given to the 'filter' command, display the list of available debug filter components.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40c57de728d9ab23213d7… commit 40c57de728d9ab23213d70b87053ed0943120d06 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 18 01:34:19 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 18 01:36:04 2019 +0100 [KDBG] If no parameters are given to the 'filter' command, display the list of available debug filter components. --- ntoskrnl/kdbg/kdb_cli.c | 428 +++++++++++++++++++++++++----------------------- 1 file changed, 226 insertions(+), 202 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 8debef5dca9..daeccb9f2e8 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -135,6 +135,177 @@ extern volatile ULONG KdbDmesgTotalWritten; STRING KdbPromptString = RTL_CONSTANT_STRING("kdb:> "); +// +// Debug Filter Component Table +// +static struct +{ + PCSTR Name; + ULONG Id; +} +ComponentTable[] = +{ +// +// Default components +// + { "WIN2000", MAXULONG }, + { "DEFAULT", DPFLTR_DEFAULT_ID }, +// +// Standard components +// + { "SYSTEM", DPFLTR_SYSTEM_ID }, + { "SMSS", DPFLTR_SMSS_ID }, + { "SETUP", DPFLTR_SETUP_ID }, + { "NTFS", DPFLTR_NTFS_ID }, + { "FSTUB", DPFLTR_FSTUB_ID }, + { "CRASHDUMP", DPFLTR_CRASHDUMP_ID }, + { "CDAUDIO", DPFLTR_CDAUDIO_ID }, + { "CDROM", DPFLTR_CDROM_ID }, + { "CLASSPNP", DPFLTR_CLASSPNP_ID }, + { "DISK", DPFLTR_DISK_ID }, + { "REDBOOK", DPFLTR_REDBOOK_ID }, + { "STORPROP", DPFLTR_STORPROP_ID }, + { "SCSIPORT", DPFLTR_SCSIPORT_ID }, + { "SCSIMINIPORT", DPFLTR_SCSIMINIPORT_ID }, + { "CONFIG", DPFLTR_CONFIG_ID }, + { "I8042PRT", DPFLTR_I8042PRT_ID }, + { "SERMOUSE", DPFLTR_SERMOUSE_ID }, + { "LSERMOUS", DPFLTR_LSERMOUS_ID }, + { "KBDHID", DPFLTR_KBDHID_ID }, + { "MOUHID", DPFLTR_MOUHID_ID }, + { "KBDCLASS", DPFLTR_KBDCLASS_ID }, + { "MOUCLASS", DPFLTR_MOUCLASS_ID }, + { "TWOTRACK", DPFLTR_TWOTRACK_ID }, + { "WMILIB", DPFLTR_WMILIB_ID }, + { "ACPI", DPFLTR_ACPI_ID }, + { "AMLI", DPFLTR_AMLI_ID }, + { "HALIA64", DPFLTR_HALIA64_ID }, + { "VIDEO", DPFLTR_VIDEO_ID }, + { "SVCHOST", DPFLTR_SVCHOST_ID }, + { "VIDEOPRT", DPFLTR_VIDEOPRT_ID }, + { "TCPIP", DPFLTR_TCPIP_ID }, + { "DMSYNTH", DPFLTR_DMSYNTH_ID }, + { "NTOSPNP", DPFLTR_NTOSPNP_ID }, + { "FASTFAT", DPFLTR_FASTFAT_ID }, + { "SAMSS", DPFLTR_SAMSS_ID }, + { "PNPMGR", DPFLTR_PNPMGR_ID }, + { "NETAPI", DPFLTR_NETAPI_ID }, + { "SCSERVER", DPFLTR_SCSERVER_ID }, + { "SCCLIENT", DPFLTR_SCCLIENT_ID }, + { "SERIAL", DPFLTR_SERIAL_ID }, + { "SERENUM", DPFLTR_SERENUM_ID }, + { "UHCD", DPFLTR_UHCD_ID }, + { "RPCPROXY", DPFLTR_RPCPROXY_ID }, + { "AUTOCHK", DPFLTR_AUTOCHK_ID }, + { "DCOMSS", DPFLTR_DCOMSS_ID }, + { "UNIMODEM", DPFLTR_UNIMODEM_ID }, + { "SIS", DPFLTR_SIS_ID }, + { "FLTMGR", DPFLTR_FLTMGR_ID }, + { "WMICORE", DPFLTR_WMICORE_ID }, + { "BURNENG", DPFLTR_BURNENG_ID }, + { "IMAPI", DPFLTR_IMAPI_ID }, + { "SXS", DPFLTR_SXS_ID }, + { "FUSION", DPFLTR_FUSION_ID }, + { "IDLETASK", DPFLTR_IDLETASK_ID }, + { "SOFTPCI", DPFLTR_SOFTPCI_ID }, + { "TAPE", DPFLTR_TAPE_ID }, + { "MCHGR", DPFLTR_MCHGR_ID }, + { "IDEP", DPFLTR_IDEP_ID }, + { "PCIIDE", DPFLTR_PCIIDE_ID }, + { "FLOPPY", DPFLTR_FLOPPY_ID }, + { "FDC", DPFLTR_FDC_ID }, + { "TERMSRV", DPFLTR_TERMSRV_ID }, + { "W32TIME", DPFLTR_W32TIME_ID }, + { "PREFETCHER", DPFLTR_PREFETCHER_ID }, + { "RSFILTER", DPFLTR_RSFILTER_ID }, + { "FCPORT", DPFLTR_FCPORT_ID }, + { "PCI", DPFLTR_PCI_ID }, + { "DMIO", DPFLTR_DMIO_ID }, + { "DMCONFIG", DPFLTR_DMCONFIG_ID }, + { "DMADMIN", DPFLTR_DMADMIN_ID }, + { "WSOCKTRANSPORT", DPFLTR_WSOCKTRANSPORT_ID }, + { "VSS", DPFLTR_VSS_ID }, + { "PNPMEM", DPFLTR_PNPMEM_ID }, + { "PROCESSOR", DPFLTR_PROCESSOR_ID }, + { "DMSERVER", DPFLTR_DMSERVER_ID }, + { "SR", DPFLTR_SR_ID }, + { "INFINIBAND", DPFLTR_INFINIBAND_ID }, + { "IHVDRIVER", DPFLTR_IHVDRIVER_ID }, + { "IHVVIDEO", DPFLTR_IHVVIDEO_ID }, + { "IHVAUDIO", DPFLTR_IHVAUDIO_ID }, + { "IHVNETWORK", DPFLTR_IHVNETWORK_ID }, + { "IHVSTREAMING", DPFLTR_IHVSTREAMING_ID }, + { "IHVBUS", DPFLTR_IHVBUS_ID }, + { "HPS", DPFLTR_HPS_ID }, + { "RTLTHREADPOOL", DPFLTR_RTLTHREADPOOL_ID }, + { "LDR", DPFLTR_LDR_ID }, + { "TCPIP6", DPFLTR_TCPIP6_ID }, + { "ISAPNP", DPFLTR_ISAPNP_ID }, + { "SHPC", DPFLTR_SHPC_ID }, + { "STORPORT", DPFLTR_STORPORT_ID }, + { "STORMINIPORT", DPFLTR_STORMINIPORT_ID }, + { "PRINTSPOOLER", DPFLTR_PRINTSPOOLER_ID }, + { "VSSDYNDISK", DPFLTR_VSSDYNDISK_ID }, + { "VERIFIER", DPFLTR_VERIFIER_ID }, + { "VDS", DPFLTR_VDS_ID }, + { "VDSBAS", DPFLTR_VDSBAS_ID }, + { "VDSDYN", DPFLTR_VDSDYN_ID }, // Specified in Vista+ + { "VDSDYNDR", DPFLTR_VDSDYNDR_ID }, + { "VDSLDR", DPFLTR_VDSLDR_ID }, // Specified in Vista+ + { "VDSUTIL", DPFLTR_VDSUTIL_ID }, + { "DFRGIFC", DPFLTR_DFRGIFC_ID }, + { "MM", DPFLTR_MM_ID }, + { "DFSC", DPFLTR_DFSC_ID }, + { "WOW64", DPFLTR_WOW64_ID }, +// +// Components specified in Vista+, some of which we also use in ReactOS +// + { "ALPC", DPFLTR_ALPC_ID }, + { "WDI", DPFLTR_WDI_ID }, + { "PERFLIB", DPFLTR_PERFLIB_ID }, + { "KTM", DPFLTR_KTM_ID }, + { "IOSTRESS", DPFLTR_IOSTRESS_ID }, + { "HEAP", DPFLTR_HEAP_ID }, + { "WHEA", DPFLTR_WHEA_ID }, + { "USERGDI", DPFLTR_USERGDI_ID }, + { "MMCSS", DPFLTR_MMCSS_ID }, + { "TPM", DPFLTR_TPM_ID }, + { "THREADORDER", DPFLTR_THREADORDER_ID }, + { "ENVIRON", DPFLTR_ENVIRON_ID }, + { "EMS", DPFLTR_EMS_ID }, + { "WDT", DPFLTR_WDT_ID }, + { "FVEVOL", DPFLTR_FVEVOL_ID }, + { "NDIS", DPFLTR_NDIS_ID }, + { "NVCTRACE", DPFLTR_NVCTRACE_ID }, + { "LUAFV", DPFLTR_LUAFV_ID }, + { "APPCOMPAT", DPFLTR_APPCOMPAT_ID }, + { "USBSTOR", DPFLTR_USBSTOR_ID }, + { "SBP2PORT", DPFLTR_SBP2PORT_ID }, + { "COVERAGE", DPFLTR_COVERAGE_ID }, + { "CACHEMGR", DPFLTR_CACHEMGR_ID }, + { "MOUNTMGR", DPFLTR_MOUNTMGR_ID }, + { "CFR", DPFLTR_CFR_ID }, + { "TXF", DPFLTR_TXF_ID }, + { "KSECDD", DPFLTR_KSECDD_ID }, + { "FLTREGRESS", DPFLTR_FLTREGRESS_ID }, + { "MPIO", DPFLTR_MPIO_ID }, + { "MSDSM", DPFLTR_MSDSM_ID }, + { "UDFS", DPFLTR_UDFS_ID }, + { "PSHED", DPFLTR_PSHED_ID }, + { "STORVSP", DPFLTR_STORVSP_ID }, + { "LSASS", DPFLTR_LSASS_ID }, + { "SSPICLI", DPFLTR_SSPICLI_ID }, + { "CNG", DPFLTR_CNG_ID }, + { "EXFAT", DPFLTR_EXFAT_ID }, + { "FILETRACE", DPFLTR_FILETRACE_ID }, + { "XSAVE", DPFLTR_XSAVE_ID }, + { "SE", DPFLTR_SE_ID }, + { "DRIVEEXTENDER", DPFLTR_DRIVEEXTENDER_ID }, +}; + +// +// Command Table +// static const struct { PCHAR Name; @@ -202,198 +373,6 @@ static const struct /* FUNCTIONS *****************************************************************/ -/*!\brief Transform a component name to an integer - * - * \param ComponentName The name of the component. - * \param ComponentId Receives the component id on success. - * - * \retval TRUE Success. - * \retval FALSE Failure. - */ -static BOOLEAN -KdbpGetComponentId( - IN PCCH ComponentName, - OUT PULONG ComponentId) -{ - ULONG i; - - static struct - { - PCCH Name; - ULONG Id; - } - ComponentTable[] = - { -// -// Default components -// - { "WIN2000", MAXULONG }, - { "DEFAULT", DPFLTR_DEFAULT_ID }, -// -// Standard components -// - { "SYSTEM", DPFLTR_SYSTEM_ID }, - { "SMSS", DPFLTR_SMSS_ID }, - { "SETUP", DPFLTR_SETUP_ID }, - { "NTFS", DPFLTR_NTFS_ID }, - { "FSTUB", DPFLTR_FSTUB_ID }, - { "CRASHDUMP", DPFLTR_CRASHDUMP_ID }, - { "CDAUDIO", DPFLTR_CDAUDIO_ID }, - { "CDROM", DPFLTR_CDROM_ID }, - { "CLASSPNP", DPFLTR_CLASSPNP_ID }, - { "DISK", DPFLTR_DISK_ID }, - { "REDBOOK", DPFLTR_REDBOOK_ID }, - { "STORPROP", DPFLTR_STORPROP_ID }, - { "SCSIPORT", DPFLTR_SCSIPORT_ID }, - { "SCSIMINIPORT", DPFLTR_SCSIMINIPORT_ID }, - { "CONFIG", DPFLTR_CONFIG_ID }, - { "I8042PRT", DPFLTR_I8042PRT_ID }, - { "SERMOUSE", DPFLTR_SERMOUSE_ID }, - { "LSERMOUS", DPFLTR_LSERMOUS_ID }, - { "KBDHID", DPFLTR_KBDHID_ID }, - { "MOUHID", DPFLTR_MOUHID_ID }, - { "KBDCLASS", DPFLTR_KBDCLASS_ID }, - { "MOUCLASS", DPFLTR_MOUCLASS_ID }, - { "TWOTRACK", DPFLTR_TWOTRACK_ID }, - { "WMILIB", DPFLTR_WMILIB_ID }, - { "ACPI", DPFLTR_ACPI_ID }, - { "AMLI", DPFLTR_AMLI_ID }, - { "HALIA64", DPFLTR_HALIA64_ID }, - { "VIDEO", DPFLTR_VIDEO_ID }, - { "SVCHOST", DPFLTR_SVCHOST_ID }, - { "VIDEOPRT", DPFLTR_VIDEOPRT_ID }, - { "TCPIP", DPFLTR_TCPIP_ID }, - { "DMSYNTH", DPFLTR_DMSYNTH_ID }, - { "NTOSPNP", DPFLTR_NTOSPNP_ID }, - { "FASTFAT", DPFLTR_FASTFAT_ID }, - { "SAMSS", DPFLTR_SAMSS_ID }, - { "PNPMGR", DPFLTR_PNPMGR_ID }, - { "NETAPI", DPFLTR_NETAPI_ID }, - { "SCSERVER", DPFLTR_SCSERVER_ID }, - { "SCCLIENT", DPFLTR_SCCLIENT_ID }, - { "SERIAL", DPFLTR_SERIAL_ID }, - { "SERENUM", DPFLTR_SERENUM_ID }, - { "UHCD", DPFLTR_UHCD_ID }, - { "RPCPROXY", DPFLTR_RPCPROXY_ID }, - { "AUTOCHK", DPFLTR_AUTOCHK_ID }, - { "DCOMSS", DPFLTR_DCOMSS_ID }, - { "UNIMODEM", DPFLTR_UNIMODEM_ID }, - { "SIS", DPFLTR_SIS_ID }, - { "FLTMGR", DPFLTR_FLTMGR_ID }, - { "WMICORE", DPFLTR_WMICORE_ID }, - { "BURNENG", DPFLTR_BURNENG_ID }, - { "IMAPI", DPFLTR_IMAPI_ID }, - { "SXS", DPFLTR_SXS_ID }, - { "FUSION", DPFLTR_FUSION_ID }, - { "IDLETASK", DPFLTR_IDLETASK_ID }, - { "SOFTPCI", DPFLTR_SOFTPCI_ID }, - { "TAPE", DPFLTR_TAPE_ID }, - { "MCHGR", DPFLTR_MCHGR_ID }, - { "IDEP", DPFLTR_IDEP_ID }, - { "PCIIDE", DPFLTR_PCIIDE_ID }, - { "FLOPPY", DPFLTR_FLOPPY_ID }, - { "FDC", DPFLTR_FDC_ID }, - { "TERMSRV", DPFLTR_TERMSRV_ID }, - { "W32TIME", DPFLTR_W32TIME_ID }, - { "PREFETCHER", DPFLTR_PREFETCHER_ID }, - { "RSFILTER", DPFLTR_RSFILTER_ID }, - { "FCPORT", DPFLTR_FCPORT_ID }, - { "PCI", DPFLTR_PCI_ID }, - { "DMIO", DPFLTR_DMIO_ID }, - { "DMCONFIG", DPFLTR_DMCONFIG_ID }, - { "DMADMIN", DPFLTR_DMADMIN_ID }, - { "WSOCKTRANSPORT", DPFLTR_WSOCKTRANSPORT_ID }, - { "VSS", DPFLTR_VSS_ID }, - { "PNPMEM", DPFLTR_PNPMEM_ID }, - { "PROCESSOR", DPFLTR_PROCESSOR_ID }, - { "DMSERVER", DPFLTR_DMSERVER_ID }, - { "SR", DPFLTR_SR_ID }, - { "INFINIBAND", DPFLTR_INFINIBAND_ID }, - { "IHVDRIVER", DPFLTR_IHVDRIVER_ID }, - { "IHVVIDEO", DPFLTR_IHVVIDEO_ID }, - { "IHVAUDIO", DPFLTR_IHVAUDIO_ID }, - { "IHVNETWORK", DPFLTR_IHVNETWORK_ID }, - { "IHVSTREAMING", DPFLTR_IHVSTREAMING_ID }, - { "IHVBUS", DPFLTR_IHVBUS_ID }, - { "HPS", DPFLTR_HPS_ID }, - { "RTLTHREADPOOL", DPFLTR_RTLTHREADPOOL_ID }, - { "LDR", DPFLTR_LDR_ID }, - { "TCPIP6", DPFLTR_TCPIP6_ID }, - { "ISAPNP", DPFLTR_ISAPNP_ID }, - { "SHPC", DPFLTR_SHPC_ID }, - { "STORPORT", DPFLTR_STORPORT_ID }, - { "STORMINIPORT", DPFLTR_STORMINIPORT_ID }, - { "PRINTSPOOLER", DPFLTR_PRINTSPOOLER_ID }, - { "VSSDYNDISK", DPFLTR_VSSDYNDISK_ID }, - { "VERIFIER", DPFLTR_VERIFIER_ID }, - { "VDS", DPFLTR_VDS_ID }, - { "VDSBAS", DPFLTR_VDSBAS_ID }, - { "VDSDYN", DPFLTR_VDSDYN_ID }, - { "VDSDYNDR", DPFLTR_VDSDYNDR_ID }, - { "VDSLDR", DPFLTR_VDSLDR_ID }, - { "VDSUTIL", DPFLTR_VDSUTIL_ID }, - { "DFRGIFC", DPFLTR_DFRGIFC_ID }, - { "MM", DPFLTR_MM_ID }, - { "DFSC", DPFLTR_DFSC_ID }, - { "WOW64", DPFLTR_WOW64_ID }, -// -// Components specified in Vista+, some of which we also use in ReactOS -// - { "ALPC", DPFLTR_ALPC_ID }, - { "WDI", DPFLTR_WDI_ID }, - { "PERFLIB", DPFLTR_PERFLIB_ID }, - { "KTM", DPFLTR_KTM_ID }, - { "IOSTRESS", DPFLTR_IOSTRESS_ID }, - { "HEAP", DPFLTR_HEAP_ID }, - { "WHEA", DPFLTR_WHEA_ID }, - { "USERGDI", DPFLTR_USERGDI_ID }, - { "MMCSS", DPFLTR_MMCSS_ID }, - { "TPM", DPFLTR_TPM_ID }, - { "THREADORDER", DPFLTR_THREADORDER_ID }, - { "ENVIRON", DPFLTR_ENVIRON_ID }, - { "EMS", DPFLTR_EMS_ID }, - { "WDT", DPFLTR_WDT_ID }, - { "FVEVOL", DPFLTR_FVEVOL_ID }, - { "NDIS", DPFLTR_NDIS_ID }, - { "NVCTRACE", DPFLTR_NVCTRACE_ID }, - { "LUAFV", DPFLTR_LUAFV_ID }, - { "APPCOMPAT", DPFLTR_APPCOMPAT_ID }, - { "USBSTOR", DPFLTR_USBSTOR_ID }, - { "SBP2PORT", DPFLTR_SBP2PORT_ID }, - { "COVERAGE", DPFLTR_COVERAGE_ID }, - { "CACHEMGR", DPFLTR_CACHEMGR_ID }, - { "MOUNTMGR", DPFLTR_MOUNTMGR_ID }, - { "CFR", DPFLTR_CFR_ID }, - { "TXF", DPFLTR_TXF_ID }, - { "KSECDD", DPFLTR_KSECDD_ID }, - { "FLTREGRESS", DPFLTR_FLTREGRESS_ID }, - { "MPIO", DPFLTR_MPIO_ID }, - { "MSDSM", DPFLTR_MSDSM_ID }, - { "UDFS", DPFLTR_UDFS_ID }, - { "PSHED", DPFLTR_PSHED_ID }, - { "STORVSP", DPFLTR_STORVSP_ID }, - { "LSASS", DPFLTR_LSASS_ID }, - { "SSPICLI", DPFLTR_SSPICLI_ID }, - { "CNG", DPFLTR_CNG_ID }, - { "EXFAT", DPFLTR_EXFAT_ID }, - { "FILETRACE", DPFLTR_FILETRACE_ID }, - { "XSAVE", DPFLTR_XSAVE_ID }, - { "SE", DPFLTR_SE_ID }, - { "DRIVEEXTENDER", DPFLTR_DRIVEEXTENDER_ID }, - }; - - for (i = 0; i < sizeof(ComponentTable) / sizeof(ComponentTable[0]); i++) - { - if (_stricmp(ComponentName, ComponentTable[i].Name) == 0) - { - *ComponentId = ComponentTable[i].Id; - return TRUE; - } - } - - return FALSE; -} - /*!\brief Evaluates an expression... * * Much like KdbpRpnEvaluateExpression, but prints the error message (if any) @@ -647,7 +626,34 @@ end: } #endif -/*!\brief Display list of active debug channels +/*!\brief Retrieves the component ID corresponding to a given component name. + * + * \param ComponentName The name of the component. + * \param ComponentId Receives the component id on success. + * + * \retval TRUE Success. + * \retval FALSE Failure. + */ +static BOOLEAN +KdbpGetComponentId( + IN PCSTR ComponentName, + OUT PULONG ComponentId) +{ + ULONG i; + + for (i = 0; i < sizeof(ComponentTable) / sizeof(ComponentTable[0]); i++) + { + if (_stricmp(ComponentName, ComponentTable[i].Name) == 0) + { + *ComponentId = ComponentTable[i].Id; + return TRUE; + } + } + + return FALSE; +} + +/*!\brief Displays the list of active debug channels, or enable/disable debug channels. */ static BOOLEAN KdbpCmdFilter( @@ -657,26 +663,44 @@ KdbpCmdFilter( ULONG i, j, ComponentId, Level; ULONG set = DPFLTR_MASK, clear = DPFLTR_MASK; PCHAR pend; - LPCSTR opt, p; + PCSTR opt, p; static struct { - LPCSTR Name; + PCSTR Name; ULONG Level; } debug_classes[] = { - { "error", 1 << DPFLTR_ERROR_LEVEL }, + { "error", 1 << DPFLTR_ERROR_LEVEL }, { "warning", 1 << DPFLTR_WARNING_LEVEL }, - { "trace", 1 << DPFLTR_TRACE_LEVEL }, - { "info", 1 << DPFLTR_INFO_LEVEL }, + { "trace", 1 << DPFLTR_TRACE_LEVEL }, + { "info", 1 << DPFLTR_INFO_LEVEL }, }; + if (Argc <= 1) + { + /* Display the list of available debug filter components */ + KdbpPrint("REMARKS:\n" + "- The 'WIN2000' system-wide debug filter component is used for DbgPrint()\n" + " messages without Component ID and Level.\n" + "- The 'DEFAULT' debug filter component is used for DbgPrint() messages with\n" + " an unknown Component ID.\n\n"); + KdbpPrint("The list of debug filter components currently available on your system is:\n\n"); + KdbpPrint(" Component Name Component ID\n" + "================ ==============\n"); + for (i = 0; i < sizeof(ComponentTable) / sizeof(ComponentTable[0]); i++) + { + KdbpPrint("%16s 0x%08lx\n", ComponentTable[i].Name, ComponentTable[i].Id); + } + return TRUE; + } + for (i = 1; i < Argc; i++) { opt = Argv[i]; p = opt + strcspn(opt, "+-"); - if (!p[0]) p = opt; /* assume it's a debug channel name */ + if (!p[0]) p = opt; /* Assume it's a debug channel name */ if (p > opt) { @@ -685,7 +709,7 @@ KdbpCmdFilter( SIZE_T len = strlen(debug_classes[j].Name); if (len != (p - opt)) continue; - if (_strnicmp(opt, debug_classes[j].Name, len) == 0) /* found it */ + if (_strnicmp(opt, debug_classes[j].Name, len) == 0) /* Found it */ { if (*p == '+') set |= debug_classes[j].Level; @@ -3521,7 +3545,7 @@ BOOLEAN KdbpInvokeCliCallbacks( IN PCHAR Command, IN ULONG Argc, - IN PCH Argv[]) + IN PCHAR Argv[]) { ULONG i; @@ -3559,7 +3583,7 @@ KdbpDoCommand( PCHAR p; ULONG Argc; // FIXME: for what do we need a 1024 characters command line and 256 tokens? - static PCH Argv[256]; + static PCHAR Argv[256]; static CHAR OrigCommand[1024]; RtlStringCbCopyA(OrigCommand, sizeof(OrigCommand), Command);

5 years, 1 month

[reactos] 01/02: [NTOS:KD/KD64] Fix x64 build.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=548393c6e759f47336e15… commit 548393c6e759f47336e158d6d6aa4e5cd551f9ba Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 18 01:33:06 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 18 01:36:04 2019 +0100 [NTOS:KD/KD64] Fix x64 build. --- ntoskrnl/kd/kdmain.c | 2 +- ntoskrnl/kd64/kdapi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index ce8a738f26d..25a63a1c0cb 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -131,7 +131,7 @@ KdpServiceDispatcher(ULONG Service, /* Special case for stack frame dumps */ case 'DsoR': { - KeRosDumpStackFrames((PULONG)Buffer1, Buffer1Length); + KeRosDumpStackFrames((PULONG_PTR)Buffer1, Buffer1Length); break; } diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c index e12ac7e5353..e7d304bf726 100644 --- a/ntoskrnl/kd64/kdapi.c +++ b/ntoskrnl/kd64/kdapi.c @@ -2193,7 +2193,7 @@ KdSystemDebugControl( /* Special case for stack frame dumps */ case 'DsoR': { - KeRosDumpStackFrames((PULONG)InputBuffer, InputBufferLength); + KeRosDumpStackFrames((PULONG_PTR)InputBuffer, InputBufferLength); break; } #endif

5 years, 1 month

[reactos] 06/06: [I8042PRT] Remove dead commented-out code; Allow sending ROS-specific commands to the kernel debugger since KD64 also support them.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea6d427d10840e4b63f5a… commit ea6d427d10840e4b63f5af7a2012881379be74c1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 17 23:01:18 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 17 23:21:55 2019 +0100 [I8042PRT] Remove dead commented-out code; Allow sending ROS-specific commands to the kernel debugger since KD64 also support them. [NTOS:MM] Remove an extra ')' in a DbgPrint() string. --- drivers/input/i8042prt/i8042prt.c | 11 ----------- drivers/input/i8042prt/keyboard.c | 2 -- ntoskrnl/mm/ARM3/mminit.c | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/input/i8042prt/i8042prt.c b/drivers/input/i8042prt/i8042prt.c index 61963240472..19027a9b0df 100644 --- a/drivers/input/i8042prt/i8042prt.c +++ b/drivers/input/i8042prt/i8042prt.c @@ -502,17 +502,6 @@ DriverEntry( ULONG i; NTSTATUS Status; - /* ROS Hack: ideally, we shouldn't have to initialize debug level this way, - but since the only way is to change it via KDBG, it's better to leave - it here too. */ -#if 0 - DbgSetDebugFilterState( - DPFLTR_I8042PRT_ID, - (1 << DPFLTR_ERROR_LEVEL) | (1 << DPFLTR_WARNING_LEVEL) | - (1 << DPFLTR_TRACE_LEVEL) /*| (1 << DPFLTR_INFO_LEVEL)*/ | DPFLTR_MASK, - TRUE); -#endif - Status = IoAllocateDriverObjectExtension( DriverObject, DriverObject, diff --git a/drivers/input/i8042prt/keyboard.c b/drivers/input/i8042prt/keyboard.c index 177443ea620..e33ec89659b 100644 --- a/drivers/input/i8042prt/keyboard.c +++ b/drivers/input/i8042prt/keyboard.c @@ -866,7 +866,6 @@ i8042KbdInterruptService( /* b - Bugcheck */ KeBugCheck(MANUALLY_INITIATED_CRASH); } -#if defined(KDBG) else { /* Send request to the kernel debugger. @@ -879,7 +878,6 @@ i8042KbdInterruptService( NULL, KernelMode); } -#endif } } diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index f1d7c2b7e95..fcd1c7dae2f 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -1557,7 +1557,7 @@ MmDumpArmPfnDatabase(IN BOOLEAN StatusOnly) // Pretty-print the page // if (!StatusOnly) - DbgPrint("0x%08p:\t%20s\t(%04d.%04d)\t[%16s - %16s])\n", + DbgPrint("0x%08p:\t%20s\t(%04d.%04d)\t[%16s - %16s]\n", i << PAGE_SHIFT, Consumer, Pfn1->u3.e2.ReferenceCount,

5 years, 1 month

[reactos] 05/06: [NTOS:KD/KD64/KDBG] Share some code between our legacy KD/KDBG and KD64.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a890fc64d17e7c4a09a3c… commit a890fc64d17e7c4a09a3cbe24e0dfc972d743dda Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 17 22:55:36 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 17 23:21:54 2019 +0100 [NTOS:KD/KD64/KDBG] Share some code between our legacy KD/KDBG and KD64. Our legacy KD module is slowly being phased out for the more recent KD64 Kernel Debugger that supports WinDbg, but at the same time we must retain support for GCC debugging and the KDBG interface. For the time being few #ifdef _WINKD_ have been introduced in KD64 so that some of its code/data does not completely get shared yet with the legacy KD, until the latter becomes phased out. KD Modifications: ================= - Remove the implementation of NtQueryDebugFilterState() / NtSetDebugFilterState() that now comes entirely from KD64. - Remove KD variables that are now shared with KD64. - Share common code with KD64: KdpMoveMemory(), KdpZeroMemory(), KdpCopyMemoryChunks(), KdpPrint(), KdpPrompt(). - KDBG: Remove the duplicated KdpCopyMemoryChunks() function. - In KdpServiceDispatcher() and KdpEnterDebuggerException(), call the KdpPrint() worker function that correctly probes and captures its arguments. - Temporarily stub out KdEnterDebugger() and KdExitDebugger() that is used by the shared code, until KD is removed and only the KD64 version of these functions remain. - Re-implement the KD/KDBG KdpPrompt() function using a custom KdpPromptString() helper compatible with KD64, that is called by the KD64 implementation of KdpPrompt(). This KdpPromptString() helper now issues the prompt on all the KD loggers: e.g. if you use both at the same time COM-port and SCREEN debugging, the prompt will appear on both. Before that the prompt was always being displayed on COM port even if e.g. a SCREEN-only debug session was used... - ppc_irq.c: Fix the prototype of KdpServiceDispatcher(). KD64 Fixes: =========== - Initialize the MaximumLength member of the counted STRING variables before using them elsewhere. - Get rid of alloca() within SEH block in KdpPrint() (addendum to 7b95fcf9). - Add the ROS-specific handy dump commands in KdSystemDebugControl(). --- ntoskrnl/include/internal/kd.h | 63 +++--------- ntoskrnl/kd/kdio.c | 145 +++++++++++++++++++++------ ntoskrnl/kd/kdmain.c | 215 +++++++++++++++++------------------------ ntoskrnl/kd64/kdapi.c | 47 +++++++-- ntoskrnl/kd64/kddata.c | 4 + ntoskrnl/kd64/kdprint.c | 32 ++++-- ntoskrnl/kdbg/kdb.c | 83 ---------------- ntoskrnl/kdbg/kdb_cli.c | 215 ++--------------------------------------- ntoskrnl/ke/powerpc/ppc_irq.c | 8 +- ntoskrnl/ntos.cmake | 5 +- 10 files changed, 299 insertions(+), 518 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index ef66e2abea2..ede52d82c57 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -7,9 +7,6 @@ // struct _KD_DISPATCH_TABLE; extern CPPORT GdbPortInfo; -extern BOOLEAN KdBreakAfterSymbolLoad; -extern BOOLEAN KdPitchDebugger; -extern BOOLEAN KdIgnoreUmExceptions; BOOLEAN NTAPI @@ -93,8 +90,7 @@ typedef enum _KD_CONTINUE_TYPE kdContinue = 0, kdDoNotHandleException, kdHandleException -} -KD_CONTINUE_TYPE; +} KD_CONTINUE_TYPE; typedef VOID @@ -122,14 +118,6 @@ KD_CONTINUE_TYPE PKTRAP_FRAME TrapFrame ); -BOOLEAN -NTAPI -KdIsThisAKdTrap( - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context, - IN KPROCESSOR_MODE PreviousMode -); - /* INIT ROUTINES *************************************************************/ BOOLEAN @@ -188,13 +176,6 @@ KdpKdbgInit( /* KD ROUTINES ***************************************************************/ -ULONG -NTAPI -KdpPrintString( - _In_reads_bytes_(Length) PCHAR UnsafeString, - _In_ ULONG Length, - _In_ KPROCESSOR_MODE PreviousMode); - BOOLEAN NTAPI KdpDetectConflicts(PCM_RESOURCE_LIST DriverList); @@ -215,37 +196,22 @@ KdpSafeWriteMemory( IN ULONGLONG Value ); -VOID -NTAPI -KdpEnableSafeMem(VOID); - /* KD GLOBALS ***************************************************************/ -typedef -BOOLEAN -(NTAPI *PKDEBUG_ROUTINE)( - IN PKTRAP_FRAME TrapFrame, - IN PKEXCEPTION_FRAME ExceptionFrame, - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context, - IN KPROCESSOR_MODE PreviousMode, - IN BOOLEAN SecondChance -); - -/* serial debug connection */ +/* Serial debug connection */ #define DEFAULT_DEBUG_PORT 2 /* COM2 */ #define DEFAULT_DEBUG_COM1_IRQ 4 /* COM1 IRQ */ #define DEFAULT_DEBUG_COM2_IRQ 3 /* COM2 IRQ */ #define DEFAULT_DEBUG_BAUD_RATE 115200 /* 115200 Baud */ /* KD Native Modes */ -#define KdScreen 0 -#define KdSerial 1 -#define KdFile 2 -#define KdBochs 3 -#define KdKdbg 4 -#define KdMax 5 +#define KdScreen 0 +#define KdSerial 1 +#define KdFile 2 +#define KdBochs 3 +#define KdKdbg 4 +#define KdMax 5 /* KD Private Debug Modes */ typedef struct _KDP_DEBUG_MODE @@ -268,8 +234,7 @@ typedef struct _KDP_DEBUG_MODE /* Generic Value */ ULONG Value; }; -} -KDP_DEBUG_MODE; +} KDP_DEBUG_MODE; /* KD Internal Debug Services */ typedef enum _KDP_DEBUG_SERVICE @@ -286,8 +251,7 @@ typedef enum _KDP_DEBUG_SERVICE KdSpare3 = 0x24, /* j */ EnterDebugger = 0x25, /* k */ ThatsWhatSheSaid = 69 /* FIGURE IT OUT */ -} -KDP_DEBUG_SERVICE; +} KDP_DEBUG_SERVICE; /* Dispatch Table for Wrapper Functions */ typedef struct _KD_DISPATCH_TABLE @@ -297,8 +261,7 @@ typedef struct _KD_DISPATCH_TABLE PKDP_PRINT_ROUTINE KdpPrintRoutine; PKDP_PROMPT_ROUTINE KdpPromptRoutine; PKDP_EXCEPTION_ROUTINE KdpExceptionRoutine; -} -KD_DISPATCH_TABLE, *PKD_DISPATCH_TABLE; +} KD_DISPATCH_TABLE, *PKD_DISPATCH_TABLE; /* The current Debugging Mode */ extern KDP_DEBUG_MODE KdpDebugMode; @@ -328,10 +291,6 @@ extern KD_DISPATCH_TABLE WrapperTable; /* The KD Native Provider List */ extern LIST_ENTRY KdProviders; -extern PKDEBUG_ROUTINE KiDebugRoutine; -extern KD_CONTEXT KdpContext; -extern ULONG Kd_WIN2000_Mask; - #endif #if DBG && defined(_M_IX86) && !defined(_WINKD_) // See ke/i386/traphdlr.c diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 23b163b4ebf..4921d6af7c2 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -585,40 +585,15 @@ KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable, /* GENERAL FUNCTIONS *********************************************************/ -ULONG +BOOLEAN NTAPI KdpPrintString( - _In_reads_bytes_(Length) PCHAR UnsafeString, - _In_ ULONG Length, - _In_ KPROCESSOR_MODE PreviousMode) + _In_ PSTRING Output) { PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; - PCHAR String; - CHAR StringBuffer[512]; - if (!KdpDebugMode.Value) return 0; - - Length = min(Length, sizeof(StringBuffer)); - - if (PreviousMode != KernelMode) - { - _SEH2_TRY - { - ProbeForRead(UnsafeString, Length, 1); - String = StringBuffer; - RtlCopyMemory(String, UnsafeString, Length); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - return 0; - } - _SEH2_END; - } - else - { - String = UnsafeString; - } + if (!KdpDebugMode.Value) return FALSE; /* Call the registered handlers */ CurrentEntry = KdProviders.Flink; @@ -630,7 +605,7 @@ KdpPrintString( KdProvidersList); /* Call it */ - CurrentTable->KdpPrintRoutine(String, Length); + CurrentTable->KdpPrintRoutine(Output->Buffer, Output->Length); /* Next Table */ CurrentEntry = CurrentEntry->Flink; @@ -638,10 +613,116 @@ KdpPrintString( /* Call the Wrapper Routine */ if (WrapperTable.KdpPrintRoutine) - WrapperTable.KdpPrintRoutine(String, Length); + WrapperTable.KdpPrintRoutine(Output->Buffer, Output->Length); + + return FALSE; +} + +extern STRING KdbPromptString; + +BOOLEAN +NTAPI +KdpPromptString( + _In_ PSTRING PromptString, + _In_ PSTRING ResponseString) +{ + KIRQL OldIrql; + STRING StringChar; + CHAR Response; + USHORT i; + ULONG DummyScanCode; + + StringChar.Buffer = &Response; + StringChar.Length = StringChar.MaximumLength = sizeof(Response); + + /* Display the string and print a new line for log neatness */ + KdpPrintString(PromptString); + *StringChar.Buffer = '\n'; + KdpPrintString(&StringChar); + + /* Print the kdb prompt */ + KdpPrintString(&KdbPromptString); + + // TODO: Use an improved KdbpReadCommand() function for our purposes. + + /* Acquire the printing spinlock without waiting at raised IRQL */ + OldIrql = KdpAcquireLock(&KdpSerialSpinLock); + + if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) + KbdDisableMouse(); + + /* Loop the whole string */ + for (i = 0; i < ResponseString->MaximumLength; i++) + { + /* Check if this is serial debugging mode */ + if (KdbDebugState & KD_DEBUG_KDSERIAL) + { + /* Get the character from serial */ + do + { + Response = KdbpTryGetCharSerial(MAXULONG); + } while (Response == -1); + } + else + { + /* Get the response from the keyboard */ + do + { + Response = KdbpTryGetCharKeyboard(&DummyScanCode, MAXULONG); + } while (Response == -1); + } + + /* Check for return */ + if (Response == '\r') + { + /* + * We might need to discard the next '\n'. + * Wait a bit to make sure we receive it. + */ + KeStallExecutionProcessor(100000); + + /* Check the mode */ + if (KdbDebugState & KD_DEBUG_KDSERIAL) + { + /* Read and discard the next character, if any */ + KdbpTryGetCharSerial(5); + } + else + { + /* Read and discard the next character, if any */ + KdbpTryGetCharKeyboard(&DummyScanCode, 5); + } + + /* + * Null terminate the output string -- documentation states that + * DbgPrompt does not null terminate, but it does + */ + *(PCHAR)(ResponseString->Buffer + i) = 0; + break; + } + + /* Write it back and print it to the log */ + *(PCHAR)(ResponseString->Buffer + i) = Response; + KdpReleaseLock(&KdpSerialSpinLock, OldIrql); + KdpPrintString(&StringChar); + OldIrql = KdpAcquireLock(&KdpSerialSpinLock); + } + + /* Return the length */ + ResponseString->Length = i; + + if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) + KbdEnableMouse(); + + /* Release the spinlock */ + KdpReleaseLock(&KdpSerialSpinLock, OldIrql); + + /* Print a new line */ + *StringChar.Buffer = '\n'; + KdpPrintString(&StringChar); - /* Return the Length */ - return Length; + /* Success; we don't need to resend */ + return FALSE; } /* EOF */ diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index fdbeeea4deb..ce8a738f26d 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -11,6 +11,38 @@ #define NDEBUG #include <debug.h> +// +// Retrieves the ComponentId and Level for BREAKPOINT_PRINT +// and OutputString and OutputStringLength for BREAKPOINT_PROMPT. +// +#if defined(_X86_) + +// +// EBX/EDI on x86 +// +#define KdpGetParameterThree(Context) ((Context)->Ebx) +#define KdpGetParameterFour(Context) ((Context)->Edi) + +#elif defined(_AMD64_) + +// +// R8/R9 on AMD64 +// +#define KdpGetParameterThree(Context) ((Context)->R8) +#define KdpGetParameterFour(Context) ((Context)->R9) + +#elif defined(_ARM_) + +// +// R3/R4 on ARM +// +#define KdpGetParameterThree(Context) ((Context)->R3) +#define KdpGetParameterFour(Context) ((Context)->R4) + +#else +#error Unsupported Architecture +#endif + /* VARIABLES ***************************************************************/ BOOLEAN KdDebuggerEnabled = FALSE; @@ -19,22 +51,12 @@ BOOLEAN KdDebuggerNotPresent = TRUE; BOOLEAN KdBreakAfterSymbolLoad = FALSE; BOOLEAN KdPitchDebugger = TRUE; BOOLEAN KdIgnoreUmExceptions = FALSE; -KD_CONTEXT KdpContext; -ULONG Kd_WIN2000_Mask; -LONG KdpTimeSlipPending; -KDDEBUGGER_DATA64 KdDebuggerDataBlock; -VOID NTAPI PspDumpThreads(BOOLEAN SystemThreads); -typedef struct -{ - ULONG ComponentId; - ULONG Level; -} KD_COMPONENT_DATA; -#define MAX_KD_COMPONENT_TABLE_ENTRIES 128 -KD_COMPONENT_DATA KdpComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES]; -ULONG KdComponentTableEntries = 0; +VOID NTAPI PspDumpThreads(BOOLEAN SystemThreads); +#if 0 ULONG Kd_DEFAULT_MASK = 1 << DPFLTR_ERROR_LEVEL; +#endif /* PRIVATE FUNCTIONS *********************************************************/ @@ -50,8 +72,19 @@ KdpServiceDispatcher(ULONG Service, switch (Service) { case BREAKPOINT_PRINT: /* DbgPrint */ - Result = KdpPrintString(Buffer1, Buffer1Length, PreviousMode); + { + /* Call KDBG */ + BOOLEAN Handled; + Result = KdpPrint(MAXULONG, + DPFLTR_INFO_LEVEL, + (PCHAR)Buffer1, + (USHORT)Buffer1Length, + PreviousMode, + NULL, // TrapFrame, + NULL, // ExceptionFrame, + &Handled); break; + } #if DBG case ' soR': /* ROS-INTERNAL */ @@ -144,14 +177,20 @@ KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame, /* Check if this is a debug print */ if (ExceptionCommand == BREAKPOINT_PRINT) { - /* Print the string */ - KdpServiceDispatcher(BREAKPOINT_PRINT, - (PVOID)ExceptionRecord->ExceptionInformation[1], - ExceptionRecord->ExceptionInformation[2], - PreviousMode); - - /* Return success */ - KeSetContextReturnRegister(Context, STATUS_SUCCESS); + /* Call KDBG */ + NTSTATUS ReturnStatus; + BOOLEAN Handled; + ReturnStatus = KdpPrint((ULONG)KdpGetParameterThree(Context), + (ULONG)KdpGetParameterFour(Context), + (PCHAR)ExceptionRecord->ExceptionInformation[1], + (USHORT)ExceptionRecord->ExceptionInformation[2], + PreviousMode, + TrapFrame, + ExceptionFrame, + &Handled); + + /* Update the return value for the caller */ + KeSetContextReturnRegister(Context, ReturnStatus); } #ifdef KDBG else if (ExceptionCommand == BREAKPOINT_LOAD_SYMBOLS) @@ -168,7 +207,7 @@ KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame, ProbeForRead(SymbolsInfo, sizeof(*SymbolsInfo), 1); - RtlCopyMemory(&CapturedSymbolsInfo, + KdpMoveMemory(&CapturedSymbolsInfo, SymbolsInfo, sizeof(*SymbolsInfo)); SymbolsInfo = &CapturedSymbolsInfo; @@ -191,27 +230,18 @@ KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame, } else if (ExceptionCommand == BREAKPOINT_PROMPT) { - ULONG ReturnValue; - LPSTR OutString; - USHORT OutStringLength; - - /* Get the response string and length */ - OutString = (LPSTR)Context->Ebx; - OutStringLength = (USHORT)Context->Edi; - /* Call KDBG */ - ReturnValue = KdpPrompt((LPSTR)ExceptionRecord-> - ExceptionInformation[1], - (USHORT)ExceptionRecord-> - ExceptionInformation[2], - OutString, - OutStringLength, - PreviousMode, - TrapFrame, - ExceptionFrame); - - /* Return the number of characters that we received */ - Context->Eax = ReturnValue; + ULONG ReturnLength; + ReturnLength = KdpPrompt((PCHAR)ExceptionRecord->ExceptionInformation[1], + (USHORT)ExceptionRecord->ExceptionInformation[2], + (PCHAR)KdpGetParameterThree(Context), + (USHORT)KdpGetParameterFour(Context), + PreviousMode, + TrapFrame, + ExceptionFrame); + + /* Update the return value for the caller */ + KeSetContextReturnRegister(Context, ReturnLength); } #endif @@ -274,6 +304,20 @@ KdUpdateDataBlock(VOID) { } +BOOLEAN +NTAPI +KdEnterDebugger(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + return FALSE; +} + +VOID +NTAPI +KdExitDebugger(IN BOOLEAN Enable) +{ +} + /* * @implemented */ @@ -381,91 +425,6 @@ KdChangeOption(IN KD_OPTION Option, return STATUS_NOT_IMPLEMENTED; } - -NTSTATUS -NTAPI -NtQueryDebugFilterState(IN ULONG ComponentId, - IN ULONG Level) -{ - ULONG i; - - /* Convert Level to mask if it isn't already one */ - if (Level < 32) - Level = 1 << Level; - - /* Check if it is not the default component */ - if (ComponentId != MAXULONG) - { - /* No, search for an existing entry in the table */ - for (i = 0; i < KdComponentTableEntries; i++) - { - /* Check if it is the right component */ - if (ComponentId == KdpComponentTable[i].ComponentId) - { - /* Check if mask are matching */ - return (Level & KdpComponentTable[i].Level) ? TRUE : FALSE; - } - } - } - - /* Entry not found in the table, use default mask */ - return (Level & Kd_DEFAULT_MASK) ? TRUE : FALSE; -} - -NTSTATUS -NTAPI -NtSetDebugFilterState(IN ULONG ComponentId, - IN ULONG Level, - IN BOOLEAN State) -{ - ULONG i; - - /* Convert Level to mask if it isn't already one */ - if (Level < 32) - Level = 1 << Level; - Level &= ~DPFLTR_MASK; - - /* Check if it is the default component */ - if (ComponentId == MAXULONG) - { - /* Yes, modify the default mask */ - if (State) - Kd_DEFAULT_MASK |= Level; - else - Kd_DEFAULT_MASK &= ~Level; - - return STATUS_SUCCESS; - } - - /* Search for an existing entry */ - for (i = 0; i < KdComponentTableEntries; i++ ) - { - if (ComponentId == KdpComponentTable[i].ComponentId) - break; - } - - /* Check if we have found an existing entry */ - if (i == KdComponentTableEntries) - { - /* Check if we have enough space in the table */ - if (i == MAX_KD_COMPONENT_TABLE_ENTRIES) - return STATUS_INVALID_PARAMETER_1; - - /* Add a new entry */ - ++KdComponentTableEntries; - KdpComponentTable[i].ComponentId = ComponentId; - KdpComponentTable[i].Level = Kd_DEFAULT_MASK; - } - - /* Update entry table */ - if (State) - KdpComponentTable[i].Level |= Level; - else - KdpComponentTable[i].Level &= ~Level; - - return STATUS_SUCCESS; -} - /* * @unimplemented */ diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c index 5c48a1e767e..e12ac7e5353 100644 --- a/ntoskrnl/kd64/kdapi.c +++ b/ntoskrnl/kd64/kdapi.c @@ -13,6 +13,8 @@ #define NDEBUG #include <debug.h> +VOID NTAPI PspDumpThreads(BOOLEAN SystemThreads); + /* PRIVATE FUNCTIONS *********************************************************/ VOID @@ -121,6 +123,8 @@ KdpCopyMemoryChunks( return RemainingLength == 0 ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } +#ifdef _WINKD_ + VOID NTAPI KdpQueryMemory(IN PDBGKD_MANIPULATE_STATE64 State, @@ -2118,8 +2122,12 @@ KdDisableDebuggerWithLock(IN BOOLEAN NeedLock) return STATUS_SUCCESS; } +#endif // _WINKD_ + /* PUBLIC FUNCTIONS **********************************************************/ +#ifdef _WINKD_ + /* * @implemented */ @@ -2157,15 +2165,40 @@ KdSystemDebugControl( _In_ KPROCESSOR_MODE PreviousMode) { /* Handle some internal commands */ - if (Command == ' soR') + switch (Command) { - switch ((ULONG_PTR)InputBuffer) +#if DBG + case ' soR': /* ROS-INTERNAL */ { - case 0x24: - MmDumpArmPfnDatabase(FALSE); - break; + switch ((ULONG_PTR)InputBuffer) + { + case 0x21: // DumpAllThreads: + PspDumpThreads(TRUE); + break; + + case 0x22: // DumpUserThreads: + PspDumpThreads(FALSE); + break; + + case 0x24: // KdSpare3: + MmDumpArmPfnDatabase(FALSE); + break; + + default: + break; + } + return STATUS_SUCCESS; } - return STATUS_SUCCESS; + + /* Special case for stack frame dumps */ + case 'DsoR': + { + KeRosDumpStackFrames((PULONG)InputBuffer, InputBufferLength); + break; + } +#endif + default: + break; } /* Local kernel debugging is not yet supported */ @@ -2291,6 +2324,8 @@ KdRefreshDebuggerNotPresent(VOID) return DebuggerNotPresent; } +#endif // _WINKD_ + /* * @implemented */ diff --git a/ntoskrnl/kd64/kddata.c b/ntoskrnl/kd64/kddata.c index 5576c405842..23887d165cf 100644 --- a/ntoskrnl/kd64/kddata.c +++ b/ntoskrnl/kd64/kddata.c @@ -71,12 +71,15 @@ BOOLEAN KdpContextSent; // // Debug Trap Handlers // +#ifdef _WINKD_ PKDEBUG_ROUTINE KiDebugRoutine = KdpStub; PKDEBUG_SWITCH_ROUTINE KiDebugSwitchRoutine; +#endif // // Debugger Configuration Settings // +#ifdef _WINKD_ BOOLEAN KdBreakAfterSymbolLoad; BOOLEAN KdPitchDebugger; BOOLEAN KdDebuggerNotPresent; @@ -89,6 +92,7 @@ BOOLEAN KdpDebuggerStructuresInitialized; BOOLEAN KdEnteredDebugger; ULONG KdDisableCount; LARGE_INTEGER KdPerformanceCounterRate; +#endif // // Breakpoint Data diff --git a/ntoskrnl/kd64/kdprint.c b/ntoskrnl/kd64/kdprint.c index 0389f32e39b..4d35bf6df76 100644 --- a/ntoskrnl/kd64/kdprint.c +++ b/ntoskrnl/kd64/kdprint.c @@ -15,6 +15,8 @@ /* FUNCTIONS *****************************************************************/ +#ifdef _WINKD_ + BOOLEAN NTAPI KdpPrintString( @@ -210,6 +212,23 @@ KdpSymbol(IN PSTRING DllPath, KdExitDebugger(Enable); } +#else + +extern +BOOLEAN +NTAPI +KdpPrintString( + _In_ PSTRING Output); + +extern +BOOLEAN +NTAPI +KdpPromptString( + _In_ PSTRING PromptString, + _In_ PSTRING ResponseString); + +#endif // _WINKD_ + USHORT NTAPI KdpPrompt( @@ -262,7 +281,7 @@ KdpPrompt( /* Setup the prompt and response buffers */ PromptBuffer.Buffer = PromptString; - PromptBuffer.Length = PromptLength; + PromptBuffer.Length = PromptBuffer.MaximumLength = PromptLength; ResponseBuffer.Buffer = SafeResponseString; ResponseBuffer.Length = 0; ResponseBuffer.MaximumLength = MaximumResponseLength; @@ -322,7 +341,7 @@ KdpPrint( NTSTATUS Status; BOOLEAN Enable; STRING OutputString; - PVOID CapturedString; + CHAR CapturedString[512]; /* Assume failure */ *Handled = FALSE; @@ -350,7 +369,7 @@ KdpPrint( } /* Normalize the length */ - Length = min(Length, 512); + Length = min(Length, sizeof(CapturedString)); /* Check if we need to verify the string */ if (PreviousMode != KernelMode) @@ -360,7 +379,6 @@ KdpPrint( { /* Probe and capture the string */ ProbeForRead(String, Length, 1); - CapturedString = alloca(Length); KdpMoveMemory(CapturedString, String, Length); String = CapturedString; } @@ -374,7 +392,7 @@ KdpPrint( /* Setup the output string */ OutputString.Buffer = String; - OutputString.Length = Length; + OutputString.Length = OutputString.MaximumLength = Length; /* Log the print */ //KdLogDbgPrint(&OutputString); @@ -425,12 +443,12 @@ KdpDprintf( sizeof(Buffer), Format, ap); + va_end(ap); /* Set it up */ String.Buffer = Buffer; - String.Length = Length + 1; + String.Length = String.MaximumLength = Length; /* Send it to the debugger directly */ KdpPrintString(&String); - va_end(ap); } diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c index 5e7f5e249fc..d2a890276fe 100644 --- a/ntoskrnl/kdbg/kdb.c +++ b/ntoskrnl/kdbg/kdb.c @@ -1723,89 +1723,6 @@ KdbpGetCommandLineSettings( } } -/* - * Copied from ntoskrnl/kd64/kdapi.c - */ -NTSTATUS -NTAPI -KdpCopyMemoryChunks(IN ULONG64 Address, - IN PVOID Buffer, - IN ULONG TotalSize, - IN ULONG ChunkSize, - IN ULONG Flags, - OUT PULONG ActualSize OPTIONAL) -{ - NTSTATUS Status; - ULONG RemainingLength, CopyChunk; - - /* Check if we didn't get a chunk size or if it is too big */ - if (ChunkSize == 0) - { - /* Default to 4 byte chunks */ - ChunkSize = 4; - } - else if (ChunkSize > MMDBG_COPY_MAX_SIZE) - { - /* Normalize to maximum size */ - ChunkSize = MMDBG_COPY_MAX_SIZE; - } - - /* Copy the whole range in aligned chunks */ - RemainingLength = TotalSize; - CopyChunk = 1; - while (RemainingLength > 0) - { - /* - * Determine the best chunk size for this round. - * The ideal size is aligned, isn't larger than the - * the remaining length and respects the chunk limit. - */ - while (((CopyChunk * 2) <= RemainingLength) && - (CopyChunk < ChunkSize) && - ((Address & ((CopyChunk * 2) - 1)) == 0)) - { - /* Increase it */ - CopyChunk *= 2; - } - - /* - * The chunk size can be larger than the remaining size if this - * isn't the first round, so check if we need to shrink it back. - */ - while (CopyChunk > RemainingLength) - { - /* Shrink it */ - CopyChunk /= 2; - } - - /* Do the copy */ - Status = MmDbgCopyMemory(Address, - Buffer, - CopyChunk, - Flags); - if (!NT_SUCCESS(Status)) - { - /* Copy failed, break out */ - break; - } - - /* Update pointers and length for the next run */ - Address = Address + CopyChunk; - Buffer = (PVOID)((ULONG_PTR)Buffer + CopyChunk); - RemainingLength = RemainingLength - CopyChunk; - } - - /* We may have modified executable code, flush the instruction cache */ - KeSweepICache((PVOID)(ULONG_PTR)Address, TotalSize); - - /* - * Return the size we managed to copy and return - * success if we could copy the whole range. - */ - if (ActualSize) *ActualSize = TotalSize - RemainingLength; - return RemainingLength == 0 ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; -} - NTSTATUS KdbpSafeReadMemory( OUT PVOID Dest, diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 5e7d40d230f..8debef5dca9 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -133,6 +133,8 @@ extern volatile ULONG KdpDmesgCurrentPosition; extern volatile ULONG KdpDmesgFreeBytes; extern volatile ULONG KdbDmesgTotalWritten; +STRING KdbPromptString = RTL_CONSTANT_STRING("kdb:> "); + static const struct { PCHAR Name; @@ -476,7 +478,7 @@ KdbpCmdEvalExpression( } /* Evaluate the expression */ - Ok = KdbpEvaluateExpression(Argv[1], sizeof("kdb:> ")-1 + (Argv[1]-Argv[0]), &Result); + Ok = KdbpEvaluateExpression(Argv[1], KdbPromptString.Length + (Argv[1]-Argv[0]), &Result); if (Ok) { if (Result > 0x00000000ffffffffLL) @@ -785,7 +787,7 @@ KdbpCmdDisassembleX( /* Evaluate the expression */ if (Argc > 1) { - if (!KdbpEvaluateExpression(Argv[1], sizeof("kdb:> ")-1 + (Argv[1]-Argv[0]), &Result)) + if (!KdbpEvaluateExpression(Argv[1], KdbPromptString.Length + (Argv[1]-Argv[0]), &Result)) return TRUE; if (Result > (ULONGLONG)(~((ULONG_PTR)0))) @@ -1164,7 +1166,7 @@ KdbpCmdBackTrace( Argv[1]++; /* Evaluate the expression */ - if (!KdbpEvaluateExpression(Argv[1], sizeof("kdb:> ")-1 + (Argv[1]-Argv[0]), &Result)) + if (!KdbpEvaluateExpression(Argv[1], KdbPromptString.Length + (Argv[1]-Argv[0]), &Result)) return TRUE; if (Result > (ULONGLONG)(~((ULONG_PTR)0))) @@ -1557,7 +1559,7 @@ KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[]) /* Evaluate the address expression */ if (!KdbpEvaluateExpression(Argv[AddressArgIndex], - sizeof("kdb:> ")-1 + (Argv[AddressArgIndex]-Argv[0]), + KdbPromptString.Length + (Argv[AddressArgIndex]-Argv[0]), &Result)) { return TRUE; @@ -1922,7 +1924,7 @@ KdbpCmdMod( Argv[Argc][strlen(Argv[Argc])] = ' '; /* Evaluate the expression */ - if (!KdbpEvaluateExpression(Argv[1], sizeof("kdb:> ")-1 + (Argv[1]-Argv[0]), &Result)) + if (!KdbpEvaluateExpression(Argv[1], KdbPromptString.Length + (Argv[1]-Argv[0]), &Result)) { return TRUE; } @@ -3651,7 +3653,7 @@ KdbpCliMainLoop( KdbNumberOfRowsPrinted = KdbNumberOfColsPrinted = 0; /* Print the prompt */ - KdbpPrint("kdb:> "); + KdbpPrint(KdbPromptString.Buffer); /* Read a command and remember it */ KdbpReadCommand(Command, sizeof (Command)); @@ -3814,204 +3816,3 @@ KdbpCliInit(VOID) ExFreePool(FileBuffer); } - -VOID -NTAPI -KdpSerialDebugPrint( - LPSTR Message, - ULONG Length -); - -STRING KdpPromptString = RTL_CONSTANT_STRING("kdb:> "); -extern KSPIN_LOCK KdpSerialSpinLock; - -USHORT -NTAPI -KdpPrompt( - _In_reads_bytes_(InStringLength) PCHAR UnsafeInString, - _In_ USHORT InStringLength, - _Out_writes_bytes_(OutStringLength) PCHAR UnsafeOutString, - _In_ USHORT OutStringLength, - _In_ KPROCESSOR_MODE PreviousMode, - _In_ PKTRAP_FRAME TrapFrame, - _In_ PKEXCEPTION_FRAME ExceptionFrame) -{ - USHORT i; - CHAR Response; - ULONG DummyScanCode; - KIRQL OldIrql; - PCHAR InString; - PCHAR OutString; - CHAR InStringBuffer[512]; - CHAR OutStringBuffer[512]; - - /* Normalize the lengths */ - InStringLength = min(InStringLength, - sizeof(InStringBuffer)); - OutStringLength = min(OutStringLength, - sizeof(OutStringBuffer)); - - /* Check if we need to verify the string */ - if (PreviousMode != KernelMode) - { - /* Handle user-mode buffers safely */ - _SEH2_TRY - { - /* Probe the prompt */ - ProbeForRead(UnsafeInString, - InStringLength, - 1); - - /* Capture prompt */ - InString = InStringBuffer; - RtlCopyMemory(InString, - UnsafeInString, - InStringLength); - - /* Probe and make room for response */ - ProbeForWrite(UnsafeOutString, - OutStringLength, - 1); - OutString = OutStringBuffer; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Bad string pointer, bail out */ - _SEH2_YIELD(return 0); - } - _SEH2_END; - } - else - { - InString = UnsafeInString; - OutString = UnsafeOutString; - } - - /* Acquire the printing spinlock without waiting at raised IRQL */ - while (TRUE) - { - /* Wait when the spinlock becomes available */ - while (!KeTestSpinLock(&KdpSerialSpinLock)); - - /* Spinlock was free, raise IRQL */ - KeRaiseIrql(HIGH_LEVEL, &OldIrql); - - /* Try to get the spinlock */ - if (KeTryToAcquireSpinLockAtDpcLevel(&KdpSerialSpinLock)) - break; - - /* Someone else got the spinlock, lower IRQL back */ - KeLowerIrql(OldIrql); - } - - /* Loop the string to send */ - for (i = 0; i < InStringLength; i++) - { - /* Print it to serial */ - KdPortPutByteEx(&SerialPortInfo, *(PCHAR)(InString + i)); - } - - /* Print a new line for log neatness */ - KdPortPutByteEx(&SerialPortInfo, '\r'); - KdPortPutByteEx(&SerialPortInfo, '\n'); - - /* Print the kdb prompt */ - for (i = 0; i < KdpPromptString.Length; i++) - { - /* Print it to serial */ - KdPortPutByteEx(&SerialPortInfo, - *(KdpPromptString.Buffer + i)); - } - - if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) - KbdDisableMouse(); - - /* Loop the whole string */ - for (i = 0; i < OutStringLength; i++) - { - /* Check if this is serial debugging mode */ - if (KdbDebugState & KD_DEBUG_KDSERIAL) - { - /* Get the character from serial */ - do - { - Response = KdbpTryGetCharSerial(MAXULONG); - } while (Response == -1); - } - else - { - /* Get the response from the keyboard */ - do - { - Response = KdbpTryGetCharKeyboard(&DummyScanCode, MAXULONG); - } while (Response == -1); - } - - /* Check for return */ - if (Response == '\r') - { - /* - * We might need to discard the next '\n'. - * Wait a bit to make sure we receive it. - */ - KeStallExecutionProcessor(100000); - - /* Check the mode */ - if (KdbDebugState & KD_DEBUG_KDSERIAL) - { - /* Read and discard the next character, if any */ - KdbpTryGetCharSerial(5); - } - else - { - /* Read and discard the next character, if any */ - KdbpTryGetCharKeyboard(&DummyScanCode, 5); - } - - /* - * Null terminate the output string -- documentation states that - * DbgPrompt does not null terminate, but it does - */ - *(PCHAR)(OutString + i) = 0; - break; - } - - /* Write it back and print it to the log */ - *(PCHAR)(OutString + i) = Response; - KdPortPutByteEx(&SerialPortInfo, Response); - } - - if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) - KbdEnableMouse(); - - /* Print a new line */ - KdPortPutByteEx(&SerialPortInfo, '\r'); - KdPortPutByteEx(&SerialPortInfo, '\n'); - - /* Release spinlock */ - KiReleaseSpinLock(&KdpSerialSpinLock); - - /* Lower IRQL back */ - KeLowerIrql(OldIrql); - - /* Copy back response if required */ - if (PreviousMode != KernelMode) - { - _SEH2_TRY - { - /* Safely copy back response to user mode */ - RtlCopyMemory(UnsafeOutString, - OutString, - i); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* String became invalid after we exited, fail */ - _SEH2_YIELD(return 0); - } - _SEH2_END; - } - - /* Return the length */ - return i; -} diff --git a/ntoskrnl/ke/powerpc/ppc_irq.c b/ntoskrnl/ke/powerpc/ppc_irq.c index 772f06b7c79..d516861bd53 100644 --- a/ntoskrnl/ke/powerpc/ppc_irq.c +++ b/ntoskrnl/ke/powerpc/ppc_irq.c @@ -745,7 +745,10 @@ KeDisableInterrupts(VOID) ULONG NTAPI -KdpServiceDispatcher(ULONG Service, PCHAR Buffer, ULONG Length); +KdpServiceDispatcher(ULONG Service, + PVOID Buffer1, + ULONG Buffer1Length, + KPROCESSOR_MODE PreviousMode); typedef ULONG (*PSYSCALL_FUN) (ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG); @@ -769,7 +772,8 @@ KiSystemService(ppc_trap_frame_t *trap_frame) trap_frame->gpr[3] = KdpServiceDispatcher (trap_frame->gpr[3], (PCHAR)trap_frame->gpr[4], - trap_frame->gpr[5]); + trap_frame->gpr[5], + UserMode /*KernelMode*/); break; case 0xf0000: /* Thread startup */ /* XXX how to use UserThread (gpr[6]) */ diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 9d4d6685408..ffe14d67078 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -405,7 +405,10 @@ if(NOT _WINKD_) ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/kdbg.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdinit.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdio.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c) + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdapi.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kddata.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdprint.c) else() # _WINKD_

5 years, 1 month

[reactos] 04/06: [NTOS:KD64] Some code formatting + add SAL2 annotations to the functions that are going to be involved in the next commit.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54c03f6965ec8fdca52ac… commit 54c03f6965ec8fdca52aca75c3baed6e959fb07b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 17 22:28:42 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 17 23:21:53 2019 +0100 [NTOS:KD64] Some code formatting + add SAL2 annotations to the functions that are going to be involved in the next commit. + s/ReturnStatus/Status/ , and get rid of Win32 LPSTR and replace by PCHAR (since the concerned code deals with counted strings). --- ntoskrnl/include/internal/kd64.h | 58 +++++++++++----------- ntoskrnl/kd64/kdapi.c | 49 +++++++++---------- ntoskrnl/kd64/kdprint.c | 101 ++++++++++++++++++--------------------- ntoskrnl/kd64/kdtrap.c | 21 ++++---- sdk/include/ndk/kdfuncs.h | 14 +++--- 5 files changed, 115 insertions(+), 128 deletions(-) diff --git a/ntoskrnl/include/internal/kd64.h b/ntoskrnl/include/internal/kd64.h index f1fa443c8da..bff0a3a872d 100644 --- a/ntoskrnl/include/internal/kd64.h +++ b/ntoskrnl/include/internal/kd64.h @@ -12,9 +12,9 @@ // Default size of the DbgPrint log buffer // #if DBG -#define KD_DEFAULT_LOG_BUFFER_SIZE 0x8000 +#define KD_DEFAULT_LOG_BUFFER_SIZE 0x8000 #else -#define KD_DEFAULT_LOG_BUFFER_SIZE 0x1000 +#define KD_DEFAULT_LOG_BUFFER_SIZE 0x1000 #endif // @@ -211,26 +211,26 @@ KdDisableDebuggerWithLock( NTSTATUS NTAPI KdpPrint( - IN ULONG ComponentId, - IN ULONG Level, - IN LPSTR String, - IN USHORT Length, - IN KPROCESSOR_MODE PreviousMode, - IN PKTRAP_FRAME TrapFrame, - IN PKEXCEPTION_FRAME ExceptionFrame, - OUT PBOOLEAN Handled + _In_ ULONG ComponentId, + _In_ ULONG Level, + _In_reads_bytes_(Length) PCHAR String, + _In_ USHORT Length, + _In_ KPROCESSOR_MODE PreviousMode, + _In_ PKTRAP_FRAME TrapFrame, + _In_ PKEXCEPTION_FRAME ExceptionFrame, + _Out_ PBOOLEAN Handled ); USHORT NTAPI KdpPrompt( - IN LPSTR PromptString, - IN USHORT PromptLength, - OUT LPSTR ResponseString, - IN USHORT MaximumResponseLength, - IN KPROCESSOR_MODE PreviousMode, - IN PKTRAP_FRAME TrapFrame, - IN PKEXCEPTION_FRAME ExceptionFrame + _In_reads_bytes_(PromptLength) PCHAR PromptString, + _In_ USHORT PromptLength, + _Out_writes_bytes_(MaximumResponseLength) PCHAR ResponseString, + _In_ USHORT MaximumResponseLength, + _In_ KPROCESSOR_MODE PreviousMode, + _In_ PKTRAP_FRAME TrapFrame, + _In_ PKEXCEPTION_FRAME ExceptionFrame ); VOID @@ -345,12 +345,12 @@ KdpAllowDisable( NTSTATUS NTAPI KdpCopyMemoryChunks( - IN ULONG64 Address, - IN PVOID Buffer, - IN ULONG TotalSize, - IN ULONG ChunkSize, - IN ULONG Flags, - OUT PULONG ActualSize OPTIONAL + _In_ ULONG64 Address, + _In_ PVOID Buffer, + _In_ ULONG TotalSize, + _In_ ULONG ChunkSize, + _In_ ULONG Flags, + _Out_opt_ PULONG ActualSize ); // @@ -359,16 +359,16 @@ KdpCopyMemoryChunks( VOID NTAPI KdpMoveMemory( - IN PVOID Destination, - IN PVOID Source, - IN SIZE_T Length + _In_ PVOID Destination, + _In_ PVOID Source, + _In_ SIZE_T Length ); VOID NTAPI KdpZeroMemory( - IN PVOID Destination, - IN SIZE_T Length + _In_ PVOID Destination, + _In_ SIZE_T Length ); // @@ -510,7 +510,7 @@ KdpSysCheckLowMemory( VOID __cdecl KdpDprintf( - IN PCHAR Format, + _In_ PCHAR Format, ... ); diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c index 1f0066d8ffe..5c48a1e767e 100644 --- a/ntoskrnl/kd64/kdapi.c +++ b/ntoskrnl/kd64/kdapi.c @@ -17,9 +17,10 @@ VOID NTAPI -KdpMoveMemory(IN PVOID Destination, - IN PVOID Source, - IN SIZE_T Length) +KdpMoveMemory( + _In_ PVOID Destination, + _In_ PVOID Source, + _In_ SIZE_T Length) { PCHAR DestinationBytes, SourceBytes; @@ -31,8 +32,9 @@ KdpMoveMemory(IN PVOID Destination, VOID NTAPI -KdpZeroMemory(IN PVOID Destination, - IN SIZE_T Length) +KdpZeroMemory( + _In_ PVOID Destination, + _In_ SIZE_T Length) { PCHAR DestinationBytes; @@ -43,12 +45,13 @@ KdpZeroMemory(IN PVOID Destination, NTSTATUS NTAPI -KdpCopyMemoryChunks(IN ULONG64 Address, - IN PVOID Buffer, - IN ULONG TotalSize, - IN ULONG ChunkSize, - IN ULONG Flags, - OUT PULONG ActualSize OPTIONAL) +KdpCopyMemoryChunks( + _In_ ULONG64 Address, + _In_ PVOID Buffer, + _In_ ULONG TotalSize, + _In_ ULONG ChunkSize, + _In_ ULONG Flags, + _Out_opt_ PULONG ActualSize) { NTSTATUS Status; ULONG RemainingLength, CopyChunk; @@ -94,10 +97,7 @@ KdpCopyMemoryChunks(IN ULONG64 Address, } /* Do the copy */ - Status = MmDbgCopyMemory(Address, - Buffer, - CopyChunk, - Flags); + Status = MmDbgCopyMemory(Address, Buffer, CopyChunk, Flags); if (!NT_SUCCESS(Status)) { /* Copy failed, break out */ @@ -2147,15 +2147,16 @@ KdDisableDebugger(VOID) */ NTSTATUS NTAPI -KdSystemDebugControl(IN SYSDBG_COMMAND Command, - IN PVOID InputBuffer, - IN ULONG InputBufferLength, - OUT PVOID OutputBuffer, - IN ULONG OutputBufferLength, - IN OUT PULONG ReturnLength, - IN KPROCESSOR_MODE PreviousMode) +KdSystemDebugControl( + _In_ SYSDBG_COMMAND Command, + _In_ PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_ PVOID OutputBuffer, + _In_ ULONG OutputBufferLength, + _Inout_ PULONG ReturnLength, + _In_ KPROCESSOR_MODE PreviousMode) { - /* handle sime internal commands */ + /* Handle some internal commands */ if (Command == ' soR') { switch ((ULONG_PTR)InputBuffer) @@ -2269,7 +2270,7 @@ KdRefreshDebuggerNotPresent(VOID) /* Check if the debugger is completely disabled */ if (KdPitchDebugger) { - /* Don't try to refresh then -- fail early */ + /* Don't try to refresh then, fail early */ return TRUE; } diff --git a/ntoskrnl/kd64/kdprint.c b/ntoskrnl/kd64/kdprint.c index 8f721e80887..0389f32e39b 100644 --- a/ntoskrnl/kd64/kdprint.c +++ b/ntoskrnl/kd64/kdprint.c @@ -17,7 +17,8 @@ BOOLEAN NTAPI -KdpPrintString(IN PSTRING Output) +KdpPrintString( + _In_ PSTRING Output) { STRING Data, Header; DBGKD_DEBUG_IO DebugIo; @@ -57,8 +58,9 @@ KdpPrintString(IN PSTRING Output) BOOLEAN NTAPI -KdpPromptString(IN PSTRING PromptString, - IN PSTRING ResponseString) +KdpPromptString( + _In_ PSTRING PromptString, + _In_ PSTRING ResponseString) { STRING Data, Header; DBGKD_DEBUG_IO DebugIo; @@ -210,19 +212,20 @@ KdpSymbol(IN PSTRING DllPath, USHORT NTAPI -KdpPrompt(IN LPSTR PromptString, - IN USHORT PromptLength, - OUT PCHAR ResponseString, - IN USHORT MaximumResponseLength, - IN KPROCESSOR_MODE PreviousMode, - IN PKTRAP_FRAME TrapFrame, - IN PKEXCEPTION_FRAME ExceptionFrame) +KdpPrompt( + _In_reads_bytes_(PromptLength) PCHAR PromptString, + _In_ USHORT PromptLength, + _Out_writes_bytes_(MaximumResponseLength) PCHAR ResponseString, + _In_ USHORT MaximumResponseLength, + _In_ KPROCESSOR_MODE PreviousMode, + _In_ PKTRAP_FRAME TrapFrame, + _In_ PKEXCEPTION_FRAME ExceptionFrame) { STRING PromptBuffer, ResponseBuffer; BOOLEAN Enable, Resend; + PCHAR SafeResponseString; CHAR CapturedPrompt[512]; CHAR SafeResponseBuffer[512]; - PCHAR SafeResponseString; /* Normalize the lengths */ PromptLength = min(PromptLength, @@ -236,26 +239,18 @@ KdpPrompt(IN LPSTR PromptString, /* Handle user-mode buffers safely */ _SEH2_TRY { - /* Probe the prompt */ - ProbeForRead(PromptString, - PromptLength, - 1); - - /* Capture prompt */ - KdpMoveMemory(CapturedPrompt, - PromptString, - PromptLength); + /* Probe and capture the prompt */ + ProbeForRead(PromptString, PromptLength, 1); + KdpMoveMemory(CapturedPrompt, PromptString, PromptLength); PromptString = CapturedPrompt; - /* Probe and make room for response */ - ProbeForWrite(ResponseString, - MaximumResponseLength, - 1); + /* Probe and make room for the response */ + ProbeForWrite(ResponseString, MaximumResponseLength, 1); SafeResponseString = SafeResponseBuffer; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Bad string pointer, bail out */ + /* Bad string pointer, bail out */ _SEH2_YIELD(return 0); } _SEH2_END; @@ -265,7 +260,7 @@ KdpPrompt(IN LPSTR PromptString, SafeResponseString = ResponseString; } - /* Setup the prompt and response buffers */ + /* Setup the prompt and response buffers */ PromptBuffer.Buffer = PromptString; PromptBuffer.Length = PromptLength; ResponseBuffer.Buffer = SafeResponseString; @@ -290,19 +285,19 @@ KdpPrompt(IN LPSTR PromptString, /* Exit the debugger */ KdExitDebugger(Enable); - /* Copy back response if required */ + /* Copy back the response if required */ if (PreviousMode != KernelMode) { _SEH2_TRY { - /* Safely copy back response to user mode */ + /* Safely copy back the response to user mode */ KdpMoveMemory(ResponseString, ResponseBuffer.Buffer, ResponseBuffer.Length); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* String became invalid after we exited, fail */ + /* String became invalid after we exited, fail */ _SEH2_YIELD(return 0); } _SEH2_END; @@ -314,16 +309,17 @@ KdpPrompt(IN LPSTR PromptString, NTSTATUS NTAPI -KdpPrint(IN ULONG ComponentId, - IN ULONG Level, - IN LPSTR String, - IN USHORT Length, - IN KPROCESSOR_MODE PreviousMode, - IN PKTRAP_FRAME TrapFrame, - IN PKEXCEPTION_FRAME ExceptionFrame, - OUT PBOOLEAN Handled) +KdpPrint( + _In_ ULONG ComponentId, + _In_ ULONG Level, + _In_reads_bytes_(Length) PCHAR String, + _In_ USHORT Length, + _In_ KPROCESSOR_MODE PreviousMode, + _In_ PKTRAP_FRAME TrapFrame, + _In_ PKEXCEPTION_FRAME ExceptionFrame, + _Out_ PBOOLEAN Handled) { - NTSTATUS ReturnStatus; + NTSTATUS Status; BOOLEAN Enable; STRING OutputString; PVOID CapturedString; @@ -356,27 +352,21 @@ KdpPrint(IN ULONG ComponentId, /* Normalize the length */ Length = min(Length, 512); - /* Check if we need to verify the buffer */ + /* Check if we need to verify the string */ if (PreviousMode != KernelMode) { /* Capture user-mode buffers */ _SEH2_TRY { - /* Probe the string */ - ProbeForRead(String, - Length, - 1); - - /* Capture it */ + /* Probe and capture the string */ + ProbeForRead(String, Length, 1); CapturedString = alloca(Length); - KdpMoveMemory(CapturedString, - String, - Length); + KdpMoveMemory(CapturedString, String, Length); String = CapturedString; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Bad pointer, fail the print */ + /* Bad string pointer, bail out */ _SEH2_YIELD(return STATUS_ACCESS_VIOLATION); } _SEH2_END; @@ -404,29 +394,30 @@ KdpPrint(IN ULONG ComponentId, if (KdpPrintString(&OutputString)) { /* User pressed CTRL-C, breakpoint on return */ - ReturnStatus = STATUS_BREAKPOINT; + Status = STATUS_BREAKPOINT; } else { /* String was printed */ - ReturnStatus = STATUS_SUCCESS; + Status = STATUS_SUCCESS; } /* Exit the debugger and return */ KdExitDebugger(Enable); *Handled = TRUE; - return ReturnStatus; + return Status; } VOID __cdecl -KdpDprintf(IN PCHAR Format, - ...) +KdpDprintf( + _In_ PCHAR Format, + ...) { STRING String; - CHAR Buffer[100]; USHORT Length; va_list ap; + CHAR Buffer[100]; /* Format the string */ va_start(ap, Format); diff --git a/ntoskrnl/kd64/kdtrap.c b/ntoskrnl/kd64/kdtrap.c index 91a83de4691..0be83956849 100644 --- a/ntoskrnl/kd64/kdtrap.c +++ b/ntoskrnl/kd64/kdtrap.c @@ -166,7 +166,7 @@ KdpTrap(IN PKTRAP_FRAME TrapFrame, /* Call the worker routine */ ReturnStatus = KdpPrint((ULONG)KdpGetParameterThree(ContextRecord), (ULONG)KdpGetParameterFour(ContextRecord), - (LPSTR)ExceptionRecord->ExceptionInformation[1], + (PCHAR)ExceptionRecord->ExceptionInformation[1], (USHORT)ExceptionRecord->ExceptionInformation[2], PreviousMode, TrapFrame, @@ -174,17 +174,16 @@ KdpTrap(IN PKTRAP_FRAME TrapFrame, &Handled); /* Update the return value for the caller */ - KeSetContextReturnRegister(ContextRecord, - ReturnStatus); + KeSetContextReturnRegister(ContextRecord, ReturnStatus); break; /* DbgPrompt */ case BREAKPOINT_PROMPT: /* Call the worker routine */ - ReturnLength = KdpPrompt((LPSTR)ExceptionRecord->ExceptionInformation[1], + ReturnLength = KdpPrompt((PCHAR)ExceptionRecord->ExceptionInformation[1], (USHORT)ExceptionRecord->ExceptionInformation[2], - (LPSTR)KdpGetParameterThree(ContextRecord), + (PCHAR)KdpGetParameterThree(ContextRecord), (USHORT)KdpGetParameterFour(ContextRecord), PreviousMode, TrapFrame, @@ -205,10 +204,8 @@ KdpTrap(IN PKTRAP_FRAME TrapFrame, case BREAKPOINT_LOAD_SYMBOLS: /* Call the worker routine */ - KdpSymbol((PSTRING)ExceptionRecord-> - ExceptionInformation[1], - (PKD_SYMBOLS_INFO)ExceptionRecord-> - ExceptionInformation[2], + KdpSymbol((PSTRING)ExceptionRecord->ExceptionInformation[1], + (PKD_SYMBOLS_INFO)ExceptionRecord->ExceptionInformation[2], Unload, PreviousMode, ContextRecord, @@ -221,10 +218,8 @@ KdpTrap(IN PKTRAP_FRAME TrapFrame, case BREAKPOINT_COMMAND_STRING: /* Call the worker routine */ - KdpCommandString((PSTRING)ExceptionRecord-> - ExceptionInformation[1], - (PSTRING)ExceptionRecord-> - ExceptionInformation[2], + KdpCommandString((PSTRING)ExceptionRecord->ExceptionInformation[1], + (PSTRING)ExceptionRecord->ExceptionInformation[2], PreviousMode, ContextRecord, TrapFrame, diff --git a/sdk/include/ndk/kdfuncs.h b/sdk/include/ndk/kdfuncs.h index 2d9278f8f80..21681a67674 100644 --- a/sdk/include/ndk/kdfuncs.h +++ b/sdk/include/ndk/kdfuncs.h @@ -33,13 +33,13 @@ Author: NTSTATUS NTAPI KdSystemDebugControl( - SYSDBG_COMMAND Command, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - PULONG ReturnLength, - KPROCESSOR_MODE PreviousMode + _In_ SYSDBG_COMMAND Command, + _In_ PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_ PVOID OutputBuffer, + _In_ ULONG OutputBufferLength, + _Inout_ PULONG ReturnLength, + _In_ KPROCESSOR_MODE PreviousMode ); BOOLEAN

5 years, 1 month

← Newer
1
...
13
14
15
16
17
18
19
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2019