Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [WIN32KNT_APITEST] Follow-up of Follow-up of #4594 (54b3b73)
by Katayama Hirofumi MZ 02 Aug '22

02 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfa92268da37976978ed3… commit bfa92268da37976978ed361b9c4b8399b393d1b8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 2 13:25:35 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Aug 2 13:25:35 2022 +0900 [WIN32KNT_APITEST] Follow-up of Follow-up of #4594 (54b3b73) CORE-11700 --- modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c index 4ffe7ac8112..00e378dcddf 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c @@ -41,7 +41,7 @@ START_TEST(NtUserGetKeyboardLayoutName) RtlZeroMemory(szBuff, sizeof(szBuff)); ustr.Buffer = szBuff; ustr.Length = 0; - ustr.MaximumLength = RTL_NUMBER_OF(szBuff); + ustr.MaximumLength = RTL_NUMBER_OF(szBuff) * sizeof(WCHAR); ret = bHung = FALSE; _SEH2_TRY { @@ -56,4 +56,5 @@ START_TEST(NtUserGetKeyboardLayoutName) ok_int(bHung, FALSE); ok_int(ret, TRUE); ok(szBuff[0] != 0, "szBuff[0] was %d\n", szBuff[0]); + trace("szBuff: %S\n", szBuff); }

1 0

[reactos] 01/01: [WIN32KNT_APITEST] Follow-up of #4594 (54b3b73)
by Katayama Hirofumi MZ 02 Aug '22

02 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8043706bf0f859b35d7b9… commit 8043706bf0f859b35d7b97091e4aeb9271e59b2e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 2 12:07:09 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Aug 2 12:07:09 2022 +0900 [WIN32KNT_APITEST] Follow-up of #4594 (54b3b73) CORE-11700 --- .../win32nt/ntuser/NtUserGetKeyboardLayoutName.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c index ea49ff9de59..4ffe7ac8112 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c @@ -15,17 +15,17 @@ START_TEST(NtUserGetKeyboardLayoutName) FN_NtUserGetKeyboardLayoutName fn = (FN_NtUserGetKeyboardLayoutName)NtUserGetKeyboardLayoutName; UNICODE_STRING ustr; WCHAR szBuff[MAX_PATH]; - BOOL bHung; + BOOL bHung, ret; /* Try NULL */ - ok_int(fn(NULL), 0); + ok_int(fn(NULL), FALSE); /* Try szBuff */ - bHung = FALSE; - szBuff[0] = 0; + ret = bHung = FALSE; + RtlZeroMemory(szBuff, sizeof(szBuff)); _SEH2_TRY { - fn(szBuff); + ret = fn(szBuff); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -34,17 +34,18 @@ START_TEST(NtUserGetKeyboardLayoutName) _SEH2_END; ok_int(bHung, FALSE); + //ok_int(ret, FALSE); // XP:TRUE, 2k3:FALSE ok(szBuff[0] == 0, "szBuff[0] was %d\n", szBuff[0]); /* Try ustr */ - szBuff[0] = 0; + RtlZeroMemory(szBuff, sizeof(szBuff)); ustr.Buffer = szBuff; ustr.Length = 0; ustr.MaximumLength = RTL_NUMBER_OF(szBuff); - bHung = FALSE; + ret = bHung = FALSE; _SEH2_TRY { - fn(&ustr); + ret = fn(&ustr); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -53,5 +54,6 @@ START_TEST(NtUserGetKeyboardLayoutName) _SEH2_END; ok_int(bHung, FALSE); + ok_int(ret, TRUE); ok(szBuff[0] != 0, "szBuff[0] was %d\n", szBuff[0]); }

1 0

[reactos] 01/01: [WIN32KNT_APITEST] Add NtUserGetKeyboardLayoutName testcase (#4594)
by Katayama Hirofumi MZ 02 Aug '22

02 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54b3b73c08e5a8b111f17… commit 54b3b73c08e5a8b111f17ae00e451f31abad7da9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 2 10:47:49 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 2 10:47:49 2022 +0900 [WIN32KNT_APITEST] Add NtUserGetKeyboardLayoutName testcase (#4594) The type of the 1st argument of NtUserGetKeyboardLayoutName is doubtful. CORE-11700 --- modules/rostests/apitests/win32nt/CMakeLists.txt | 1 + .../win32nt/ntuser/NtUserGetKeyboardLayoutName.c | 57 ++++++++++++++++++++++ modules/rostests/apitests/win32nt/testlist.c | 6 ++- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index 2ff69348a04..7060f79f219 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -54,6 +54,7 @@ list(APPEND SOURCE ntuser/NtUserFindExistingCursorIcon.c ntuser/NtUserGetClassInfo.c # ntuser/NtUserGetIconInfo.c + ntuser/NtUserGetKeyboardLayoutName.c ntuser/NtUserGetThreadState.c ntuser/NtUserGetTitleBarInfo.c ntuser/NtUserProcessConnect.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c new file mode 100644 index 00000000000..ea49ff9de59 --- /dev/null +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c @@ -0,0 +1,57 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Test for NtUserGetKeyboardLayoutName + * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <win32nt.h> +#include <pseh/pseh2.h> + +typedef BOOL (APIENTRY *FN_NtUserGetKeyboardLayoutName)(PVOID); + +START_TEST(NtUserGetKeyboardLayoutName) +{ + FN_NtUserGetKeyboardLayoutName fn = (FN_NtUserGetKeyboardLayoutName)NtUserGetKeyboardLayoutName; + UNICODE_STRING ustr; + WCHAR szBuff[MAX_PATH]; + BOOL bHung; + + /* Try NULL */ + ok_int(fn(NULL), 0); + + /* Try szBuff */ + bHung = FALSE; + szBuff[0] = 0; + _SEH2_TRY + { + fn(szBuff); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bHung = TRUE; + } + _SEH2_END; + + ok_int(bHung, FALSE); + ok(szBuff[0] == 0, "szBuff[0] was %d\n", szBuff[0]); + + /* Try ustr */ + szBuff[0] = 0; + ustr.Buffer = szBuff; + ustr.Length = 0; + ustr.MaximumLength = RTL_NUMBER_OF(szBuff); + bHung = FALSE; + _SEH2_TRY + { + fn(&ustr); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bHung = TRUE; + } + _SEH2_END; + + ok_int(bHung, FALSE); + ok(szBuff[0] != 0, "szBuff[0] was %d\n", szBuff[0]); +} diff --git a/modules/rostests/apitests/win32nt/testlist.c b/modules/rostests/apitests/win32nt/testlist.c index d58f6b5a5d0..8d2be31fc2c 100644 --- a/modules/rostests/apitests/win32nt/testlist.c +++ b/modules/rostests/apitests/win32nt/testlist.c @@ -53,8 +53,9 @@ extern void func_NtUserCreateWindowEx(void); extern void func_NtUserEnumDisplaySettings(void); extern void func_NtUserFindExistingCursorIcon(void); extern void func_NtUserGetClassInfo(void); -extern void func_NtUserGetThreadState(void); //extern void func_NtUserGetIconInfo(void); +extern void func_NtUserGetKeyboardLayoutName(void); +extern void func_NtUserGetThreadState(void); extern void func_NtUserGetTitleBarInfo(void); extern void func_NtUserProcessConnect(void); extern void func_NtUserRedrawWindow(void); @@ -120,8 +121,9 @@ const struct test winetest_testlist[] = { "NtUserEnumDisplaySettings", func_NtUserEnumDisplaySettings }, { "NtUserFindExistingCursorIcon", func_NtUserFindExistingCursorIcon }, { "NtUserGetClassInfo", func_NtUserGetClassInfo }, - { "NtUserGetThreadState", func_NtUserGetThreadState }, //{ "NtUserGetIconInfo", func_NtUserGetIconInfo }, + { "NtUserGetKeyboardLayoutName", func_NtUserGetKeyboardLayoutName }, + { "NtUserGetThreadState", func_NtUserGetThreadState }, { "NtUserGetTitleBarInfo", func_NtUserGetTitleBarInfo }, { "NtUserProcessConnect", func_NtUserProcessConnect }, { "NtUserRedrawWindow", func_NtUserRedrawWindow },

1 0

[reactos] 01/01: [NTUSER] Release WinSta->spklList at IntWinStaObjectDelete (#4593)
by Katayama Hirofumi MZ 02 Aug '22

02 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9ecf4b055b9187dedc24… commit b9ecf4b055b9187dedc24271e1df075ddd027e16 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 2 10:46:37 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 2 10:46:37 2022 +0900 [NTUSER] Release WinSta->spklList at IntWinStaObjectDelete (#4593) Call UserAssignmentUnlock((PVOID*)&WinSta->spklList); in IntWinStaObjectDelete function. CORE-11700 --- win32ss/user/ntuser/winsta.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 88266ad5bb0..4c91558b497 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -128,6 +128,8 @@ IntWinStaObjectDelete( RtlDestroyAtomTable(WinSta->AtomTable); + UserAssignmentUnlock((PVOID*)&WinSta->spklList); + return STATUS_SUCCESS; }

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs