Ros-diffs July 2022

ros-diffs@reactos.org

7 participants
26 discussions

[reactos] 01/01: [NTUSER] Improve WINSTATION_OBJECT compatibility (#4591)
by Katayama Hirofumi MZ 31 Jul '22

31 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c1b65d7a4a4036331636… commit 6c1b65d7a4a40363316362e12aa54b9a8ec6d4eb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jul 31 10:25:07 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jul 31 10:25:07 2022 +0900 [NTUSER] Improve WINSTATION_OBJECT compatibility (#4591) - Modify WINSTATION_OBJECT structure with inserting struct tagKL *spklList member. - Add some C_ASSERT(offsetof(WINSTATION_OBJECT, ...) == ...);. CORE-18252 --- win32ss/user/ntuser/winsta.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/win32ss/user/ntuser/winsta.h b/win32ss/user/ntuser/winsta.h index b36aaa1ce55..2918ca510fa 100644 --- a/win32ss/user/ntuser/winsta.h +++ b/win32ss/user/ntuser/winsta.h @@ -11,18 +11,16 @@ #define WSS_DYING (16) #define WSS_REALSHUTDOWN (32) +// See also: https://reactos.org/wiki/Techwiki:Win32k/WINDOWSTATION typedef struct _WINSTATION_OBJECT { DWORD dwSessionId; LIST_ENTRY DesktopListHead; PRTL_ATOM_TABLE AtomTable; - HANDLE ShellWindow; - HANDLE ShellListView; - - ULONG Flags; - struct _DESKTOP* ActiveDesktop; + ULONG Flags; + struct tagKL* spklList; PTHREADINFO ptiClipLock; PTHREADINFO ptiDrawingClipboard; PWND spwndClipOpen; @@ -40,8 +38,22 @@ typedef struct _WINSTATION_OBJECT LUID luidUser; PVOID psidUser; + /* ReactOS-specific */ + struct _DESKTOP* ActiveDesktop; + HANDLE ShellWindow; + HANDLE ShellListView; } WINSTATION_OBJECT, *PWINSTATION_OBJECT; +#ifndef _WIN64 +C_ASSERT(offsetof(WINSTATION_OBJECT, Flags) == 0x10); +C_ASSERT(offsetof(WINSTATION_OBJECT, spklList) == 0x14); +C_ASSERT(offsetof(WINSTATION_OBJECT, ptiClipLock) == 0x18); +C_ASSERT(offsetof(WINSTATION_OBJECT, ptiDrawingClipboard) == 0x1c); +C_ASSERT(offsetof(WINSTATION_OBJECT, spwndClipOpen) == 0x20); +C_ASSERT(offsetof(WINSTATION_OBJECT, spwndClipViewer) == 0x24); +C_ASSERT(offsetof(WINSTATION_OBJECT, spwndClipOwner) == 0x28); +#endif + extern WINSTATION_OBJECT *InputWindowStation; extern HANDLE gpidLogon; extern HWND hwndSAS;

1 0

[reactos] 01/01: [SECLOGON][ADVAPI] CreateProcessWithLogonW: Return process information to the caller
by Eric Kohl 23 Jul '22

23 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23ecbb3ed5f1b2881e28e… commit 23ecbb3ed5f1b2881e28e54cccec16586e8241fb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 24 01:08:13 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 24 01:08:13 2022 +0200 [SECLOGON][ADVAPI] CreateProcessWithLogonW: Return process information to the caller --- base/services/seclogon/rpcserver.c | 40 ++++++++++++++++++++++++++++++++++-- dll/win32/advapi32/wine/security.c | 21 ++++++++++++++----- sdk/include/reactos/idl/seclogon.idl | 7 ++++++- 3 files changed, 60 insertions(+), 8 deletions(-) diff --git a/base/services/seclogon/rpcserver.c b/base/services/seclogon/rpcserver.c index 9c8f85e7c97..17671e08801 100644 --- a/base/services/seclogon/rpcserver.c +++ b/base/services/seclogon/rpcserver.c @@ -64,6 +64,7 @@ SeclCreateProcessWithLogonW( PROFILEINFOW ProfileInfo; HANDLE hToken = NULL; + HANDLE hTargetProcessHandle = NULL; ULONG dwError = ERROR_SUCCESS; BOOL rc; @@ -80,6 +81,17 @@ SeclCreateProcessWithLogonW( TRACE("CurrentDirectory: '%S'\n", pRequest->CurrentDirectory); TRACE("LogonFlags: 0x%lx\n", pRequest->dwLogonFlags); TRACE("CreationFlags: 0x%lx\n", pRequest->dwCreationFlags); + TRACE("ProcessId: %lu\n", pRequest->dwProcessId); + } + + hTargetProcessHandle = OpenProcess(PROCESS_DUP_HANDLE, + FALSE, + pRequest->dwProcessId); + if (hTargetProcessHandle == NULL) + { + dwError = GetLastError(); + WARN("OpenProcess() failed with Error %lu\n", dwError); + goto done; } ZeroMemory(&ProfileInfo, sizeof(ProfileInfo)); @@ -140,9 +152,33 @@ SeclCreateProcessWithLogonW( goto done; } - /* FIXME: Pass process info to the caller */ + /* Return process info to the caller */ + if (pResponse != NULL) + { + DuplicateHandle(GetCurrentProcess(), + ProcessInfo.hProcess, + hTargetProcessHandle, + (PHANDLE)&pResponse->hProcess, + 0, + FALSE, + DUPLICATE_SAME_ACCESS); + + DuplicateHandle(GetCurrentProcess(), + ProcessInfo.hThread, + hTargetProcessHandle, + (PHANDLE)&pResponse->hThread, + 0, + FALSE, + DUPLICATE_SAME_ACCESS); + + pResponse->dwProcessId = ProcessInfo.dwProcessId; + pResponse->dwThreadId = ProcessInfo.dwThreadId; + } done: + if (hTargetProcessHandle) + CloseHandle(hTargetProcessHandle); + if (ProcessInfo.hThread) CloseHandle(ProcessInfo.hThread); @@ -156,5 +192,5 @@ done: CloseHandle(hToken); if (pResponse != NULL) - pResponse->ulError = dwError; + pResponse->dwError = dwError; } diff --git a/dll/win32/advapi32/wine/security.c b/dll/win32/advapi32/wine/security.c index 4b20be2b14c..ce31d7fb474 100644 --- a/dll/win32/advapi32/wine/security.c +++ b/dll/win32/advapi32/wine/security.c @@ -3538,7 +3538,14 @@ CreateProcessWithLogonW( Request.dwLogonFlags = dwLogonFlags; Request.dwCreationFlags = dwCreationFlags; - Response.ulError = ERROR_SUCCESS; + Request.dwProcessId = GetCurrentProcessId(); + TRACE("Request.dwProcessId %lu\n", Request.dwProcessId); + + Response.hProcess = 0; + Response.hThread = 0; + Response.dwProcessId = 0; + Response.dwThreadId = 0; + Response.dwError = ERROR_SUCCESS; RpcTryExcept { @@ -3561,13 +3568,17 @@ CreateProcessWithLogonW( hBinding = NULL; } - TRACE("Response.ulError %lu\n", Response.ulError); - if (Response.ulError != ERROR_SUCCESS) - SetLastError(Response.ulError); + TRACE("Response.hProcess %p\n", Response.hProcess); + TRACE("Response.hThread %p\n", Response.hThread); + TRACE("Response.dwProcessId %lu\n", Response.dwProcessId); + TRACE("Response.dwThreadId %lu\n", Response.dwThreadId); + TRACE("Response.dwError %lu\n", Response.dwError); + if (Response.dwError != ERROR_SUCCESS) + SetLastError(Response.dwError); TRACE("CreateProcessWithLogonW() done\n"); - return (Response.ulError == ERROR_SUCCESS); + return (Response.dwError == ERROR_SUCCESS); } BOOL WINAPI CreateProcessWithTokenW(HANDLE token, DWORD logon_flags, LPCWSTR application_name, LPWSTR command_line, diff --git a/sdk/include/reactos/idl/seclogon.idl b/sdk/include/reactos/idl/seclogon.idl index c605176e16f..d76689463a7 100644 --- a/sdk/include/reactos/idl/seclogon.idl +++ b/sdk/include/reactos/idl/seclogon.idl @@ -14,11 +14,16 @@ typedef struct _SECL_REQUEST [string] WCHAR *CurrentDirectory; DWORD dwLogonFlags; DWORD dwCreationFlags; + DWORD dwProcessId; } SECL_REQUEST, *PSECL_REQUEST; typedef struct _SECL_RESPONSE { - ULONG ulError; + DWORD_PTR hProcess; + DWORD_PTR hThread; + DWORD dwProcessId; + DWORD dwThreadId; + DWORD dwError; } SECL_RESPONSE, *PSECL_RESPONSE; [

1 0

[reactos] 01/01: [IMM32] Follow-up of #4588 (ffbdb7d)
by Katayama Hirofumi MZ 23 Jul '22

23 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfe959e62cf34b1260b2c… commit bfe959e62cf34b1260b2c6e6ea27abfbad5c5f83 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jul 23 12:42:54 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Jul 23 12:42:54 2022 +0900 [IMM32] Follow-up of #4588 (ffbdb7d) CORE-11700 --- dll/win32/imm32/ime.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 21cd6810c61..30fc0af9203 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -499,7 +499,11 @@ Imm32GetImeMenuItemWInterProcess(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID pView->dwFlags = dwFlags; pView->dwType = dwType; pView->dwItemCount = dwItemCount; - pView->Parent.cbSize = (lpImeParentMenu ? sizeof(IMEMENUITEMINFOW) : 0); + if (lpImeParentMenu) + { + pView->Parent = *(LPIMEMENUITEMINFOW)lpImeParentMenu; + pView->Parent.cbSize = sizeof(IMEMENUITEMINFOW); + } if (!SendMessageW(hImeWnd, WM_IME_SYSTEM, IMS_GETIMEMENU, (LPARAM)hIMC)) goto Quit;

1 0

[reactos] 01/01: [IMM32][USER32] ImmPutImeMenuItemsIntoMappedFile (#4588)
by Katayama Hirofumi MZ 22 Jul '22

22 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffbdb7d39e64fb957e7ae… commit ffbdb7d39e64fb957e7ae2b26645b3e16531bc9b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jul 23 05:58:17 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 23 05:58:17 2022 +0900 [IMM32][USER32] ImmPutImeMenuItemsIntoMappedFile (#4588) Implement inter-process menu item retrieving. CORE-11700 --- dll/win32/imm32/ime.c | 184 ++++++++++++++++++++++++++++++++++++++++- dll/win32/imm32/imm32.spec | 2 +- dll/win32/imm32/precomp.h | 3 + dll/win32/imm32/utils.c | 121 +++++++++++++++++++++++++++ sdk/include/ddk/immdev.h | 1 + win32ss/user/user32/misc/imm.c | 2 +- 6 files changed, 307 insertions(+), 6 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 2703a1e3cad..21cd6810c61 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -355,13 +355,189 @@ Quit: return ret; } +// We will transport the IME menu items by using a flat memory block via +// a file mapping object beyond the boundary of a process. + +#define MAX_IMEMENU_BITMAP_BYTES 0xF00 + +typedef struct tagIMEMENUITEM +{ + IMEMENUITEMINFOW Info; + BYTE abChecked[MAX_IMEMENU_BITMAP_BYTES]; + BYTE abUnchecked[MAX_IMEMENU_BITMAP_BYTES]; + BYTE abItem[MAX_IMEMENU_BITMAP_BYTES]; +} IMEMENUITEM, *PIMEMENUITEM; + +typedef struct tagIMEMENU +{ + DWORD dwVersion; + DWORD dwFlags; + DWORD dwType; + DWORD dwItemCount; + IMEMENUITEMINFOW Parent; + IMEMENUITEM Items[ANYSIZE_ARRAY]; +} IMEMENU, *PIMEMENU; + +/*********************************************************************** + * ImmPutImeMenuItemsIntoMappedFile (IMM32.@) + * + * Called from user32.dll to transport the IME menu items by using a + * file mapping object. This function is provided for WM_IME_SYSTEM:IMS_GETIMEMENU + * handling. + */ +LRESULT WINAPI ImmPutImeMenuItemsIntoMappedFile(HIMC hIMC) +{ + LRESULT ret = FALSE; + HANDLE hMapping; + PIMEMENU pView; + LPIMEMENUITEMINFOW pParent = NULL, pItems = NULL; + DWORD i, cItems, cbItems = 0; + + hMapping = OpenFileMappingW(FILE_MAP_ALL_ACCESS, FALSE, L"ImmMenuInfo"); + pView = MapViewOfFile(hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0); + if (!pView || pView->dwVersion != 1) + { + ERR("hMapping %p, pView %p\n", hMapping, pView); + goto Quit; + } + + if (pView->Parent.cbSize > 0) + pParent = &pView->Parent; + + if (pView->dwItemCount > 0) + { + cbItems = pView->dwItemCount * sizeof(IMEMENUITEMINFOW); + pItems = ImmLocalAlloc(HEAP_ZERO_MEMORY, cbItems); + if (!pItems) + { + ERR("!pItems\n"); + goto Quit; + } + } + + cItems = ImmGetImeMenuItemsW(hIMC, pView->dwFlags, pView->dwType, pParent, pItems, cbItems); + pView->dwItemCount = cItems; + if (cItems == 0) + goto Quit; + + if (pItems) + { + for (i = 0; i < cItems; ++i) + { + pView->Items[i].Info = pItems[i]; + + // store bitmaps to bytes + if (pItems[i].hbmpChecked) + { + Imm32StoreBitmapToBytes(pItems[i].hbmpChecked, pView->Items[i].abChecked, + MAX_IMEMENU_BITMAP_BYTES); + DeleteObject(pItems[i].hbmpChecked); + } + if (pItems[i].hbmpUnchecked) + { + Imm32StoreBitmapToBytes(pItems[i].hbmpUnchecked, pView->Items[i].abUnchecked, + MAX_IMEMENU_BITMAP_BYTES); + DeleteObject(pItems[i].hbmpUnchecked); + } + if (pItems[i].hbmpItem) + { + Imm32StoreBitmapToBytes(pItems[i].hbmpItem, pView->Items[i].abItem, + MAX_IMEMENU_BITMAP_BYTES); + DeleteObject(pItems[i].hbmpItem); + } + } + } + + ret = TRUE; + +Quit: + if (pItems) + ImmLocalFree(pItems); + if (pView) + UnmapViewOfFile(pView); + if (hMapping) + CloseHandle(hMapping); + return ret; +} + // Win: ImmGetImeMenuItemsInterProcess DWORD APIENTRY -Imm32GetImeMenuItemWCrossProcess(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentMenu, +Imm32GetImeMenuItemWInterProcess(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentMenu, LPVOID lpImeMenu, DWORD dwSize) { - FIXME("We have to do something\n"); - return 0; + HANDLE hMapping; + PIMEMENU pView; + DWORD i, cbView, dwItemCount, ret = 0; + HWND hImeWnd; + PIMEMENUITEM pGotItem; + LPIMEMENUITEMINFOW pSetInfo; + + hImeWnd = (HWND)NtUserQueryInputContext(hIMC, QIC_DEFAULTWINDOWIME); + if (!hImeWnd || !IsWindow(hImeWnd)) + { + ERR("hImeWnd %p\n", hImeWnd); + return 0; + } + + dwItemCount = (lpImeMenu ? (dwSize / sizeof(IMEMENUITEMINFOW)) : 0); + cbView = sizeof(IMEMENU) + ((size_t)dwItemCount - 1) * sizeof(IMEMENUITEM); + + RtlEnterCriticalSection(&gcsImeDpi); + + // create a file mapping + hMapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, + 0, cbView, L"ImmMenuInfo"); + pView = MapViewOfFile(hMapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0); + if (!pView) + { + ERR("hMapping %p, pView %p\n", hMapping, pView); + goto Quit; + } + + ZeroMemory(pView, cbView); + pView->dwVersion = 1; + pView->dwFlags = dwFlags; + pView->dwType = dwType; + pView->dwItemCount = dwItemCount; + pView->Parent.cbSize = (lpImeParentMenu ? sizeof(IMEMENUITEMINFOW) : 0); + + if (!SendMessageW(hImeWnd, WM_IME_SYSTEM, IMS_GETIMEMENU, (LPARAM)hIMC)) + goto Quit; + + ret = pView->dwItemCount; + + if (!lpImeMenu) + goto Quit; + + for (i = 0; i < ret; ++i) + { + pGotItem = &(pView->Items[i]); + pSetInfo = &((LPIMEMENUITEMINFOW)lpImeMenu)[i]; + + *pSetInfo = pGotItem->Info; + + // load bitmaps from bytes + if (pSetInfo->hbmpChecked) + { + pSetInfo->hbmpChecked = Imm32LoadBitmapFromBytes(pGotItem->abChecked); + } + if (pSetInfo->hbmpUnchecked) + { + pSetInfo->hbmpUnchecked = Imm32LoadBitmapFromBytes(pGotItem->abUnchecked); + } + if (pSetInfo->hbmpItem) + { + pSetInfo->hbmpItem = Imm32LoadBitmapFromBytes(pGotItem->abItem); + } + } + +Quit: + RtlLeaveCriticalSection(&gcsImeDpi); + if (pView) + UnmapViewOfFile(pView); + if (hMapping) + CloseHandle(hMapping); + return ret; } // Win: ImmGetImeMenuItemsWorker @@ -391,7 +567,7 @@ ImmGetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentM { if (bTargetIsAnsi) return 0; - return Imm32GetImeMenuItemWCrossProcess(hIMC, dwFlags, dwType, lpImeParentMenu, + return Imm32GetImeMenuItemWInterProcess(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize); } diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 07e85847740..0764e8dd0e5 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -81,7 +81,7 @@ @ stdcall ImmNotifyIME(ptr long long long) @ stub ImmPenAuxInput @ stdcall ImmProcessKey(ptr long long long long) -@ stdcall -stub ImmPutImeMenuItemsIntoMappedFile(ptr) +@ stdcall ImmPutImeMenuItemsIntoMappedFile(ptr) @ stdcall ImmReSizeIMCC(ptr long) @ stdcall ImmRegisterClient(ptr ptr) @ stdcall ImmRegisterWordA(long str long str) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index a7057be1a73..c87e6fa6e54 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -165,3 +165,6 @@ static inline PTHREADINFO FASTCALL Imm32CurrentPti(VOID) NtUserGetThreadState(THREADSTATE_GETTHREADINFO); return NtCurrentTeb()->Win32ThreadInfo; } + +HBITMAP Imm32LoadBitmapFromBytes(const BYTE *pb); +BOOL Imm32StoreBitmapToBytes(HBITMAP hbm, LPBYTE pbData, DWORD cbDataMax); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index d135932b25a..ca9385aed14 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -50,6 +50,127 @@ BOOL APIENTRY Imm32IsSystemJapaneseOrKorean(VOID) return (wPrimary == LANG_JAPANESE || wPrimary == LANG_KOREAN); } +typedef struct tagBITMAPCOREINFO256 +{ + BITMAPCOREHEADER bmciHeader; + RGBTRIPLE bmciColors[256]; +} BITMAPCOREINFO256, *PBITMAPCOREINFO256; + +HBITMAP Imm32LoadBitmapFromBytes(const BYTE *pb) +{ + HBITMAP hbm = NULL; + const BITMAPCOREINFO256 *pbmci; + LPVOID pvBits; + DWORD ib, cbBytes, cColors; + BITMAP bm; + + cbBytes = *(const DWORD *)pb; + if (cbBytes == 0) + return NULL; + + pb += sizeof(DWORD); + ib = sizeof(DWORD); + + pbmci = (const BITMAPCOREINFO256 *)pb; + hbm = CreateDIBSection(NULL, (LPBITMAPINFO)pbmci, DIB_RGB_COLORS, &pvBits, NULL, 0); + if (!hbm || !GetObject(hbm, sizeof(BITMAP), &bm)) + return NULL; + + switch (pbmci->bmciHeader.bcBitCount) + { + case 1: cColors = 2; break; + case 4: cColors = 16; break; + case 8: cColors = 256; break; + case 24: case 32: + cColors = 0; + break; + default: + DeleteObject(hbm); + return NULL; + } + + ib += sizeof(BITMAPCOREHEADER); + pb += sizeof(BITMAPCOREHEADER); + + ib += cColors * sizeof(RGBTRIPLE); + pb += cColors * sizeof(RGBTRIPLE); + + ib += bm.bmWidthBytes * bm.bmHeight; + if (ib > cbBytes) + { + DeleteObject(hbm); + return NULL; + } + CopyMemory(pvBits, pb, bm.bmWidthBytes * bm.bmHeight); + + return hbm; +} + +BOOL Imm32StoreBitmapToBytes(HBITMAP hbm, LPBYTE pbData, DWORD cbDataMax) +{ + HDC hDC; + BITMAP bm; + DWORD cbBytes, cColors; + BITMAPCOREINFO256 bmci; + BOOL ret; + LPBYTE pb = pbData; + + *(LPDWORD)pb = 0; + + if (!GetObject(hbm, sizeof(BITMAP), &bm)) + return FALSE; + + ZeroMemory(&bmci, sizeof(bmci)); + bmci.bmciHeader.bcSize = sizeof(BITMAPCOREHEADER); + bmci.bmciHeader.bcWidth = bm.bmWidth; + bmci.bmciHeader.bcHeight = bm.bmHeight; + bmci.bmciHeader.bcPlanes = 1; + bmci.bmciHeader.bcBitCount = bm.bmBitsPixel; + + switch (bm.bmBitsPixel) + { + case 1: cColors = 2; break; + case 4: cColors = 16; break; + case 8: cColors = 256; break; + case 24: case 32: + cColors = 0; + break; + default: + return FALSE; + } + + cbBytes = sizeof(DWORD); + cbBytes += sizeof(BITMAPCOREHEADER); + cbBytes += cColors * sizeof(RGBTRIPLE); + cbBytes += bm.bmWidthBytes * bm.bmHeight; + if (cbBytes > cbDataMax) + return FALSE; + + hDC = CreateCompatibleDC(NULL); + + ret = GetDIBits(hDC, hbm, 0, bm.bmHeight, NULL, (LPBITMAPINFO)&bmci, DIB_RGB_COLORS); + + if (ret) + { + *(LPDWORD)pb = cbBytes; + pb += sizeof(DWORD); + + CopyMemory(pb, &bmci.bmciHeader, sizeof(BITMAPCOREHEADER)); + pb += sizeof(BITMAPCOREHEADER); + + CopyMemory(pb, &bmci.bmciColors, cColors * sizeof(RGBTRIPLE)); + pb += cColors * sizeof(RGBTRIPLE); + + ret = GetDIBits(hDC, hbm, 0, bm.bmHeight, pb, (LPBITMAPINFO)&bmci, DIB_RGB_COLORS); + if (!ret) + *(LPDWORD)pbData = 0; + } + + DeleteDC(hDC); + + return ret; +} + // Win: IsAnsiIMC BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC) { diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h index 58bbc1dc1d6..33146de3c95 100644 --- a/sdk/include/ddk/immdev.h +++ b/sdk/include/ddk/immdev.h @@ -28,6 +28,7 @@ extern "C" { #define IMS_IMEACTIVATE 0x17 #define IMS_IMEDEACTIVATE 0x18 #define IMS_ACTIVATELAYOUT 0x19 +#define IMS_GETIMEMENU 0x1C #define IMMGWL_IMC 0 #define IMMGWL_PRIVATE (sizeof(LONG)) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 83b6b492777..4cfe094b066 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -678,7 +678,7 @@ static LRESULT ImeWnd_OnImeSystem(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) ret = IMM_FN(ImmActivateLayout)((HKL)lParam); break; - case 0x1C: + case IMS_GETIMEMENU: ret = IMM_FN(ImmPutImeMenuItemsIntoMappedFile)((HIMC)lParam); break;

1 0

[reactos] 05/05: [NTOS:KDBG] Nuke KdbEnter and KdbpCliModuleLoaded
by Timo Kreuzer 20 Jul '22

20 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe777bb52f67921b26bf5… commit fe777bb52f67921b26bf5791b06a5c712f5be3f6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jul 20 20:31:57 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jul 20 23:57:42 2022 +0200 [NTOS:KDBG] Nuke KdbEnter and KdbpCliModuleLoaded They are not used anymore. Also clean up some obsolete prototypes. --- ntoskrnl/include/internal/kd.h | 3 - ntoskrnl/kdbg/amd64/kdb_help.S | 132 ----------------------------------------- ntoskrnl/kdbg/i386/kdb_help.S | 111 ---------------------------------- ntoskrnl/kdbg/kdb.h | 15 +---- ntoskrnl/kdbg/kdb_cli.c | 17 ------ 5 files changed, 1 insertion(+), 277 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index b7cad5dc8bb..346dc70e5f1 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -33,11 +33,8 @@ KdPortPutByteEx( #ifdef KDBG # define KdbInit() KdbpCliInit() -# define KdbModuleLoaded(FILENAME) KdbpCliModuleLoaded(FILENAME) #else # define KdbInit() do { } while (0) -# define KdbEnter() do { } while (0) -# define KdbModuleLoaded(X) do { } while (0) #endif /* KD ROUTINES ***************************************************************/ diff --git a/ntoskrnl/kdbg/amd64/kdb_help.S b/ntoskrnl/kdbg/amd64/kdb_help.S index bba83e3308b..07e968921c7 100644 --- a/ntoskrnl/kdbg/amd64/kdb_help.S +++ b/ntoskrnl/kdbg/amd64/kdb_help.S @@ -5,138 +5,6 @@ .code64 -EXTERN KdbEnterDebuggerException : PROC - -PUBLIC KdbEnter -FUNC KdbEnter - - /* save flags */ - pushfq - .allocstack 8 - - /* Make room for a KTRAP_FRAME */ - sub rsp, KTRAP_FRAME_LENGTH - .allocstack KTRAP_FRAME_LENGTH - .ENDPROLOG - - /* Save rbp */ - mov [rsp + KTRAP_FRAME_Rbp], rbp - - /* Save non-volatile registers */ - mov [rsp + KTRAP_FRAME_Rbx], rbx - mov [rsp + KTRAP_FRAME_Rdi], rdi - mov [rsp + KTRAP_FRAME_Rsi], rsi - - /* Save volatile registers */ - mov [rsp + KTRAP_FRAME_Rax], rax - mov [rsp + KTRAP_FRAME_Rcx], rcx - mov [rsp + KTRAP_FRAME_Rdx], rdx - mov [rsp + KTRAP_FRAME_R8], r8 - mov [rsp + KTRAP_FRAME_R9], r9 - mov [rsp + KTRAP_FRAME_R10], r10 - mov [rsp + KTRAP_FRAME_R11], r11 - - /* Save xmm registers */ - movdqa [rsp + KTRAP_FRAME_Xmm0], xmm0 - movdqa [rsp + KTRAP_FRAME_Xmm1], xmm1 - movdqa [rsp + KTRAP_FRAME_Xmm2], xmm2 - movdqa [rsp + KTRAP_FRAME_Xmm3], xmm3 - movdqa [rsp + KTRAP_FRAME_Xmm4], xmm4 - movdqa [rsp + KTRAP_FRAME_Xmm5], xmm5 - - /* Save cs and previous mode */ - mov ax, cs - mov [rsp + KTRAP_FRAME_SegCs], ax - and ax, 1 - mov [rsp + KTRAP_FRAME_PreviousMode], al - - /* Save segment selectors */ - mov ax, ds - mov [rsp + KTRAP_FRAME_SegDs], ax - mov ax, es - mov [rsp + KTRAP_FRAME_SegEs], ax - mov ax, fs - mov [rsp + KTRAP_FRAME_SegFs], ax - mov ax, gs - mov [rsp + KTRAP_FRAME_SegGs], ax - - /* Save previous irql */ - mov rax, cr8 - mov [rsp + KTRAP_FRAME_PreviousIrql], al - - /* Save debug registers */ - mov rax, dr0 - mov [rsp + KTRAP_FRAME_Dr0], rax - mov rax, dr1 - mov [rsp + KTRAP_FRAME_Dr1], rax - mov rax, dr2 - mov [rsp + KTRAP_FRAME_Dr2], rax - mov rax, dr3 - mov [rsp + KTRAP_FRAME_Dr3], rax - mov rax, dr6 - mov [rsp + KTRAP_FRAME_Dr6], rax - mov rax, dr7 - mov [rsp + KTRAP_FRAME_Dr7], rax - - /* Point rbp, where rsp was before */ - lea rbp, [rsp + KTRAP_FRAME_LENGTH] - mov [rsp + KTRAP_FRAME_Rsp], rbp - - /* Store the EFLAGS we previously pushed on the stack */ - mov rax, [rbp + 8] - mov [rsp + KTRAP_FRAME_EFlags], rax - - /* Get RIP from the stack */ - mov rax, [rbp + 16] - mov [rsp + KTRAP_FRAME_Rip], rax - - /* Make sure the direction flag is cleared */ - cld - - /* Clear all breakpoint enables in dr7. */ - mov rax, dr7 - and rax, HEX(ffffffffFFFF0000) - mov dr7, rax - - /* Call KDB */ - mov byte ptr [rsp + KTRAP_FRAME_P5], 1 /* FirstChance */ - mov r9, rsp /* Pointer to the trap frame */ - mov r8, 0 /* Context */ - mov dl, 0 /* PreviousMode (KernelMode) */ - mov rcx, 0 /* ExceptionRecord */ - call KdbEnterDebuggerException - - /* Restore segment selectors */ - mov ax, [rsp + KTRAP_FRAME_SegDs] - mov ds, ax - mov ax, [rsp + KTRAP_FRAME_SegEs] - mov es, ax - mov ax, [rsp + KTRAP_FRAME_SegFs] - mov fs, ax - - /* Restore non-volatile registers */ - mov rbx, [rsp + KTRAP_FRAME_Rbx] - mov rdi, [rsp + KTRAP_FRAME_Rdi] - mov rsi, [rsp + KTRAP_FRAME_Rsi] - - /* Restore volatile registers */ - mov rax, [rsp + KTRAP_FRAME_Rax] - mov rcx, [rsp + KTRAP_FRAME_Rcx] - mov rdx, [rsp + KTRAP_FRAME_Rdx] - mov r8, [rsp + KTRAP_FRAME_R8] - mov r9, [rsp + KTRAP_FRAME_R9] - mov r10, [rsp + KTRAP_FRAME_R10] - mov r11, [rsp + KTRAP_FRAME_R11] - - /* Restore RSP */ - mov rsp, [rsp + KTRAP_FRAME_Rsp] - - /* Restore EFLAGS */ - popfq - - ret -ENDFUNC - PUBLIC KdbpStackSwitchAndCall KdbpStackSwitchAndCall: diff --git a/ntoskrnl/kdbg/i386/kdb_help.S b/ntoskrnl/kdbg/i386/kdb_help.S index 47564a43b45..8f25b83d73f 100644 --- a/ntoskrnl/kdbg/i386/kdb_help.S +++ b/ntoskrnl/kdbg/i386/kdb_help.S @@ -2,119 +2,8 @@ #include <asm.inc> #include <ks386.inc> -EXTERN _KdbEnterDebuggerFirstChanceException:PROC - .code -PUBLIC _KdbEnter -_KdbEnter: - /* - * Set up a trap frame - */ - pushf /* Eflags */ - push cs /* Cs */ - push 0 /* ErrorCode */ - push ebp /* Ebp */ - push ebx /* Ebx */ - mov ebp, [esp + 20] /* Eip */ - mov ebx, [esp + 16] /* Eflags */ - mov [esp + 20], ebx - mov ebx, [esp + 12] /* Cs */ - mov [esp + 16], ebx - mov [esp + 12], ebp - push esi /* Esi */ - push edi /* Edi */ - push fs /* Fs */ - push 0 /* ExceptionList */ - push 0 /* PreviousMode */ - push eax /* Eax */ - push ecx /* Ecx */ - push edx /* Edx */ - push ds /* Ds */ - push es /* Es */ - push gs /* Gs */ - mov eax, dr7 - push eax /* Dr7 */ - - /* Clear all breakpoint enables in dr7. */ - and eax, HEX(0FFFF0000) - mov dr7, eax - mov eax, dr6 - push eax /* Dr6 */ - mov eax, dr3 - push eax /* Dr3 */ - mov eax, dr2 - push eax /* Dr2 */ - mov eax, dr1 - push eax /* Dr1 */ - mov eax, dr0 - push eax /* Dr0 */ - lea eax, [esp + HEX(58)] - push eax /* TempEsp */ - push ss /* TempSegSs */ - push 0 /* DebugPointer */ - push 3 /* DebugArgMark (Exception number) */ - push [esp + HEX(60)] /* DebugEip */ - push ebp /* DebugEbp */ - - /* - * Call KDB - */ - mov eax, esp - push eax /* Push a pointer to the trap frame */ - call _KdbEnterDebuggerFirstChanceException - - /* - * Pop the arguments and unused portions of the trap frame: - * DebugEbp - * DebugEip - * DebugArgMark - * DebugPointer - * TempSegSs - * TempEsp - */ - add esp, 11*4 - - /* - * Restore/update debugging registers. - */ - pop eax /* Dr0 */ - mov dr0, eax - pop eax /* Dr1 */ - mov dr1, eax - pop eax /* Dr2 */ - mov dr2, eax - pop eax /* Dr3 */ - mov dr3, eax - pop eax /* Dr6 */ - mov dr6, eax - pop eax /* Dr7 */ - mov dr7, eax - - /* - * Restore registers including any that might have been changed - * inside the debugger. - */ - pop gs /* Gs */ - pop es /* Es */ - pop ds /* Ds */ - pop edx /* Edx */ - pop ecx /* Ecx */ - pop eax /* Eax */ - add esp, 8 /* PreviousMode, ExceptionList */ - pop fs /* Fs */ - pop edi /* Edi */ - pop esi /* Esi */ - pop ebx /* Ebx */ - pop ebp /* Ebp */ - add esp, 4 /* ErrorCode */ - - /* - * Return to the caller. - */ - iretd - - PUBLIC _KdbpStackSwitchAndCall@8 _KdbpStackSwitchAndCall@8: push ebp diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 808c13c5550..542cc398f11 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -95,10 +95,6 @@ VOID KdbpCliMainLoop( IN BOOLEAN EnteredOnSingleStep); -VOID -KdbpCliModuleLoaded( - IN PUNICODE_STRING Name); - VOID KdbpCliInterpretInitFile(VOID); @@ -266,17 +262,8 @@ KdbpTryGetCharKeyboard(PULONG ScanCode, ULONG Retry); CHAR KdbpTryGetCharSerial(ULONG Retry); -VOID -KdbEnter(VOID); -VOID -DbgRDebugInit(VOID); -VOID -DbgShowFiles(VOID); -VOID -DbgEnableFile(PCH Filename); -VOID -DbgDisableFile(PCH Filename); VOID KbdDisableMouse(VOID); + VOID KbdEnableMouse(VOID); diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 7da99daef32..d22b38658e8 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3876,23 +3876,6 @@ KdbpCliMainLoop( while (Continue); } -/*!\brief Called when a module is loaded. - * - * \param Name Filename of the module which was loaded. - */ -VOID -KdbpCliModuleLoaded( - IN PUNICODE_STRING Name) -{ - if (!KdbBreakOnModuleLoad) - return; - - KdbpPrint("Module "); - KdbpPrintUnicodeString(Name); - KdbpPrint(" loaded.\n"); - DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); -} - /*!\brief This function is called by KdbEnterDebuggerException... * * Used to interpret the init file in a context with a trapframe setup

1 0

[reactos] 04/05: [SETUP] Don't default to MP builds, when KDBG is enabled
by Timo Kreuzer 20 Jul '22

20 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6778fa157f095fa373a7f… commit 6778fa157f095fa373a7f4b97203251bedd9837f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 17 19:31:38 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jul 20 23:57:42 2022 +0200 [SETUP] Don't default to MP builds, when KDBG is enabled The reason is that KDBG and the MP kernel don't like each other much and crash hard, causing VBox to shut down. --- base/setup/lib/settings.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/base/setup/lib/settings.c b/base/setup/lib/settings.c index d392511dd2e..aece0e5e8d9 100644 --- a/base/setup/lib/settings.c +++ b/base/setup/lib/settings.c @@ -274,8 +274,12 @@ GetComputerIdentifier( } #ifdef _M_AMD64 - /* On x64 we are l33t and use the MP config by default */ + /* On x64 we are l33t and use the MP config by default (except when we use KDBG, which is broken) */ +#ifndef KDBG ComputerIdentifier = L"X64 MP"; +#else + ComputerIdentifier = L"X64 UP"; +#endif #else if (IsAcpiComputer()) {

1 0

[reactos] 03/05: [NTOS:KDBG] Add KdbpPrintUnicodeString
by Timo Kreuzer 20 Jul '22

20 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31a5fa61bbf47c897059d… commit 31a5fa61bbf47c897059d9af350f4646c1d01488 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 17 19:17:18 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jul 20 23:57:42 2022 +0200 [NTOS:KDBG] Add KdbpPrintUnicodeString Calling normal unicode functions is not allowed at IRQL > APC_LEVEL, so calling _vsnprintf with unicode parameters from KDBG is invalid. --- ntoskrnl/kdbg/kdb.h | 4 ++++ ntoskrnl/kdbg/kdb_cli.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 68f4ce03b05..808c13c5550 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -107,6 +107,10 @@ KdbpPrint( IN PCHAR Format, IN ... OPTIONAL); +VOID +KdbpPrintUnicodeString( + _In_ PCUNICODE_STRING String); + BOOLEAN NTAPI KdbpGetHexNumber( diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 4958dd9be71..7da99daef32 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -564,10 +564,14 @@ KdbpPrintStructInternal KdbpPrint("%s%p+%x: %s", Indent, ((PCHAR)BaseAddress) + Member->BaseOffset, Member->Size, Member->Name ? Member->Name : "<anoymous>"); if (DoRead) { if (!strcmp(Member->Type, "_UNICODE_STRING")) { - KdbpPrint("\"%wZ\"\n", ((PCHAR)BaseAddress) + Member->BaseOffset); + KdbpPrint("\""); + KdbpPrintUnicodeString(((PCHAR)BaseAddress) + Member->BaseOffset); + KdbpPrint("\"\n"); continue; } else if (!strcmp(Member->Type, "PUNICODE_STRING")) { - KdbpPrint("\"%wZ\"\n", *(((PUNICODE_STRING*)((PCHAR)BaseAddress) + Member->BaseOffset))); + KdbpPrint("\""); + KdbpPrintUnicodeString(*(((PUNICODE_STRING*)((PCHAR)BaseAddress) + Member->BaseOffset))); + KdbpPrint("\"\n"); continue; } switch (Member->Size) { @@ -2109,7 +2113,9 @@ KdbpCmdMod( KdbpPrint(" Base Size Name\n"); for (;;) { - KdbpPrint(" %08x %08x %wZ\n", LdrEntry->DllBase, LdrEntry->SizeOfImage, &LdrEntry->BaseDllName); + KdbpPrint(" %p %08x ", LdrEntry->DllBase, LdrEntry->SizeOfImage); + KdbpPrintUnicodeString(&LdrEntry->BaseDllName); + KdbpPrint("\n"); if(DisplayOnlyOneModule || !KdbpSymFindModule(NULL, i++, &LdrEntry)) break; @@ -3035,6 +3041,24 @@ KdbpPrint( } } +VOID +KdbpPrintUnicodeString( + _In_ PCUNICODE_STRING String) +{ + ULONG i; + + if ((String == NULL) || (String->Buffer == NULL)) + { + KdbpPrint("<NULL>"); + return; + } + + for (i = 0; i < String->Length / sizeof(WCHAR); i++) + { + KdbpPrint("%c", (CHAR)String->Buffer[i]); + } +} + /** memrchr(), explicitly defined, since was absent in MinGW of RosBE. */ /* * Reverse memchr() @@ -3863,7 +3887,9 @@ KdbpCliModuleLoaded( if (!KdbBreakOnModuleLoad) return; - KdbpPrint("Module %wZ loaded.\n", Name); + KdbpPrint("Module "); + KdbpPrintUnicodeString(Name); + KdbpPrint(" loaded.\n"); DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); }

1 0

[reactos] 02/05: [KDBG] Fix x64 KDBG
by Timo Kreuzer 20 Jul '22

20 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=253362509ec64a2def87f… commit 253362509ec64a2def87fdc818f3d553f23a20c6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 26 18:59:05 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jul 20 23:57:42 2022 +0200 [KDBG] Fix x64 KDBG --- ntoskrnl/ex/handle.c | 8 +- ntoskrnl/kdbg/amd64/amd64-dis.c | 0 ntoskrnl/kdbg/amd64/kdb_help.S | 152 ++++++++++++++++++++++++++++++-- ntoskrnl/kdbg/i386/i386-dis.c | 34 ++++--- ntoskrnl/kdbg/kdb.c | 19 ++-- ntoskrnl/kdbg/kdb.h | 4 +- ntoskrnl/kdbg/kdb_cli.c | 191 +++++++++++++++++++++++++++++----------- ntoskrnl/kdbg/kdb_expr.c | 9 +- ntoskrnl/kdbg/kdb_symbols.c | 2 +- ntoskrnl/mm/ARM3/kdbg.c | 4 +- 10 files changed, 340 insertions(+), 83 deletions(-) diff --git a/ntoskrnl/ex/handle.c b/ntoskrnl/ex/handle.c index 94b345caeb3..e932ca2efbd 100644 --- a/ntoskrnl/ex/handle.c +++ b/ntoskrnl/ex/handle.c @@ -22,6 +22,12 @@ EX_PUSH_LOCK HandleTableListLock; /* PRIVATE FUNCTIONS *********************************************************/ +#ifdef _WIN64 +#define strtoulptr strtoull +#else +#define strtoulptr strtoul +#endif + CODE_SEG("INIT") VOID NTAPI @@ -1360,7 +1366,7 @@ BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]) } else { - ProcessId = (HANDLE)strtoul(Argv[1], &endptr, 10); + ProcessId = (HANDLE)strtoulptr(Argv[1], &endptr, 10); if (*endptr != '\0') { KdbpPrint("Invalid parameter: %s\n", Argv[1]); diff --git a/ntoskrnl/kdbg/amd64/amd64-dis.c b/ntoskrnl/kdbg/amd64/amd64-dis.c deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ntoskrnl/kdbg/amd64/kdb_help.S b/ntoskrnl/kdbg/amd64/kdb_help.S index 39ae8721f8e..bba83e3308b 100644 --- a/ntoskrnl/kdbg/amd64/kdb_help.S +++ b/ntoskrnl/kdbg/amd64/kdb_help.S @@ -1,22 +1,162 @@ #include <asm.inc> +#include <ksamd64.inc> + .code64 +EXTERN KdbEnterDebuggerException : PROC + +PUBLIC KdbEnter +FUNC KdbEnter + + /* save flags */ + pushfq + .allocstack 8 + + /* Make room for a KTRAP_FRAME */ + sub rsp, KTRAP_FRAME_LENGTH + .allocstack KTRAP_FRAME_LENGTH + .ENDPROLOG + + /* Save rbp */ + mov [rsp + KTRAP_FRAME_Rbp], rbp + + /* Save non-volatile registers */ + mov [rsp + KTRAP_FRAME_Rbx], rbx + mov [rsp + KTRAP_FRAME_Rdi], rdi + mov [rsp + KTRAP_FRAME_Rsi], rsi + + /* Save volatile registers */ + mov [rsp + KTRAP_FRAME_Rax], rax + mov [rsp + KTRAP_FRAME_Rcx], rcx + mov [rsp + KTRAP_FRAME_Rdx], rdx + mov [rsp + KTRAP_FRAME_R8], r8 + mov [rsp + KTRAP_FRAME_R9], r9 + mov [rsp + KTRAP_FRAME_R10], r10 + mov [rsp + KTRAP_FRAME_R11], r11 + + /* Save xmm registers */ + movdqa [rsp + KTRAP_FRAME_Xmm0], xmm0 + movdqa [rsp + KTRAP_FRAME_Xmm1], xmm1 + movdqa [rsp + KTRAP_FRAME_Xmm2], xmm2 + movdqa [rsp + KTRAP_FRAME_Xmm3], xmm3 + movdqa [rsp + KTRAP_FRAME_Xmm4], xmm4 + movdqa [rsp + KTRAP_FRAME_Xmm5], xmm5 + + /* Save cs and previous mode */ + mov ax, cs + mov [rsp + KTRAP_FRAME_SegCs], ax + and ax, 1 + mov [rsp + KTRAP_FRAME_PreviousMode], al + + /* Save segment selectors */ + mov ax, ds + mov [rsp + KTRAP_FRAME_SegDs], ax + mov ax, es + mov [rsp + KTRAP_FRAME_SegEs], ax + mov ax, fs + mov [rsp + KTRAP_FRAME_SegFs], ax + mov ax, gs + mov [rsp + KTRAP_FRAME_SegGs], ax + + /* Save previous irql */ + mov rax, cr8 + mov [rsp + KTRAP_FRAME_PreviousIrql], al + + /* Save debug registers */ + mov rax, dr0 + mov [rsp + KTRAP_FRAME_Dr0], rax + mov rax, dr1 + mov [rsp + KTRAP_FRAME_Dr1], rax + mov rax, dr2 + mov [rsp + KTRAP_FRAME_Dr2], rax + mov rax, dr3 + mov [rsp + KTRAP_FRAME_Dr3], rax + mov rax, dr6 + mov [rsp + KTRAP_FRAME_Dr6], rax + mov rax, dr7 + mov [rsp + KTRAP_FRAME_Dr7], rax + + /* Point rbp, where rsp was before */ + lea rbp, [rsp + KTRAP_FRAME_LENGTH] + mov [rsp + KTRAP_FRAME_Rsp], rbp + + /* Store the EFLAGS we previously pushed on the stack */ + mov rax, [rbp + 8] + mov [rsp + KTRAP_FRAME_EFlags], rax + + /* Get RIP from the stack */ + mov rax, [rbp + 16] + mov [rsp + KTRAP_FRAME_Rip], rax + + /* Make sure the direction flag is cleared */ + cld + + /* Clear all breakpoint enables in dr7. */ + mov rax, dr7 + and rax, HEX(ffffffffFFFF0000) + mov dr7, rax + + /* Call KDB */ + mov byte ptr [rsp + KTRAP_FRAME_P5], 1 /* FirstChance */ + mov r9, rsp /* Pointer to the trap frame */ + mov r8, 0 /* Context */ + mov dl, 0 /* PreviousMode (KernelMode) */ + mov rcx, 0 /* ExceptionRecord */ + call KdbEnterDebuggerException + + /* Restore segment selectors */ + mov ax, [rsp + KTRAP_FRAME_SegDs] + mov ds, ax + mov ax, [rsp + KTRAP_FRAME_SegEs] + mov es, ax + mov ax, [rsp + KTRAP_FRAME_SegFs] + mov fs, ax + + /* Restore non-volatile registers */ + mov rbx, [rsp + KTRAP_FRAME_Rbx] + mov rdi, [rsp + KTRAP_FRAME_Rdi] + mov rsi, [rsp + KTRAP_FRAME_Rsi] + + /* Restore volatile registers */ + mov rax, [rsp + KTRAP_FRAME_Rax] + mov rcx, [rsp + KTRAP_FRAME_Rcx] + mov rdx, [rsp + KTRAP_FRAME_Rdx] + mov r8, [rsp + KTRAP_FRAME_R8] + mov r9, [rsp + KTRAP_FRAME_R9] + mov r10, [rsp + KTRAP_FRAME_R10] + mov r11, [rsp + KTRAP_FRAME_R11] + + /* Restore RSP */ + mov rsp, [rsp + KTRAP_FRAME_Rsp] + + /* Restore EFLAGS */ + popfq + + ret +ENDFUNC + PUBLIC KdbpStackSwitchAndCall KdbpStackSwitchAndCall: - push rbp - mov rbp, rsp /* Old stack - frame */ - /* Switch stack */ + /* Save old stack */ + mov rax, rsp + + /* Set new stack */ mov rsp, rcx + /* Save old stack on new stack */ + push rax + /* Call function */ call rdx - /* Switch back to old stack */ - pop rsp + /* Restore old stack */ + pop rax + mov rsp, rax - ret 8 + /* Return */ + ret END diff --git a/ntoskrnl/kdbg/i386/i386-dis.c b/ntoskrnl/kdbg/i386/i386-dis.c index 4b8a0d1ec3b..c60470aa436 100644 --- a/ntoskrnl/kdbg/i386/i386-dis.c +++ b/ntoskrnl/kdbg/i386/i386-dis.c @@ -22,11 +22,11 @@ typedef enum bfd_architecture { bfd_arch_i386, } bfd_arch; -typedef unsigned int bfd_vma; +typedef uintptr_t bfd_vma; typedef unsigned char bfd_byte; enum bfd_endian { BFD_ENDIAN_BIG, BIG_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN }; typedef void* bfd; -typedef signed int bfd_signed_vma; +typedef intptr_t bfd_signed_vma; #define bfd_mach_x86_64_intel_syntax 0 #define bfd_mach_x86_64 1 #define bfd_mach_i386_i386_intel_syntax 2 @@ -36,7 +36,7 @@ typedef signed int bfd_signed_vma; #define _(X) X #define ATTRIBUTE_UNUSED extern int sprintf(char *str, const char *format, ...); -#define sprintf_vma(BUF, VMA) sprintf(BUF, "0x%X", VMA) +#define sprintf_vma(BUF, VMA) sprintf(BUF, "0x%IX", VMA) struct disassemble_info; int @@ -63,20 +63,20 @@ KdbpNopPrintDisasm(void* Ignored, const char* fmt, ...) } static int -KdbpReadMemory(unsigned int Addr, unsigned char* Data, unsigned int Length, +KdbpReadMemory(uintptr_t Addr, unsigned char* Data, unsigned int Length, struct disassemble_info * Ignored) { return KdbpSafeReadMemory(Data, (void *)Addr, Length); /* 0 means no error */ } static void -KdbpMemoryError(int Status, unsigned int Addr, +KdbpMemoryError(int Status, uintptr_t Addr, struct disassemble_info * Ignored) { } static void -KdbpPrintAddressInCode(unsigned int Addr, struct disassemble_info * Ignored) +KdbpPrintAddressInCode(uintptr_t Addr, struct disassemble_info * Ignored) { if (!KdbSymPrintAddress((void*)Addr, NULL)) { @@ -85,14 +85,14 @@ KdbpPrintAddressInCode(unsigned int Addr, struct disassemble_info * Ignored) } static void -KdbpNopPrintAddress(unsigned int Addr, struct disassemble_info * Ignored) +KdbpNopPrintAddress(uintptr_t Addr, struct disassemble_info * Ignored) { } #include "dis-asm.h" LONG -KdbpGetInstLength(IN ULONG Address) +KdbpGetInstLength(IN ULONG_PTR Address) { disassemble_info info; @@ -101,7 +101,11 @@ KdbpGetInstLength(IN ULONG Address) info.application_data = NULL; info.flavour = bfd_target_unknown_flavour; info.arch = bfd_arch_i386; +#ifdef _M_AMD64 + info.mach = bfd_mach_x86_64; +#else info.mach = bfd_mach_i386_i386; +#endif info.insn_sets = 0; info.flags = 0; info.read_memory_func = KdbpReadMemory; @@ -118,7 +122,7 @@ KdbpGetInstLength(IN ULONG Address) } LONG -KdbpDisassemble(IN ULONG Address, IN ULONG IntelSyntax) +KdbpDisassemble(IN ULONG_PTR Address, IN ULONG IntelSyntax) { disassemble_info info; @@ -263,7 +267,11 @@ struct dis_private { #define FWAIT_OPCODE (0x9b) /* Set to 1 for 64bit mode disassembly. */ +#ifdef _M_AMD64 +static int mode_64bit = 1; +#else static int mode_64bit; +#endif /* Flags for the prefixes for the current instruction. See below. */ static int prefixes; @@ -2079,7 +2087,7 @@ static int print_insn (bfd_vma pc, disassemble_info *info) { const struct dis386 *dp; - int i; + intptr_t i; char *first, *second, *third; int needcomma; unsigned char uses_SSE_prefix; @@ -2151,8 +2159,12 @@ print_insn (bfd_vma pc, disassemble_info *info) if (p != NULL) p++; } +#else +#ifdef _M_AMD64 + mode_64bit = 1; #else mode_64bit = 0; +#endif priv.orig_sizeflag = AFLAG | DFLAG; /*intel_syntax = 0;*/ #endif @@ -3188,7 +3200,7 @@ print_operand_value (char *buf, int hex, bfd_vma disp) if (v < 0) { *(buf++) = '-'; - v = -disp; + v = -v; /* Check for possible overflow on 0x8000000000000000. */ if (v < 0) { diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c index df1da7da3d2..abe8f96b2cd 100644 --- a/ntoskrnl/kdbg/kdb.c +++ b/ntoskrnl/kdbg/kdb.c @@ -18,6 +18,13 @@ /* DEFINES *******************************************************************/ #define KDB_STACK_SIZE (4096*3) +#ifdef _M_AMD64 +#define KDB_STACK_ALIGN 16 +#define KDB_STACK_RESERVE (5 * sizeof(PVOID)) /* Home space + return address */ +#else +#define KDB_STACK_ALIGN 4 +#define KDB_STACK_RESERVE sizeof(ULONG) /* Return address */ +#endif #define KDB_MAXIMUM_BREAKPOINT_COUNT 256 #define KDB_MAXIMUM_HW_BREAKPOINT_COUNT 4 #define KDB_MAXIMUM_SW_BREAKPOINT_COUNT 256 @@ -28,7 +35,7 @@ /* GLOBALS *******************************************************************/ static LONG KdbEntryCount = 0; -static CHAR KdbStack[KDB_STACK_SIZE]; +static DECLSPEC_ALIGN(KDB_STACK_ALIGN) CHAR KdbStack[KDB_STACK_SIZE]; static ULONG KdbBreakPointCount = 0; /* Number of used breakpoints in the array */ static KDB_BREAKPOINT KdbBreakPoints[KDB_MAXIMUM_BREAKPOINT_COUNT] = {{0}}; /* Breakpoint array */ @@ -333,7 +340,7 @@ KdbpStepIntoInstruction( } /* Get the interrupt descriptor */ - if (!NT_SUCCESS(KdbpSafeReadMemory(IntDesc, (PVOID)(ULONG_PTR)(Idtr.Base + (IntVect * 8)), sizeof (IntDesc)))) + if (!NT_SUCCESS(KdbpSafeReadMemory(IntDesc, (PVOID)((ULONG_PTR)Idtr.Base + (IntVect * 8)), sizeof(IntDesc)))) { /*KdbpPrint("Couldn't access memory at 0x%p\n", (ULONG_PTR)Idtr.Base + (IntVect * 8));*/ return FALSE; @@ -479,7 +486,7 @@ KdbpInsertBreakPoint( IN BOOLEAN Global, OUT PLONG BreakPointNr OPTIONAL) { - LONG i; + LONG_PTR i; PVOID Condition; PCHAR ConditionExpressionDup; LONG ErrOffset; @@ -673,7 +680,7 @@ KdbpIsBreakPointOurs( KdbHwBreakPoints[i]->Enabled); DebugReg = KdbHwBreakPoints[i]->Data.Hw.DebugReg; - if ((Context->Dr6 & (1 << DebugReg)) != 0) + if ((Context->Dr6 & ((ULONG_PTR)1 << DebugReg)) != 0) { return KdbHwBreakPoints[i] - KdbBreakPoints; } @@ -1174,7 +1181,7 @@ KdbpInternalEnter(VOID) // KdbpPrint("Switching to KDB stack 0x%08x-0x%08x (Current Stack is 0x%08x)\n", Thread->Tcb.StackLimit, Thread->Tcb.StackBase, Esp); - KdbpStackSwitchAndCall(KdbStack + KDB_STACK_SIZE - sizeof(ULONG), KdbpCallMainLoop); + KdbpStackSwitchAndCall(KdbStack + KDB_STACK_SIZE - KDB_STACK_RESERVE, KdbpCallMainLoop); Thread->Tcb.InitialStack = SavedInitialStack; Thread->Tcb.StackBase = SavedStackBase; @@ -1489,7 +1496,7 @@ KdbEnterDebuggerException( } KdbpPrint("\nEntered debugger on embedded INT3 at 0x%04x:0x%p.\n", - Context->SegCs & 0xffff, KeGetContextPc(Context) - 1); + Context->SegCs & 0xffff, KeGetContextPc(Context)); } else { diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index aa8cb8e8f18..68f4ce03b05 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -64,12 +64,12 @@ typedef enum _KDB_OUTPUT_SETTINGS LONG KdbpDisassemble( - IN ULONG Address, + IN ULONG_PTR Address, IN ULONG IntelSyntax); LONG KdbpGetInstLength( - IN ULONG Address); + IN ULONG_PTR Address); /* from i386/kdb_help.S */ diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 6c903f93695..4958dd9be71 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -21,7 +21,7 @@ * FILE: ntoskrnl/kdbg/kdb_cli.c * PURPOSE: Kernel debugger command line interface * PROGRAMMER: Gregor Anich (blight(a)blight.eu.org) - * Herv� Poussineau + * Hervé Poussineau * UPDATE HISTORY: * Created 16/01/2005 */ @@ -101,6 +101,8 @@ BOOLEAN ExpKdbgExtDefWrites(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtIrpFind(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]); +extern char __ImageBase; + #ifdef __ROS_DWARF__ static BOOLEAN KdbpCmdPrintStruct(ULONG Argc, PCHAR Argv[]); #endif @@ -364,7 +366,9 @@ static const struct /* Data */ { NULL, NULL, "Data", NULL }, { "?", "? expression", "Evaluate expression.", KdbpCmdEvalExpression }, +#ifdef _M_IX86 // FIXME: this is broken on x64 { "disasm", "disasm [address] [L count]", "Disassemble count instructions at address.", KdbpCmdDisassembleX }, +#endif // _M_IX86 { "x", "x [address] [L count]", "Display count dwords, starting at address.", KdbpCmdDisassembleX }, { "regs", "regs", "Display general purpose registers.", KdbpCmdRegs }, { "sregs", "sregs", "Display status registers.", KdbpCmdRegs }, @@ -373,7 +377,6 @@ static const struct #ifdef __ROS_DWARF__ { "dt", "dt [mod] [type] [addr]", "Print a struct. The address is optional.", KdbpCmdPrintStruct }, #endif - /* Flow control */ { NULL, NULL, "Flow control", NULL }, { "cont", "cont", "Continue execution (leave debugger).", KdbpCmdContinue }, @@ -485,7 +488,8 @@ KdbpCmdEvalExpression( ULONG Argc, PCHAR Argv[]) { - ULONG i, len; + ULONG i; + SIZE_T len; ULONGLONG Result = 0; ULONG ul; LONG l = 0; @@ -882,7 +886,7 @@ KdbpCmdDisassembleX( while (Count > 0) { if (!KdbSymPrintAddress((PVOID)Address, NULL)) - KdbpPrint("<%08x>:", Address); + KdbpPrint("<%p>:", (PVOID)Address); else KdbpPrint(":"); @@ -1085,6 +1089,10 @@ KdbpIsNestedTss( if (!Tss) return FALSE; +#ifdef _M_AMD64 + // HACK + return FALSE; +#else /* Retrieve the TSS Backlink */ if (!NT_SUCCESS(KdbpSafeReadMemory(&Backlink, (PVOID)&Tss->Backlink, @@ -1092,6 +1100,7 @@ KdbpIsNestedTss( { return FALSE; } +#endif return (Backlink != 0 && Backlink != TssSelector); } @@ -1107,6 +1116,10 @@ KdbpContextFromPrevTss( USHORT Backlink; PKTSS Tss = *pTss; +#ifdef _M_AMD64 + // HACK + return FALSE; +#else /* Retrieve the TSS Backlink */ if (!NT_SUCCESS(KdbpSafeReadMemory(&Backlink, (PVOID)&Tss->Backlink, @@ -1139,10 +1152,103 @@ KdbpContextFromPrevTss( *pTss = Tss; Context->Eip = Eip; Context->Ebp = Ebp; +#endif return TRUE; } #endif +#ifdef _M_AMD64 + +static +BOOLEAN +GetNextFrame( + _Inout_ PCONTEXT Context) +{ + PRUNTIME_FUNCTION FunctionEntry; + ULONG64 ImageBase, EstablisherFrame; + PVOID HandlerData; + + _SEH2_TRY + { + /* Lookup the FunctionEntry for the current RIP */ + FunctionEntry = RtlLookupFunctionEntry(Context->Rip, &ImageBase, NULL); + if (FunctionEntry == NULL) + { + /* No function entry, so this must be a leaf function. Pop the return address from the stack. + Note: this can happen after the first frame as the result of an exception */ + Context->Rip = *(DWORD64*)Context->Rsp; + Context->Rsp += sizeof(DWORD64); + return TRUE; + } + else + { + RtlVirtualUnwind(UNW_FLAG_NHANDLER, + ImageBase, + Context->Rip, + FunctionEntry, + Context, + &HandlerData, + &EstablisherFrame, + NULL); + } + } + _SEH2_EXCEPT(1) + { + return FALSE; + } + _SEH2_END + + return TRUE; +} + +static BOOLEAN +KdbpCmdBackTrace( + ULONG Argc, + PCHAR Argv[]) +{ + CONTEXT Context = *KdbCurrentTrapFrame; + ULONG64 CurrentRsp, CurrentRip; + + KdbpPrint("Rip:\n"); + if (!KdbSymPrintAddress((PVOID)KeGetContextPc(&Context), &Context)) + KdbpPrint("<%p>\n", KeGetContextPc(&Context)); + else + KdbpPrint("\n"); + + /* Walk through the frames */ + KdbpPrint("Frames:\n"); + for (;;) + { + CurrentRip = Context.Rip; + CurrentRsp = Context.Rsp; + + BOOLEAN GotNextFrame = GetNextFrame(&Context); + + KdbpPrint("[%p] ", (PVOID)CurrentRsp); + Context.Rsp = Context.Rsp; + + /* Print the location afrer the call instruction */ + if (!KdbSymPrintAddress((PVOID)CurrentRip, &Context)) + KdbpPrint("<%p>", (PVOID)Context.Rip); + + KdbpPrint(" (stack: 0x%Ix)\n", Context.Rsp - CurrentRsp); + + if (KdbOutputAborted) + break; + + if (Context.Rsp == 0) + break; + + if (!GotNextFrame) + { + KdbpPrint("Couldn't access memory at 0x%p!\n", (PVOID)Context.Rsp); + break; + } + } + + return TRUE; +} +#else /*!\brief Displays a backtrace. */ static BOOLEAN @@ -1316,6 +1422,8 @@ CheckForParentTSS: return TRUE; } +#endif // M_AMD64 + /*!\brief Continues execution of the system/leaves KDB. */ static BOOLEAN @@ -1410,7 +1518,7 @@ KdbpCmdBreakPointList( else { GlobalOrLocal = Buffer; - sprintf(Buffer, " PID 0x%lx", + sprintf(Buffer, " PID 0x%Ix", (ULONG_PTR)(Process ? Process->UniqueProcessId : INVALID_HANDLE_VALUE)); } @@ -1989,9 +2097,9 @@ KdbpCmdMod( { if (!KdbpSymFindModule(NULL, 0, &LdrEntry)) { - ULONG_PTR ntoskrnlBase = ((ULONG_PTR)KdbpCmdMod) & 0xfff00000; + ULONG_PTR ntoskrnlBase = (ULONG_PTR)__ImageBase; KdbpPrint(" Base Size Name\n"); - KdbpPrint(" %08x %08x %s\n", ntoskrnlBase, 0, "ntoskrnl.exe"); + KdbpPrint(" %p %08x %s\n", (PVOID)ntoskrnlBase, 0, "ntoskrnl.exe"); return TRUE; } @@ -2239,6 +2347,7 @@ KdbpCmdPcr( PKIPCR Pcr = (PKIPCR)KeGetPcr(); KdbpPrint("Current PCR is at 0x%p.\n", Pcr); +#ifdef _M_IX86 KdbpPrint(" Tib.ExceptionList: 0x%08x\n" " Tib.StackBase: 0x%08x\n" " Tib.StackLimit: 0x%08x\n" @@ -2246,75 +2355,59 @@ KdbpCmdPcr( " Tib.FiberData/Version: 0x%08x\n" " Tib.ArbitraryUserPointer: 0x%08x\n" " Tib.Self: 0x%08x\n" -#ifdef _M_IX86 " SelfPcr: 0x%08x\n" -#else - " Self: 0x%p\n" -#endif " PCRCB: 0x%08x\n" " Irql: 0x%02x\n" -#ifdef _M_IX86 " IRR: 0x%08x\n" " IrrActive: 0x%08x\n" " IDR: 0x%08x\n" -#endif " KdVersionBlock: 0x%08x\n" -#ifdef _M_IX86 " IDT: 0x%08x\n" " GDT: 0x%08x\n" " TSS: 0x%08x\n" -#endif " MajorVersion: 0x%04x\n" " MinorVersion: 0x%04x\n" -#ifdef _M_IX86 " SetMember: 0x%08x\n" -#endif " StallScaleFactor: 0x%08x\n" -#ifdef _M_IX86 " Number: 0x%02x\n" -#endif " L2CacheAssociativity: 0x%02x\n" -#ifdef _M_IX86 " VdmAlert: 0x%08x\n" -#endif " L2CacheSize: 0x%08x\n" -#ifdef _M_IX86 " InterruptMode: 0x%08x\n" -#endif , Pcr->NtTib.ExceptionList, Pcr->NtTib.StackBase, Pcr->NtTib.StackLimit, Pcr->NtTib.SubSystemTib, Pcr->NtTib.FiberData, Pcr->NtTib.ArbitraryUserPointer, Pcr->NtTib.Self -#ifdef _M_IX86 , Pcr->SelfPcr -#else - , Pcr->Self -#endif , Pcr->Prcb, Pcr->Irql -#ifdef _M_IX86 , Pcr->IRR, Pcr->IrrActive , Pcr->IDR -#endif , Pcr->KdVersionBlock -#ifdef _M_IX86 , Pcr->IDT, Pcr->GDT, Pcr->TSS -#endif , Pcr->MajorVersion, Pcr->MinorVersion -#ifdef _M_IX86 , Pcr->SetMember -#endif , Pcr->StallScaleFactor -#ifdef _M_IX86 , Pcr->Number -#endif , Pcr->SecondLevelCacheAssociativity -#ifdef _M_IX86 , Pcr->VdmAlert -#endif , Pcr->SecondLevelCacheSize -#ifdef _M_IX86 - , Pcr->InterruptMode + , Pcr->InterruptMode); +#else + KdbpPrint(" GdtBase: 0x%p\n", Pcr->GdtBase); + KdbpPrint(" TssBase: 0x%p\n", Pcr->TssBase); + KdbpPrint(" UserRsp: 0x%p\n", (PVOID)Pcr->UserRsp); + KdbpPrint(" Self: 0x%p\n", Pcr->Self); + KdbpPrint(" CurrentPrcb: 0x%p\n", Pcr->CurrentPrcb); + KdbpPrint(" LockArray: 0x%p\n", Pcr->LockArray); + KdbpPrint(" Used_Self: 0x%p\n", Pcr->Used_Self); + KdbpPrint(" IdtBase: 0x%p\n", Pcr->IdtBase); + KdbpPrint(" Irql: %u\n", Pcr->Irql); + KdbpPrint(" SecondLevelCacheAssociativity: 0x%u\n", Pcr->SecondLevelCacheAssociativity); + KdbpPrint(" ObsoleteNumber: %u\n", Pcr->ObsoleteNumber); + KdbpPrint(" MajorVersion: 0x%x\n", Pcr->MajorVersion); + KdbpPrint(" MinorVersion: 0x%x\n", Pcr->MinorVersion); + KdbpPrint(" StallScaleFactor: 0x%lx\n", Pcr->StallScaleFactor); + KdbpPrint(" SecondLevelCacheSize: 0x%lx\n", Pcr->SecondLevelCacheSize); + KdbpPrint(" KdVersionBlock: 0x%p\n", Pcr->KdVersionBlock); #endif - ); - return TRUE; } @@ -2417,7 +2510,7 @@ KdbpCmdTss( return TRUE; } -#endif +#endif // _M_IX86 /*!\brief Bugchecks the system. */ @@ -2724,7 +2817,7 @@ KdbpPrint( CHAR c = '\0'; PCHAR p, p2; ULONG Length; - ULONG i, j; + SIZE_T i, j; LONG RowsPrintedByTerminal; ULONG ScanCode; va_list ap; @@ -3039,7 +3132,7 @@ KdbpPager( CHAR c = '\0'; PCHAR p, p2; ULONG Length; - ULONG i, j; + SIZE_T i, j; LONG RowsPrintedByTerminal; ULONG ScanCode; @@ -3298,8 +3391,8 @@ static VOID KdbpCommandHistoryAppend( IN PCHAR Command) { - ULONG Length1 = strlen(Command) + 1; - ULONG Length2 = 0; + SIZE_T Length1 = strlen(Command) + 1; + SIZE_T Length2 = 0; INT i; PCHAR Buffer; @@ -3380,7 +3473,7 @@ KdbpReadCommand( static CHAR LastCommand[1024]; static CHAR NextKey = '\0'; INT CmdHistIndex = -1; - INT i; + INT_PTR i; EchoOn = !((KdbDebugState & KD_DEBUG_KDNOECHO) != 0); @@ -3644,7 +3737,7 @@ static BOOLEAN KdbpDoCommand( IN PCHAR Command) { - ULONG i; + SIZE_T i; PCHAR p; ULONG Argc; // FIXME: for what do we need a 1024 characters command line and 256 tokens? @@ -3784,7 +3877,7 @@ VOID KdbpCliInterpretInitFile(VOID) { PCHAR p1, p2; - INT i; + INT_PTR i; CHAR c; /* Execute the commands in the init file */ diff --git a/ntoskrnl/kdbg/kdb_expr.c b/ntoskrnl/kdbg/kdb_expr.c index 348d71286c3..73bff96cde1 100644 --- a/ntoskrnl/kdbg/kdb_expr.c +++ b/ntoskrnl/kdbg/kdb_expr.c @@ -437,8 +437,8 @@ RpnpParseExpression( RPN_OP ComparativeOp; BOOLEAN ComparativeOpFilled = FALSE; BOOLEAN IsComparativeOp; - INT i, i2; - ULONG ul; + INT_PTR i, i2; + ULONG64 ull; UCHAR MemorySize; CHAR Buffer[16]; BOOLEAN First; @@ -596,13 +596,12 @@ get_operand: else { /* Immediate value */ - /* FIXME: Need string to ULONGLONG function */ - ul = strtoul(p, &pend, 0); + ull = strtoull(p, &pend, 0); if (p != pend) { RpnOp.Type = RpnOpImmediate; RpnOp.CharacterOffset = CharacterOffset; - RpnOp.Data.Immediate = (ULONGLONG)ul; + RpnOp.Data.Immediate = ull; CharacterOffset += pend - p; p = pend; } diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 997b55e5516..2f2703b717c 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -175,7 +175,7 @@ KdbSymPrintAddress( /* Use KdpPrintString because KdpDprintf is limited wrt string size */ KdpDprintf("<%s:%x (", ModuleNameAnsi, RelativeAddress); str.Buffer = FileName; - str.Length = strnlen(FileName, sizeof(FileName)); + str.Length = (USHORT)strnlen(FileName, sizeof(FileName)); str.MaximumLength = sizeof(FileName); KdpPrintString(&str); KdpDprintf(":%d (%s))>", LineNumber, FunctionName); diff --git a/ntoskrnl/mm/ARM3/kdbg.c b/ntoskrnl/mm/ARM3/kdbg.c index 5b2554a425f..92fe6af47dd 100644 --- a/ntoskrnl/mm/ARM3/kdbg.c +++ b/ntoskrnl/mm/ARM3/kdbg.c @@ -144,7 +144,7 @@ VOID ExpKdbgExtPoolUsedGetTag(PCHAR Arg, PULONG Tag, PULONG Mask) { CHAR Tmp[4]; - ULONG Len; + SIZE_T Len; USHORT i; /* Get the tag */ @@ -175,7 +175,7 @@ ExpKdbgExtPoolUsed( { ULONG Tag = 0; ULONG Mask = 0; - ULONG Flags = 0; + ULONG_PTR Flags = 0; if (Argc > 1) {

1 0

[reactos] 01/05: [NDK] Add missing x64 unwind definitions
by Timo Kreuzer 20 Jul '22

20 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04fe6665906bf8e63a267… commit 04fe6665906bf8e63a2677bc585ec564d50eb286 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jul 19 08:05:31 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jul 20 23:57:42 2022 +0200 [NDK] Add missing x64 unwind definitions --- ntoskrnl/rtl/libsupp.c | 2 -- sdk/include/ndk/ketypes.h | 4 +-- sdk/include/ndk/rtlfuncs.h | 27 +++++++++++++++ sdk/include/ndk/rtltypes.h | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/rtl/libsupp.c b/ntoskrnl/rtl/libsupp.c index 173944a0573..66ae4254a73 100644 --- a/ntoskrnl/rtl/libsupp.c +++ b/ntoskrnl/rtl/libsupp.c @@ -825,8 +825,6 @@ RtlCallVectoredContinueHandlers(_In_ PEXCEPTION_RECORD ExceptionRecord, #ifdef _M_AMD64 -typedef PVOID PRUNTIME_FUNCTION, PUNWIND_HISTORY_TABLE; - PRUNTIME_FUNCTION NTAPI RtlpLookupDynamicFunctionEntry( diff --git a/sdk/include/ndk/ketypes.h b/sdk/include/ndk/ketypes.h index 6556de0d737..d54b9ffa131 100644 --- a/sdk/include/ndk/ketypes.h +++ b/sdk/include/ndk/ketypes.h @@ -820,7 +820,6 @@ typedef struct _PP_LOOKASIDE_LIST // // Kernel Memory Node // -#include <pshpack1.h> typedef struct _KNODE { SLIST_HEADER DeadStackList; @@ -834,10 +833,9 @@ typedef struct _KNODE UCHAR Fill : 7; } Flags; ULONG MmShiftedColor; - ULONG FreeCount[2]; + ULONG_PTR FreeCount[2]; struct _SINGLE_LIST_ENTRY *PfnDeferredList; } KNODE, *PKNODE; -#include <poppack.h> // // Structure for Get/SetContext APC diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index ffc3bb1bcae..c6bdcfcdd19 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -807,6 +807,33 @@ RtlUnwind( #define RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT 8 +#ifdef _M_AMD64 + +NTSYSAPI +PRUNTIME_FUNCTION +NTAPI +RtlLookupFunctionEntry( + _In_ DWORD64 ControlPc, + _Out_ PDWORD64 ImageBase, + _Inout_opt_ PUNWIND_HISTORY_TABLE HistoryTable +); + +NTSYSAPI +PEXCEPTION_ROUTINE +NTAPI +RtlVirtualUnwind( + _In_ ULONG HandlerType, + _In_ ULONG64 ImageBase, + _In_ ULONG64 ControlPc, + _In_ PRUNTIME_FUNCTION FunctionEntry, + _Inout_ PCONTEXT Context, + _Outptr_ PVOID* HandlerData, + _Out_ PULONG64 EstablisherFrame, + _Inout_opt_ PKNONVOLATILE_CONTEXT_POINTERS ContextPointers +); + +#endif // _M_AMD64 + // // Tracing Functions // diff --git a/sdk/include/ndk/rtltypes.h b/sdk/include/ndk/rtltypes.h index 03ac5156214..369d52cd297 100644 --- a/sdk/include/ndk/rtltypes.h +++ b/sdk/include/ndk/rtltypes.h @@ -1912,6 +1912,90 @@ typedef struct _MESSAGE_RESOURCE_DATA MESSAGE_RESOURCE_BLOCK Blocks[ANYSIZE_ARRAY]; } MESSAGE_RESOURCE_DATA, *PMESSAGE_RESOURCE_DATA; +#ifdef _M_AMD64 + +typedef struct _KNONVOLATILE_CONTEXT_POINTERS { + union { + PM128A FloatingContext[16]; + struct { + PM128A Xmm0; + PM128A Xmm1; + PM128A Xmm2; + PM128A Xmm3; + PM128A Xmm4; + PM128A Xmm5; + PM128A Xmm6; + PM128A Xmm7; + PM128A Xmm8; + PM128A Xmm9; + PM128A Xmm10; + PM128A Xmm11; + PM128A Xmm12; + PM128A Xmm13; + PM128A Xmm14; + PM128A Xmm15; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + + union { + PULONG64 IntegerContext[16]; + struct { + PULONG64 Rax; + PULONG64 Rcx; + PULONG64 Rdx; + PULONG64 Rbx; + PULONG64 Rsp; + PULONG64 Rbp; + PULONG64 Rsi; + PULONG64 Rdi; + PULONG64 R8; + PULONG64 R9; + PULONG64 R10; + PULONG64 R11; + PULONG64 R12; + PULONG64 R13; + PULONG64 R14; + PULONG64 R15; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME2; +} KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; + +#define UNW_FLAG_NHANDLER 0x0 +#define UNW_FLAG_EHANDLER 0x1 +#define UNW_FLAG_UHANDLER 0x2 +#define UNW_FLAG_CHAININFO 0x4 +#define UNW_FLAG_NO_EPILOGUE 0x80000000UL + +#define RUNTIME_FUNCTION_INDIRECT 0x1 + +typedef struct _RUNTIME_FUNCTION { + ULONG BeginAddress; + ULONG EndAddress; + ULONG UnwindData; +} RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; + +#define UNWIND_HISTORY_TABLE_SIZE 12 + +typedef struct _UNWIND_HISTORY_TABLE_ENTRY +{ + ULONG64 ImageBase; + PRUNTIME_FUNCTION FunctionEntry; +} UNWIND_HISTORY_TABLE_ENTRY, *PUNWIND_HISTORY_TABLE_ENTRY; + +typedef struct _UNWIND_HISTORY_TABLE +{ + ULONG Count; + UCHAR LocalHint; + UCHAR GlobalHint; + UCHAR Search; + UCHAR Once; + ULONG64 LowAddress; + ULONG64 HighAddress; + UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; +} UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; + +#endif /* _M_AMD64 */ + #endif /* !NTOS_MODE_USER */ #ifdef NTOS_MODE_USER

1 0

[reactos] 01/01: [CMLIB] Don't redefine PAGED_CODE() to nothing in cmlib.h except for cmlib_host
by Timo Kreuzer 20 Jul '22

20 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2881b773020525536b0b5… commit 2881b773020525536b0b5e2fec3a63a291313367 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 17 11:34:27 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jul 20 20:36:22 2022 +0200 [CMLIB] Don't redefine PAGED_CODE() to nothing in cmlib.h except for cmlib_host This header is included by ntoskrnl which effectively disabled all PAGED_CODE checks since 2015. Thanks Alex. Instead define _BLDR_ when building cmlib, which will avoid trying to import KeGetCurrentIrql() --- sdk/lib/cmlib/CMakeLists.txt | 1 + sdk/lib/cmlib/cmlib.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk/lib/cmlib/CMakeLists.txt b/sdk/lib/cmlib/CMakeLists.txt index d69202ba12d..bcd2b6b5142 100644 --- a/sdk/lib/cmlib/CMakeLists.txt +++ b/sdk/lib/cmlib/CMakeLists.txt @@ -1,5 +1,6 @@ add_definitions( + -D_BLDR_ -D_NTSYSTEM_ -DNASSERT) diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h index d1b8c0656fe..fd6de8c75db 100644 --- a/sdk/lib/cmlib/cmlib.h +++ b/sdk/lib/cmlib/cmlib.h @@ -172,8 +172,6 @@ #include <ntdef.h> #include <ntifs.h> #include <bugcodes.h> - #undef PAGED_CODE - #define PAGED_CODE() /* Prevent inclusion of Windows headers through <wine/unicode.h> */ #define _WINDEF_

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2022