Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [CPL][APPWIZ] Make gecko download cancellable by keyboard (#3726)
by Katayama Hirofumi MZ 05 Jun '21

05 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2106bc4a8172ba26655d4… commit 2106bc4a8172ba26655d45a564ee0d2d2baa5d44 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jun 5 18:21:25 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 5 18:21:25 2021 +0900 [CPL][APPWIZ] Make gecko download cancellable by keyboard (#3726) We shouldn't disable nor hide the control with focus. CORE-17550, CORE-5737 --- dll/cpl/appwiz/addons.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dll/cpl/appwiz/addons.c b/dll/cpl/appwiz/addons.c index 32e29f9a46f..b9c089f744f 100644 --- a/dll/cpl/appwiz/addons.c +++ b/dll/cpl/appwiz/addons.c @@ -388,9 +388,17 @@ static DWORD WINAPI download_proc(PVOID arg) static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { + HWND hwndProgress, hwndInstallButton; switch(msg) { case WM_INITDIALOG: - ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_HIDE); + + hwndProgress = GetDlgItem(hwnd, ID_DWL_PROGRESS); + if (hwndProgress == GetFocus()) /* Avoid CORE-5737 */ + { + SendMessageW(hwnd, WM_NEXTDLGCTL, 0, FALSE); + } + ShowWindow(hwndProgress, SW_HIDE); + install_dialog = hwnd; return TRUE; @@ -410,7 +418,15 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA case ID_DWL_INSTALL: ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_SHOW); - EnableWindow(GetDlgItem(hwnd, ID_DWL_INSTALL), 0); + + /* CORE-17550: Never leave focus on a disabled control (Old/New/Thing p.228) */ + hwndInstallButton = GetDlgItem(hwnd, ID_DWL_INSTALL); + if (hwndInstallButton == GetFocus()) + { + SendMessageW(hwnd, WM_NEXTDLGCTL, 0, FALSE); + } + EnableWindow(hwndInstallButton, FALSE); + CloseHandle( CreateThread(NULL, 0, download_proc, NULL, 0, NULL)); return FALSE; }

1 0

[reactos] 01/01: [WINETESTS] Workaround crashes in riched20:richole on VBox/KVM bots CORE-16799
by Joachim Henze 04 Jun '21

04 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae574e16f878618ff898d… commit ae574e16f878618ff898dcf01e6ca20c4cdf169a Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Jun 4 20:04:20 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Jun 4 20:04:20 2021 +0200 [WINETESTS] Workaround crashes in riched20:richole on VBox/KVM bots CORE-16799 The crashes began when those tests were synced to Wine Staging 4.18 in 0.4.14-dev-419-g 76cf09cfea15911082245a65547fb67512b710ce WHS 2k3sp2 Before the revert implies the tests were actually ok: https://reactos.org/testman/compare.php?ids=77492 Disabling some of the tests is very unsatisfying of course, but at least allows us to observe again the results of the other tests from that suite. VBox https://reactos.org/testman/compare.php?ids=77504,77506 KVM https://reactos.org/testman/compare.php?ids=77502,77505 --- modules/rostests/winetests/riched20/richole.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/rostests/winetests/riched20/richole.c b/modules/rostests/winetests/riched20/richole.c index 492bdc3fa9a..6de6c02901a 100644 --- a/modules/rostests/winetests/riched20/richole.c +++ b/modules/rostests/winetests/riched20/richole.c @@ -113,6 +113,7 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } +#if 0 /*avoid CORE-16799*/ #define CHECK_TYPEINFO(disp,expected_riid) _check_typeinfo((IDispatch *)disp, expected_riid, __LINE__) static void _check_typeinfo(IDispatch* disp, REFIID expected_riid, int line) { @@ -137,12 +138,15 @@ static void _check_typeinfo(IDispatch* disp, REFIID expected_riid, int line) ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); ITypeInfo_Release(typeinfo); } +#endif static void test_Interfaces(void) { IRichEditOle *reOle = NULL, *reOle1 = NULL; ITextDocument *txtDoc = NULL; +#if 0 /*avoid CORE-16799*/ ITextDocument2Old *txtDoc2Old = NULL; +#endif ITextSelection *txtSel = NULL, *txtSel2; IUnknown *punk; HRESULT hres; @@ -170,7 +174,9 @@ static void test_Interfaces(void) (void **) &txtDoc); ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); ok(txtDoc != NULL, "IRichEditOle_QueryInterface\n"); +#if 0 /*avoid CORE-16799*/ CHECK_TYPEINFO(txtDoc, &IID_ITextDocument); +#endif hres = ITextDocument_GetSelection(txtDoc, NULL); ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%x\n", hres); @@ -222,6 +228,7 @@ static void test_Interfaces(void) hres = IRichEditOle_QueryInterface(reOle, &IID_IOleInPlaceSite, (void **) &punk); ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n"); +#if 0 /*avoid CORE-16799*/ hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument2Old, (void **)&txtDoc2Old); ok(hres == S_OK, "IRichEditOle_QueryInterface\n"); ok(txtDoc2Old != NULL, "IRichEditOle_QueryInterface\n"); @@ -231,6 +238,7 @@ static void test_Interfaces(void) CHECK_TYPEINFO(txtDoc2Old, &IID_ITextDocument); ITextDocument2Old_Release(txtDoc2Old); +#endif ITextDocument_Release(txtDoc); IRichEditOle_Release(reOle); @@ -245,6 +253,7 @@ static void test_Interfaces(void) ITextSelection_Release(txtSel); +#if 0 /*avoid CORE-16799*/ w = new_richedit(NULL); res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle); ok(res, "SendMessage\n"); @@ -257,6 +266,7 @@ static void test_Interfaces(void) ITextDocument2Old_Release(txtDoc2Old); IRichEditOle_Release(reOle); DestroyWindow(w); +#endif } static void test_ITextDocument_Open(void)

1 0

[reactos] 01/01: [NTOS:KE/x64] Handle shared interrupts
by Timo Kreuzer 04 Jun '21

04 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f2e0ece5a4e408f50929… commit 7f2e0ece5a4e408f509299a7efe1aec72a471432 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Mar 9 23:55:54 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Jun 4 09:19:13 2021 +0200 [NTOS:KE/x64] Handle shared interrupts --- ntoskrnl/ke/amd64/interrupt.c | 37 ++++++++++++++++++++++++++++++------- ntoskrnl/ke/amd64/trap.S | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 60 insertions(+), 14 deletions(-) diff --git a/ntoskrnl/ke/amd64/interrupt.c b/ntoskrnl/ke/amd64/interrupt.c index 1ca46b33673..a1e66da4dde 100644 --- a/ntoskrnl/ke/amd64/interrupt.c +++ b/ntoskrnl/ke/amd64/interrupt.c @@ -81,10 +81,14 @@ NTAPI KeConnectInterrupt(IN PKINTERRUPT Interrupt) { PVOID CurrentHandler; + PKINTERRUPT ConnectedInterrupt; + ASSERT(Interrupt->Vector >= PRIMARY_VECTOR_BASE); ASSERT(Interrupt->Vector <= MAXIMUM_IDTVECTOR); ASSERT(Interrupt->Number < KeNumberProcessors); ASSERT(Interrupt->Irql <= HIGH_LEVEL); + ASSERT(Interrupt->SynchronizeIrql >= Interrupt->Irql); + ASSERT(Interrupt->Irql == (Interrupt->Vector >> 4)); /* Check if its already connected */ if (Interrupt->Connected) return TRUE; @@ -92,7 +96,7 @@ KeConnectInterrupt(IN PKINTERRUPT Interrupt) /* Query the current handler */ CurrentHandler = KeQueryInterruptHandler(Interrupt->Vector); - /* Check if the vector is already unused */ + /* Check if the vector is unused */ if ((CurrentHandler >= (PVOID)KiUnexpectedRange) && (CurrentHandler <= (PVOID)KiUnexpectedRangeEnd)) { @@ -106,6 +110,7 @@ KeConnectInterrupt(IN PKINTERRUPT Interrupt) KeRegisterInterruptHandler(Interrupt->Vector, Interrupt->DispatchCode); + /* Enable the interrupt */ if (!HalEnableSystemInterrupt(Interrupt->Vector, Interrupt->Irql, Interrupt->Mode)) @@ -115,16 +120,28 @@ KeConnectInterrupt(IN PKINTERRUPT Interrupt) KeRegisterInterruptHandler(Interrupt->Vector, CurrentHandler); return FALSE; } - - /* Mark as connected */ - Interrupt->Connected = TRUE; } else { - // later - __debugbreak(); + /* Get the connected interrupt */ + ConnectedInterrupt = CONTAINING_RECORD(CurrentHandler, KINTERRUPT, DispatchCode); + + /* Check if sharing is ok */ + if ((Interrupt->ShareVector == 0) || + (ConnectedInterrupt->ShareVector == 0) || + (Interrupt->Mode != ConnectedInterrupt->Mode)) + { + return FALSE; + } + + /* Insert the new interrupt into the connected interrupt's list */ + InsertTailList(&ConnectedInterrupt->InterruptListEntry, + &Interrupt->InterruptListEntry); } + /* Mark as connected */ + Interrupt->Connected = TRUE; + return TRUE; } @@ -132,9 +149,15 @@ BOOLEAN NTAPI KeDisconnectInterrupt(IN PKINTERRUPT Interrupt) { + /* If the interrupt wasn't connected, there's nothing to do */ + if (!Interrupt->Connected) + { + return FALSE; + } + UNIMPLEMENTED; __debugbreak(); - return FALSE; + return TRUE; } BOOLEAN diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 7fb5c05919b..b7a267a7256 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -696,26 +696,35 @@ FUNC KiInterruptDispatch /* Increase interrupt count */ inc dword ptr gs:[PcInterruptCount]; - /* Load the address of the interrupt object into rcx */ - mov rcx, [rbp + KTRAP_FRAME_ErrorCode] + /* Save rbx and rsi in the trap frame */ + mov [rbp + KTRAP_FRAME_Rbx], rbx + mov [rbp + KTRAP_FRAME_Rsi], rsi + + /* Load the address of the dispatch code into rbx */ + mov rbx, [rbp + KTRAP_FRAME_ErrorCode] /* Substract offset of the DispatchCode member plus 6 for the call instruction */ - sub rcx, KINTERRUPT_DispatchCode + 6 + sub rbx, KINTERRUPT_DispatchCode + 6 + + /* Save the address of the InterruptListEntry in rsi */ + lea rsi, [rbx + KINTERRUPT_InterruptListEntry] +.DoDispatchInterrupt: /* Raise IRQL to SynchronizeIrql */ - movzx rax, byte ptr [rcx + KINTERRUPT_SynchronizeIrql] + movzx rax, byte ptr [rbx + KINTERRUPT_SynchronizeIrql] mov cr8, rax #ifdef CONFIG_SMP /* Acquire interrupt lock */ - mov r8, [rcx + KINTERRUPT_ActualLock] + mov r8, [rbx + KINTERRUPT_ActualLock] //KxAcquireSpinLock(Interrupt->ActualLock); #endif /* Call the ISR */ - mov rdx, [rcx + KINTERRUPT_ServiceContext] - call qword ptr [rcx + KINTERRUPT_ServiceRoutine] + mov rcx, rbx + mov rdx, [rbx + KINTERRUPT_ServiceContext] + call qword ptr [rbx + KINTERRUPT_ServiceRoutine] #ifdef CONFIG_SMP /* Release interrupt lock */ @@ -726,6 +735,20 @@ FUNC KiInterruptDispatch movzx rax, byte ptr [rbp + KTRAP_FRAME_PreviousIrql] mov cr8, rax + /* Check for chained interrupts */ + mov rax, [rbx + KINTERRUPT_InterruptListEntry] + cmp rax, rsi + je .Done + + /* Load the next interrupt object into rbx and repeat */ + lea rbx, [rax - KINTERRUPT_InterruptListEntry] + jmp .DoDispatchInterrupt + +.Done: + /* Restore rbx and rsi */ + mov rbx, [rbp + KTRAP_FRAME_Rbx] + mov rsi, [rbp + KTRAP_FRAME_Rsi] + /* Return */ ExitTrap (TF_SAVE_ALL or TF_SEND_EOI) ENDFUNC

1 0

[reactos] 02/02: [EXPLORER] Check m_Position for -1 before using it as an index
by Timo Kreuzer 04 Jun '21

04 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce537f1ae945813041cad… commit ce537f1ae945813041cad50f0853a5a16d11bc20 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu May 30 19:21:45 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Jun 4 09:15:55 2021 +0200 [EXPLORER] Check m_Position for -1 before using it as an index This fixes a crash on x64. --- base/shell/explorer/traywnd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 5473e190bfa..e14e805b8f7 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -1373,7 +1373,7 @@ GetPrimaryScreenRect: m_TrayRects[m_Position] = rcTray; } - else + else if (m_Position != (DWORD)-1) { /* If the user isn't resizing the tray window we need to make sure the new size or position is valid. this is to prevent changes to the window

1 0

[reactos] 01/02: [BROWSEUI] Fix broken code
by Timo Kreuzer 04 Jun '21

04 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11ffa31155ee3ddedc5b3… commit 11ffa31155ee3ddedc5b3d4a00dd39b97e517484 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jan 3 17:13:17 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Jun 4 09:15:55 2021 +0200 [BROWSEUI] Fix broken code --- dll/win32/browseui/desktopipc.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/browseui/desktopipc.cpp b/dll/win32/browseui/desktopipc.cpp index 4ea4837f8d3..152ae050eb8 100644 --- a/dll/win32/browseui/desktopipc.cpp +++ b/dll/win32/browseui/desktopipc.cpp @@ -454,7 +454,7 @@ extern "C" IEThreadParamBlock *WINAPI SHCreateIETHREADPARAM( TRACE("SHCreateIETHREADPARAM\n"); - result = (IEThreadParamBlock *) LocalAlloc(LMEM_ZEROINIT, 256); + result = (IEThreadParamBlock *) LocalAlloc(LMEM_ZEROINIT, sizeof(*result)); if (result == NULL) return NULL; result->offset0 = param8; @@ -477,10 +477,10 @@ extern "C" IEThreadParamBlock *WINAPI SHCloneIETHREADPARAM(IEThreadParamBlock *p TRACE("SHCloneIETHREADPARAM\n"); - result = (IEThreadParamBlock *) LocalAlloc(LMEM_FIXED, 256); + result = (IEThreadParamBlock *) LocalAlloc(LMEM_FIXED, sizeof(*result)); if (result == NULL) return NULL; - memcpy(result, param, 0x40 * 4); + *result = *param; if (result->directoryPIDL != NULL) result->directoryPIDL = ILClone(result->directoryPIDL); if (result->offset7C != NULL)

1 0

[reactos] 01/01: [SHELL32_APITEST] ShellExecCmdLine: Don't copy Notepad.exe
by Katayama Hirofumi MZ 03 Jun '21

03 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55345930ad7efbea049fe… commit 55345930ad7efbea049fe243b877ea840f598aea Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jun 4 06:16:07 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jun 4 06:16:07 2021 +0900 [SHELL32_APITEST] ShellExecCmdLine: Don't copy Notepad.exe On Windows 10, when I copyed Notepad.exe to the desktop and double-clicked it, it won't start Notepad. This is probably because there is a security protection mechanism (or some mechanism) at work. Tests that assume this mechanism will not work properly on ReactOS. Thus, I had to delete some tests. CORE-17351 --- .../rostests/apitests/shell32/ShellExecCmdLine.cpp | 68 +++------------------- 1 file changed, 7 insertions(+), 61 deletions(-) diff --git a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp index b9c349e3d7e..084d85f351e 100644 --- a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp +++ b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp @@ -253,7 +253,6 @@ typedef struct TEST_ENTRY static const char s_testfile1[] = "Test File.txt"; static const char s_testfile2[] = "Test File.bat"; -static char s_notepad[] = "notepad.exe"; static const TEST_ENTRY s_entries[] = { @@ -402,15 +401,17 @@ static const TEST_ENTRY s_entries[] = // Control Panel { __LINE__, S_OK, TRUE, NULL, L"::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL }, { __LINE__, S_OK, TRUE, NULL, L"shell:::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL }, + // shell:sendto + { __LINE__, S_OK, TRUE, NULL, L"shell:sendto", NULL }, }; -static BOOL CloseNotepads(BOOL bRetry, INT nCount = 10) +static BOOL CloseAppWindows(LPCWSTR pwszWindowClass, BOOL bRetry, INT nCount = 10) { #define INTERVAL 100 BOOL bFound = FALSE; for (INT i = 0; i < nCount; ++i) { - HWND hwnd = FindWindowW(L"Notepad", NULL); + HWND hwnd = FindWindowW(pwszWindowClass, NULL); if (!hwnd) { if (!bRetry) @@ -466,7 +467,7 @@ static void DoEntry(const TEST_ENTRY *pEntry) if (SUCCEEDED(hr) && pEntry->pwszWindowClass) { - BOOL bFound = CloseNotepads(TRUE); + BOOL bFound = CloseAppWindows(pEntry->pwszWindowClass, TRUE); ok(bFound, "Line %d: The window not found\n", pEntry->lineno); } } @@ -492,7 +493,7 @@ START_TEST(ShellExecCmdLine) } } - CloseNotepads(FALSE); + CloseAppWindows(L"Notepad", FALSE); // s_testfile1 FILE *fp = fopen(s_testfile1, "wb"); @@ -576,63 +577,8 @@ START_TEST(ShellExecCmdLine) DoEntry(&additionals2[i]); } - char path[MAX_PATH]; - ok((INT_PTR)FindExecutableA("notepad.exe", NULL, s_notepad) >= 32, "FindExecutableA failed\n"); - ok(GetModuleFileNameA(NULL, path, _countof(path)), "GetModuleFileNameA failed\n"); - char *pch = strrchr(path, '\\'); - - if (pch == NULL) - { - skip("pch == NULL\n"); - } - else - { - // create "My Directory" - strcpy(pch, "\\My Directory"); - if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) - ok(CreateDirectoryA(path, NULL), "CreateDirectoryA failed\n"); - - // create "My Directory\\Notepad.exe" as clone of Notepad.exe - strcpy(pch, "\\My Directory\\Notepad.exe"); - ok(CopyFileA(s_notepad, path, FALSE), "CopyFileA failed\n"); - - wsprintfW(buf0, L"%hs", path); - wsprintfW(buf1, L"\"%hs\"", path); - wsprintfW(buf2, L"\"%hs\" \"Test File.txt\"", path); - TEST_ENTRY additionals3[] = - { - { __LINE__, S_OK, FALSE, NULL, buf0, NULL }, - { __LINE__, S_OK, FALSE, NULL, buf0, L"." }, - { __LINE__, S_OK, FALSE, NULL, buf0, L"system32" }, - { __LINE__, S_OK, FALSE, NULL, buf1, NULL }, - { __LINE__, S_OK, FALSE, NULL, buf1, L"." }, - { __LINE__, S_OK, FALSE, NULL, buf1, L"system32" }, - { __LINE__, S_OK, FALSE, NULL, buf2, NULL }, - { __LINE__, S_OK, FALSE, NULL, buf2, L"." }, - { __LINE__, S_OK, FALSE, NULL, buf2, L"system32" }, - { __LINE__, S_OK, TRUE, NULL, buf0, NULL }, - { __LINE__, S_OK, TRUE, NULL, buf0, L"." }, - { __LINE__, S_OK, TRUE, NULL, buf0, L"system32" }, - { __LINE__, S_OK, TRUE, NULL, buf1, NULL }, - { __LINE__, S_OK, TRUE, NULL, buf1, L"." }, - { __LINE__, S_OK, TRUE, NULL, buf1, L"system32" }, - { __LINE__, S_OK, TRUE, NULL, buf2, NULL }, - { __LINE__, S_OK, TRUE, NULL, buf2, L"." }, - { __LINE__, S_OK, TRUE, NULL, buf2, L"system32" }, - }; - for (size_t i = 0; i < _countof(additionals3); ++i) - { - DoEntry(&additionals3[i]); - } - - DeleteFileA(path); - - strcpy(pch, "\\My Directory"); - RemoveDirectory(path); - } - // clean up ok(DeleteFileA(s_testfile1), "failed to delete the test file\n"); ok(DeleteFileA(s_testfile2), "failed to delete the test file\n"); - CloseNotepads(FALSE); + CloseAppWindows(L"Notepad", FALSE); }

1 0

[reactos] 01/01: [SHELL32_APITEST] ShellExecCmdLine: Close Notepad windows
by Katayama Hirofumi MZ 03 Jun '21

03 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f37b94ba391b58f046699… commit f37b94ba391b58f0466993a1483ab0942771c365 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 3 14:49:49 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 3 14:49:49 2021 +0900 [SHELL32_APITEST] ShellExecCmdLine: Close Notepad windows By using newly added CloseNotepads function, close the Notepad window. CORE-17351 --- .../rostests/apitests/shell32/ShellExecCmdLine.cpp | 51 ++++++++++++++-------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp index 1ec15fa02c2..b9c349e3d7e 100644 --- a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp +++ b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp @@ -404,6 +404,35 @@ static const TEST_ENTRY s_entries[] = { __LINE__, S_OK, TRUE, NULL, L"shell:::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL }, }; +static BOOL CloseNotepads(BOOL bRetry, INT nCount = 10) +{ +#define INTERVAL 100 + BOOL bFound = FALSE; + for (INT i = 0; i < nCount; ++i) + { + HWND hwnd = FindWindowW(L"Notepad", NULL); + if (!hwnd) + { + if (!bRetry) + break; + Sleep(INTERVAL); + continue; + } + bFound = TRUE; + HWND hwndPopup = GetLastActivePopup(hwnd); + if (hwndPopup && hwnd != hwndPopup) + { + PostMessageW(hwndPopup, WM_COMMAND, IDCANCEL, 0); + PostMessageW(hwndPopup, WM_COMMAND, IDNO, 0); + PostMessageW(hwndPopup, WM_CLOSE, 0, 0); + } + PostMessageW(hwnd, WM_CLOSE, 0, 0); + Sleep(INTERVAL); + } + return bFound; +#undef INTERVAL +} + static void DoEntry(const TEST_ENTRY *pEntry) { HRESULT hr; @@ -435,28 +464,11 @@ static void DoEntry(const TEST_ENTRY *pEntry) ok(hr == pEntry->hr, "Line %d: hr expected 0x%lX, was 0x%lX\n", pEntry->lineno, pEntry->hr, hr); -#define RETRY_COUNT 5 -#define RETRY_INTERVAL 250 if (SUCCEEDED(hr) && pEntry->pwszWindowClass) { - BOOL bFound = FALSE; - Sleep(RETRY_INTERVAL / 2); - for (int i = 0; i < RETRY_COUNT; ++i) - { - HWND hwnd = FindWindowW(pEntry->pwszWindowClass, NULL); - if (hwnd) - { - bFound = TRUE; - SendMessage(hwnd, WM_CLOSE, 0, 0); - Sleep(RETRY_INTERVAL); - break; - } - Sleep(RETRY_INTERVAL); - } + BOOL bFound = CloseNotepads(TRUE); ok(bFound, "Line %d: The window not found\n", pEntry->lineno); } -#undef RETRY_COUNT -#undef RETRY_INTERVAL } START_TEST(ShellExecCmdLine) @@ -480,6 +492,8 @@ START_TEST(ShellExecCmdLine) } } + CloseNotepads(FALSE); + // s_testfile1 FILE *fp = fopen(s_testfile1, "wb"); ok(fp != NULL, "failed to create a test file\n"); @@ -620,4 +634,5 @@ START_TEST(ShellExecCmdLine) // clean up ok(DeleteFileA(s_testfile1), "failed to delete the test file\n"); ok(DeleteFileA(s_testfile2), "failed to delete the test file\n"); + CloseNotepads(FALSE); }

1 0

[reactos] 03/03: [NTOS:PS/x64] Fix PspGetOrSetContextKernelRoutine
by Timo Kreuzer 02 Jun '21

02 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8496b4fbf89ea889f2b3… commit e8496b4fbf89ea889f2b3a4b8353922dbd100cd9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue May 15 14:08:48 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jun 2 18:25:36 2021 +0200 [NTOS:PS/x64] Fix PspGetOrSetContextKernelRoutine It now uses KiSetTrapContext to set the non-volatile context on the stack and the volatile context in the trap frame. --- ntoskrnl/include/internal/amd64/ke.h | 6 +++ ntoskrnl/ps/amd64/psctx.c | 72 ++++++++++++------------------------ 2 files changed, 30 insertions(+), 48 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/ke.h b/ntoskrnl/include/internal/amd64/ke.h index 9917b9334cd..97fa0f997b8 100644 --- a/ntoskrnl/include/internal/amd64/ke.h +++ b/ntoskrnl/include/internal/amd64/ke.h @@ -449,6 +449,12 @@ KiGetUserModeStackAddress(void) return &PsGetCurrentThread()->Tcb.TrapFrame->Rsp; } +VOID +KiSetTrapContext( + _Out_ PKTRAP_FRAME TrapFrame, + _In_ PCONTEXT Context, + _In_ KPROCESSOR_MODE RequestorMode); + #endif /* __NTOSKRNL_INCLUDE_INTERNAL_AMD64_KE_H */ /* EOF */ diff --git a/ntoskrnl/ps/amd64/psctx.c b/ntoskrnl/ps/amd64/psctx.c index cc6546627de..c0b0f26d576 100644 --- a/ntoskrnl/ps/amd64/psctx.c +++ b/ntoskrnl/ps/amd64/psctx.c @@ -15,81 +15,57 @@ /* FUNCTIONS ******************************************************************/ -VOID -NTAPI -PspGetContext(IN PKTRAP_FRAME TrapFrame, - IN PVOID NonVolatileContext, - IN OUT PCONTEXT Context) -{ - PAGED_CODE(); - - /* Convert the trap frame to a context */ - KeTrapFrameToContext(TrapFrame, NULL, Context); -} +_IRQL_requires_(APC_LEVEL) VOID NTAPI -PspSetContext(OUT PKTRAP_FRAME TrapFrame, - OUT PVOID NonVolatileContext, - IN PCONTEXT Context, - IN KPROCESSOR_MODE Mode) -{ - PAGED_CODE(); - - /* Convert the context to a trap frame structure */ - KeContextToTrapFrame(Context, NULL, TrapFrame, Context->ContextFlags, Mode); -} - -VOID -NTAPI -PspGetOrSetContextKernelRoutine(IN PKAPC Apc, - IN OUT PKNORMAL_ROUTINE* NormalRoutine, - IN OUT PVOID* NormalContext, - IN OUT PVOID* SystemArgument1, - IN OUT PVOID* SystemArgument2) +PspGetOrSetContextKernelRoutine( + _In_ PKAPC Apc, + _Inout_ PKNORMAL_ROUTINE* NormalRoutine, + _Inout_ PVOID* NormalContext, + _Inout_ PVOID* SystemArgument1, + _Inout_ PVOID* SystemArgument2) { PGET_SET_CTX_CONTEXT GetSetContext; - PKEVENT Event; - PCONTEXT Context; PKTHREAD Thread; - KPROCESSOR_MODE Mode; PKTRAP_FRAME TrapFrame = NULL; + PAGED_CODE(); /* Get the Context Structure */ GetSetContext = CONTAINING_RECORD(Apc, GET_SET_CTX_CONTEXT, Apc); - Context = &GetSetContext->Context; - Event = &GetSetContext->Event; - Mode = GetSetContext->Mode; Thread = Apc->SystemArgument2; + NT_ASSERT(KeGetCurrentThread() == Thread); /* If this is a kernel-mode request, grab the saved trap frame */ - if (Mode == KernelMode) TrapFrame = Thread->TrapFrame; + if (GetSetContext->Mode == KernelMode) + { + TrapFrame = Thread->TrapFrame; + } /* If we don't have one, grab it from the stack */ - if (!TrapFrame) + if (TrapFrame == NULL) { - DPRINT1("FIXME!!!!\n"); - /* Trap frame is right under our initial stack */ -// TrapFrame = (PKTRAP_FRAME)((ULONG_PTR)Thread->InitialStack - -// ROUND_UP(sizeof(KTRAP_FRAME), KTRAP_FRAME_ALIGN) - -// sizeof(FX_SAVE_AREA)); + /* Get the thread's base trap frame */ + TrapFrame = KeGetTrapFrame(KeGetCurrentThread()); } /* Check if it's a set or get */ - if (Apc->SystemArgument1) + if (Apc->SystemArgument1 != 0) { - /* Get the Context */ - PspSetContext(TrapFrame, NULL, Context, Mode); + /* Set the nonvolatiles on the stack, target frame is the trap frame */ + KiSetTrapContext(TrapFrame, &GetSetContext->Context, GetSetContext->Mode); } else { - /* Set the Context */ - PspGetContext(TrapFrame, NULL, Context); + /* Convert the trap frame to a context */ + KeTrapFrameToContext(TrapFrame, + NULL, + &GetSetContext->Context); } /* Notify the Native API that we are done */ - KeSetEvent(Event, IO_NO_INCREMENT, FALSE); + KeSetEvent(&GetSetContext->Event, IO_NO_INCREMENT, FALSE); } /* EOF */

1 0

[reactos] 02/03: [NTOS:KE/x64] Implement KiSetTrapContext
by Timo Kreuzer 02 Jun '21

02 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1ed97d6cc9b3acd1ca30… commit f1ed97d6cc9b3acd1ca305641ec15e76d0a954be Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue May 15 14:06:27 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jun 2 18:25:36 2021 +0200 [NTOS:KE/x64] Implement KiSetTrapContext KiSetTrapContext is an asm wrapper around RtlSetUnwindContext, which first stores an exception frame to assure that all non-volatile registers were put on the stack, then calls RtlSetUnwindContext to update their first saving positions on the stack and finally restore the exception frame to potentially load any updated registers, that haven't been saved elsewhere on the stack. --- ntoskrnl/ke/amd64/context.c | 26 ++++++++++++++++++++++++++ ntoskrnl/ke/amd64/trap.S | 30 +++++++++++++++++++++++++++--- sdk/include/asm/ksamd64.template.h | 2 ++ sdk/include/ndk/amd64/asm.h | 3 +++ 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ke/amd64/context.c b/ntoskrnl/ke/amd64/context.c index 61c286cd69d..1ce8e8dfe91 100644 --- a/ntoskrnl/ke/amd64/context.c +++ b/ntoskrnl/ke/amd64/context.c @@ -292,3 +292,29 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } +VOID +RtlSetUnwindContext( + _In_ PCONTEXT Context, + _In_ DWORD64 TargetFrame); + +VOID +KiSetTrapContextInternal( + _Out_ PKTRAP_FRAME TrapFrame, + _In_ PCONTEXT Context, + _In_ KPROCESSOR_MODE RequestorMode) +{ + ULONG64 TargetFrame; + + /* Save the volatile register context in the trap frame */ + KeContextToTrapFrame(Context, + NULL, + TrapFrame, + Context->ContextFlags, + RequestorMode); + + /* The target frame is MAX_SYSCALL_PARAM_SIZE bytes before the trap frame */ + TargetFrame = (ULONG64)TrapFrame - MAX_SYSCALL_PARAM_SIZE ; + + /* Set the nonvolatiles on the stack */ + RtlSetUnwindContext(Context, TargetFrame); +} diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 5d6e1ead384..7fb5c05919b 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -730,9 +730,6 @@ FUNC KiInterruptDispatch ExitTrap (TF_SAVE_ALL or TF_SEND_EOI) ENDFUNC - -#define MAX_SYSCALL_PARAM_SIZE (16 * 8) - EXTERN KiSystemCallHandler:PROC /*! \name KiSystemCallEntry64 @@ -1049,6 +1046,33 @@ KiConvertToGuiThreadFailed: ENDFUNC + +EXTERN KiSetTrapContextInternal:PROC + +/* + * VOID + * KiSetTrapContext( + * _Out_ PKTRAP_FRAME TrapFrame, + * _In_ PCONTEXT Context, + * _In_ KPROCESSOR_MODE RequestorMode); + */ +PUBLIC KiSetTrapContext +.PROC KiSetTrapContext + + /* Generate a KEXCEPTION_FRAME on the stack */ + GENERATE_EXCEPTION_FRAME + + call KiSetTrapContextInternal + + /* Restore the registers from the KEXCEPTION_FRAME */ + RESTORE_EXCEPTION_STATE + + /* Return */ + ret + +.ENDP + + /* * VOID * KiDeliverApc( diff --git a/sdk/include/asm/ksamd64.template.h b/sdk/include/asm/ksamd64.template.h index 41f7e7e4e16..1072df28b34 100644 --- a/sdk/include/asm/ksamd64.template.h +++ b/sdk/include/asm/ksamd64.template.h @@ -1071,3 +1071,5 @@ OFFSET(KINTERRUPT_DispatchCount, KINTERRUPT, DispatchCount), OFFSET(KINTERRUPT_TrapFrame, KINTERRUPT, TrapFrame), OFFSET(KINTERRUPT_DispatchCode, KINTERRUPT, DispatchCode), +HEADER("Misc definitions"), +CONSTANT(MAX_SYSCALL_PARAM_SIZE), diff --git a/sdk/include/ndk/amd64/asm.h b/sdk/include/ndk/amd64/asm.h index 49a5534c3b4..69f3ad2fb17 100644 --- a/sdk/include/ndk/amd64/asm.h +++ b/sdk/include/ndk/amd64/asm.h @@ -254,6 +254,9 @@ Author: #define CR0_CD HEX(40000000) #define CR0_PG HEX(80000000) +/* Number of bytes reserved for syscall parameters */ +#define MAX_SYSCALL_PARAM_SIZE (16 * 8) + #ifdef _ASM_ // // CR4

1 0

[reactos] 01/03: [RTL/x64] Implement RtlpCaptureNonVolatileContextPointers and RtlSetUnwindContext
by Timo Kreuzer 02 Jun '21

02 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e801b7dda25a1e2a70206… commit e801b7dda25a1e2a702065fd72be01e18fdd4c00 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue May 15 14:05:19 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jun 2 18:25:36 2021 +0200 [RTL/x64] Implement RtlpCaptureNonVolatileContextPointers and RtlSetUnwindContext RtlpCaptureNonVolatileContextPointers walks the stack and captures the addresses of all non-volatile registers on the stack, when they have been saved first. This is needed to be able to fix up the non-volatile on a system call, which doesn't capture non-volatiles, but relies on them to be restored by the callees. Instead of only checking for the TargetFrame, also check for a mode change, i.e. RIP went from kernel to user, in which case the target frame was not reached yet, because it was too large, but processing can't continue here. RtlSetUnwindContext uses RtlpCaptureNonVolatileContextPointers to set the non-volatile registers in the the stack. They will be picked up, when returning back or unwinding, e.g. to the system call handler. --- sdk/lib/rtl/amd64/unwind.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c index 989669e97f7..26a7610d250 100644 --- a/sdk/lib/rtl/amd64/unwind.c +++ b/sdk/lib/rtl/amd64/unwind.c @@ -687,3 +687,74 @@ RtlRaiseException(IN PEXCEPTION_RECORD ExceptionRecord) RtlRaiseStatus(Status); } +static +VOID +RtlpCaptureNonVolatileContextPointers( + _Out_ PKNONVOLATILE_CONTEXT_POINTERS NonvolatileContextPointers, + _In_ ULONG64 TargetFrame) +{ + CONTEXT Context; + PRUNTIME_FUNCTION FunctionEntry; + ULONG64 ImageBase; + PVOID HandlerData; + ULONG64 EstablisherFrame; + + /* Zero out the nonvolatile context pointers */ + RtlZeroMemory(NonvolatileContextPointers, sizeof(*NonvolatileContextPointers)); + + /* Capture the current context */ + RtlCaptureContext(&Context); + + do + { + /* Look up the function entry */ + FunctionEntry = RtlLookupFunctionEntry(Context.Rip, &ImageBase, NULL); + ASSERT(FunctionEntry != NULL); + + /* Do a virtual unwind to the caller and capture saved non-volatiles */ + RtlVirtualUnwind(UNW_FLAG_EHANDLER, + ImageBase, + Context.Rip, + FunctionEntry, + &Context, + &HandlerData, + &EstablisherFrame, + NonvolatileContextPointers); + + /* Make sure nothing fishy is going on. Currently this is for kernel mode only. */ + ASSERT(EstablisherFrame != 0); + ASSERT((LONG64)Context.Rip < 0); + + /* Continue until we reached the target frame or user mode */ + } while (EstablisherFrame < TargetFrame); + + /* If the caller did the right thing, we should get exactly the target frame */ + ASSERT(EstablisherFrame == TargetFrame); +} + +VOID +RtlSetUnwindContext( + _In_ PCONTEXT Context, + _In_ DWORD64 TargetFrame) +{ + KNONVOLATILE_CONTEXT_POINTERS ContextPointers; + + /* Capture pointers to the non-volatiles up to the target frame */ + RtlpCaptureNonVolatileContextPointers(&ContextPointers, TargetFrame); + + /* Copy the nonvolatiles to the captured locations */ + *ContextPointers.R12 = Context->R12; + *ContextPointers.R13 = Context->R13; + *ContextPointers.R14 = Context->R14; + *ContextPointers.R15 = Context->R15; + *ContextPointers.Xmm6 = Context->Xmm6; + *ContextPointers.Xmm7 = Context->Xmm7; + *ContextPointers.Xmm8 = Context->Xmm8; + *ContextPointers.Xmm9 = Context->Xmm9; + *ContextPointers.Xmm10 = Context->Xmm10; + *ContextPointers.Xmm11 = Context->Xmm11; + *ContextPointers.Xmm12 = Context->Xmm12; + *ContextPointers.Xmm13 = Context->Xmm13; + *ContextPointers.Xmm14 = Context->Xmm14; + *ContextPointers.Xmm15 = Context->Xmm15; +}

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