Ros-diffs March 2021

ros-diffs@reactos.org

15 participants
161 discussions

[reactos] 01/01: [BROWSEUI_APITEST] Fix abnormal termination on fn2 == NULL

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2282205d135e1ac53bb4d… commit 2282205d135e1ac53bb4d08a0b65a119ab2e0bb2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 4 14:42:04 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 4 14:42:04 2021 +0900 [BROWSEUI_APITEST] Fix abnormal termination on fn2 == NULL The DoWordBreakProc function crashed. CORE-9281 --- modules/rostests/apitests/browseui/IAutoComplete.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/browseui/IAutoComplete.cpp b/modules/rostests/apitests/browseui/IAutoComplete.cpp index 14938182fcd..0fa7d301542 100644 --- a/modules/rostests/apitests/browseui/IAutoComplete.cpp +++ b/modules/rostests/apitests/browseui/IAutoComplete.cpp @@ -350,7 +350,10 @@ DoTestCaseA(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, (EDITWORDBREAKPROC)SendMessageW(hwndEdit, EM_GETWORDBREAKPROC, 0, 0); ok(fn1 != fn2, "fn1 == fn2\n"); ok(fn2 != NULL, "fn2 was NULL\n"); - DoWordBreakProc(fn2); + if (fn2) + DoWordBreakProc(fn2); + else + skip("fn2 == NULL\n"); } // take care of the message queue

3 years, 9 months

[reactos] 01/01: [NTOS:PS] Guard the quota in a spin lock (#3419)

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a340ec17677fbad860a23… commit a340ec17677fbad860a238f88a01f11a9130dd78 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Mar 4 02:43:30 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 4 04:43:30 2021 +0300 [NTOS:PS] Guard the quota in a spin lock (#3419) Prior to acquiring a quota from the process and do whatever it's needed to do (charge it or return it back), we must guard ourselves with a spinlock so that we may not get into potential race conditions. In Windows Server 2003, PspGivebackQuota and PspExpandQuota do the same thing and they're the equivalent to PspReturnProcessQuotaSpecifiedPool and PspChargeProcessQuotaSpecifiedPool in our codebase. --- ntoskrnl/ps/quota.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ps/quota.c b/ntoskrnl/ps/quota.c index 0645654a320..947f78a658e 100644 --- a/ntoskrnl/ps/quota.c +++ b/ntoskrnl/ps/quota.c @@ -38,28 +38,32 @@ PspChargeProcessQuotaSpecifiedPool(IN PEPROCESS Process, IN PS_QUOTA_TYPE QuotaType, IN SIZE_T Amount) { + KIRQL OldIrql; ASSERT(Process); ASSERT(Process != PsInitialSystemProcess); ASSERT(QuotaType < PsQuotaTypes); ASSERT(Process->QuotaBlock); - /* Note: Race warning. TODO: Needs to add/use lock for this */ + /* Guard our quota in a spin lock */ + KeAcquireSpinLock(&PspQuotaLock, &OldIrql); + if (Process->QuotaUsage[QuotaType] + Amount > Process->QuotaBlock->QuotaEntry[QuotaType].Limit) { DPRINT1("Quota exceeded, but ROS will let it slide...\n"); + KeReleaseSpinLock(&PspQuotaLock, OldIrql); return STATUS_SUCCESS; //return STATUS_QUOTA_EXCEEDED; /* caller raises the exception */ } InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[QuotaType], Amount); - /* Note: Race warning. TODO: Needs to add/use lock for this */ if (Process->QuotaPeak[QuotaType] < Process->QuotaUsage[QuotaType]) { Process->QuotaPeak[QuotaType] = Process->QuotaUsage[QuotaType]; } + KeReleaseSpinLock(&PspQuotaLock, OldIrql); return STATUS_SUCCESS; } @@ -73,10 +77,15 @@ PspReturnProcessQuotaSpecifiedPool(IN PEPROCESS Process, IN PS_QUOTA_TYPE QuotaType, IN SIZE_T Amount) { + KIRQL OldIrql; ASSERT(Process); ASSERT(Process != PsInitialSystemProcess); ASSERT(QuotaType < PsQuotaTypes); ASSERT(!(Amount & 0x80000000)); /* we need to be able to negate it */ + + /* Guard our quota in a spin lock */ + KeAcquireSpinLock(&PspQuotaLock, &OldIrql); + if (Process->QuotaUsage[QuotaType] < Amount) { DPRINT1("WARNING: Process->QuotaUsage sanity check failed.\n"); @@ -86,6 +95,8 @@ PspReturnProcessQuotaSpecifiedPool(IN PEPROCESS Process, InterlockedExchangeAdd((LONG*)&Process->QuotaUsage[QuotaType], -(LONG)Amount); } + + KeReleaseSpinLock(&PspQuotaLock, OldIrql); } /* FUNCTIONS ***************************************************************/

3 years, 9 months

[reactos] 01/01: [BROWSEUI_APITEST] Strengthen IAutoComplete on WM_KEYDOWN (#3500)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b1c81b0ec456770dfec0… commit 3b1c81b0ec456770dfec00f4b8e1f2db9144b097 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 4 09:35:44 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 4 09:35:44 2021 +0900 [BROWSEUI_APITEST] Strengthen IAutoComplete on WM_KEYDOWN (#3500) - Simplify the test mechanism. - Add more tests for WM_KEYDOWN message. CORE-9281 --- .../rostests/apitests/browseui/IAutoComplete.cpp | 232 +++++++++++++++------ 1 file changed, 170 insertions(+), 62 deletions(-) diff --git a/modules/rostests/apitests/browseui/IAutoComplete.cpp b/modules/rostests/apitests/browseui/IAutoComplete.cpp index 88e74ccdc37..14938182fcd 100644 --- a/modules/rostests/apitests/browseui/IAutoComplete.cpp +++ b/modules/rostests/apitests/browseui/IAutoComplete.cpp @@ -12,6 +12,8 @@ #include <tchar.h> #include <atlcom.h> #include <atlwin.h> +#include <atlstr.h> +#include <atlsimpcoll.h> #include <shlwapi.h> #include <strsafe.h> @@ -39,6 +41,7 @@ static HWND MyCreateEditCtrl(INT x, INT y, INT cx, INT cy) static BOOL s_bReset = FALSE; static BOOL s_bExpand = FALSE; +static CStringW s_strExpand; // CEnumString class for auto-completion test class CEnumString : public IEnumString, public IACList2 @@ -142,6 +145,7 @@ public: { trace("CEnumString::Expand(%S)\n", pszExpand); s_bExpand = TRUE; + s_strExpand = pszExpand; return S_OK; } STDMETHODIMP GetOptions(DWORD *pdwFlag) override @@ -562,10 +566,38 @@ DoTestCaseA(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, ok_int(s_bExpand, chLast == L'\\'); } +struct TEST_B_ENTRY +{ + INT m_line; + UINT m_uMsg; + WPARAM m_wParam; + LPARAM m_lParam; + LPCWSTR m_text; + BOOL m_bVisible; + INT m_ich0, m_ich1; + INT m_iItem; + BOOL m_bReset, m_bExpand; + LPCWSTR m_expand; +}; + +static BOOL +DoesMatch(LPWSTR *pList, UINT nCount, LPCWSTR psz) +{ + INT cch = lstrlenW(psz); + if (cch == 0) + return FALSE; + for (UINT i = 0; i < nCount; ++i) + { + if (::StrCmpNIW(pList[i], psz, cch) == 0) + return TRUE; + } + return FALSE; +} + // the testcase B static VOID -DoTestCaseB(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, - LPWSTR *pList, UINT nCount) +DoTestCaseB(INT x, INT y, INT cx, INT cy, LPWSTR *pList, UINT nCount, + const TEST_B_ENTRY *pEntries, UINT cEntries) { MSG msg; s_bExpand = s_bReset = FALSE; @@ -575,6 +607,14 @@ DoTestCaseB(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, ok(hwndEdit != NULL, "hwndEdit was NULL\n"); ShowWindowAsync(hwndEdit, SW_SHOWNORMAL); + // do messages + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + ok_int(IsWindowVisible(hwndEdit), TRUE); + // set the list data CComPtr<CEnumString> pEnum(new CEnumString()); pEnum->SetList(nCount, pList); @@ -594,74 +634,75 @@ DoTestCaseB(INT x, INT y, INT cx, INT cy, LPCWSTR pszInput, hr = pAC->Init(hwndEdit, punk, NULL, NULL); // IAutoComplete::Init ok_hr(hr, S_OK); + HWND hwndDropDown = NULL, hwndScrollBar = NULL, hwndSizeBox = NULL, hwndList = NULL; // input SetFocus(hwndEdit); - for (UINT i = 0; pszInput[i]; ++i) - { - PostMessageW(hwndEdit, WM_COMMAND, (0xFFFF0000 + i), 0xDEADFACE); - PostMessageW(hwndEdit, WM_CHAR, pszInput[i], 0); - } - PostMessageW(hwndEdit, WM_CHAR, L'!', 0); + Sleep(100); - // observe the message responses - BOOL bFlag = FALSE; - INT i = 0; - WCHAR ch = 0; - s_bExpand = s_bReset = FALSE; - while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + for (UINT i = 0; i < cEntries; ++i) { - TranslateMessage(&msg); - DispatchMessageW(&msg); - if (bFlag && msg.message == WM_CHAR) + const TEST_B_ENTRY& entry = pEntries[i]; + s_bReset = s_bExpand = FALSE; + s_strExpand.Empty(); + + UINT uMsg = entry.m_uMsg; + WPARAM wParam = entry.m_wParam; + LPARAM lParam = entry.m_lParam; + PostMessageW(hwndEdit, uMsg, wParam, lParam); + + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { - bFlag = FALSE; - ch = (WCHAR)msg.wParam; - if (ch == L'!') - break; - //trace("i: %d, ch:%C, s_bReset:%d, s_bExpand:%d, ch:%C\n", i, ch, s_bReset, s_bExpand, ch); - Sleep(100); - if (i == 0) - { - ok_int(s_bReset, TRUE); - s_bReset = FALSE; - ok_int(s_bExpand, FALSE); - } - else if (ch != L'\\') - { - ok_int(s_bReset, FALSE); - ok_int(s_bExpand, FALSE); - } + TranslateMessage(&msg); + DispatchMessageW(&msg); + + if (msg.message == WM_CHAR || msg.message == WM_KEYDOWN) + Sleep(100); // another thread is working } - if (msg.message == WM_COMMAND && (DWORD)msg.lParam == 0xDEADFACE) + + if (!IsWindow(hwndDropDown)) { - i = (msg.wParam & 0x0000FFFF); - //trace("i: %d, ch:%C, s_bReset:%d, s_bExpand:%d, ch:%C\n", i, ch, s_bReset, s_bExpand, ch); - if (ch == L'\\') - { - ok_int(s_bReset, TRUE); - ok_int(s_bExpand, TRUE); - s_bReset = s_bExpand = FALSE; - } - else - { - ok_int(s_bReset, FALSE); - ok_int(s_bExpand, FALSE); - } - bFlag = TRUE; - Sleep(100); + hwndDropDown = FindWindowW(L"Auto-Suggest Dropdown", L""); + hwndScrollBar = hwndSizeBox = hwndList = NULL; + } + if (IsWindowVisible(hwndDropDown)) + { + hwndScrollBar = GetTopWindow(hwndDropDown); + hwndSizeBox = GetNextWindow(hwndScrollBar, GW_HWNDNEXT); + hwndList = GetNextWindow(hwndSizeBox, GW_HWNDNEXT); } - } - // post quit - DestroyWindow(hwndEdit); - PostQuitMessage(0); + WCHAR szText[64]; + GetWindowTextW(hwndEdit, szText, _countof(szText)); + CStringW strText = szText; + INT ich0, ich1; + SendMessageW(hwndEdit, EM_GETSEL, (WPARAM)&ich0, (LPARAM)&ich1); - // take care of the message queue - while (GetMessageW(&msg, NULL, 0, 0)) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); + BOOL bVisible = IsWindowVisible(hwndDropDown); + ok(bVisible == entry.m_bVisible, "Line %d: bVisible was %d\n", entry.m_line, bVisible); + INT iItem = -1; + if (IsWindowVisible(hwndList)) + { + iItem = ListView_GetNextItem(hwndList, -1, LVNI_ALL | LVNI_SELECTED); + } + BOOL bDidMatch = DoesMatch(pList, nCount, strText); + ok(bVisible == bDidMatch, "Line %d: bVisible != bDidMatch\n", entry.m_line); + + if (entry.m_text) + ok(strText == entry.m_text, "Line %d: szText was %S\n", entry.m_line, (LPCWSTR)strText); + else + ok(strText == L"", "Line %d: szText was %S\n", entry.m_line, (LPCWSTR)strText); + ok(ich0 == entry.m_ich0, "Line %d: ich0 was %d\n", entry.m_line, ich0); + ok(ich1 == entry.m_ich1, "Line %d: ich1 was %d\n", entry.m_line, ich1); + ok(iItem == entry.m_iItem, "Line %d: iItem was %d\n", entry.m_line, iItem); + ok(s_bReset == entry.m_bReset, "Line %d: s_bReset was %d\n", entry.m_line, s_bReset); + ok(s_bExpand == entry.m_bExpand, "Line %d: s_bExpand was %d\n", entry.m_line, s_bExpand); + if (entry.m_expand) + ok(s_strExpand == entry.m_expand, "Line %d: s_strExpand was %S\n", entry.m_line, (LPCWSTR)s_strExpand); + else + ok(s_strExpand == L"", "Line %d: s_strExpand was %S\n", entry.m_line, (LPCWSTR)s_strExpand); } + + DestroyWindow(hwndEdit); } START_TEST(IAutoComplete) @@ -729,6 +770,10 @@ START_TEST(IAutoComplete) DoTestCaseA(rcWork.right - 100, rcWork.bottom - 30, 80, 40, L"testtest\\", pList, nCount, FALSE, FALSE); +#ifdef MANUAL_DEBUGGING + return; +#endif + // Test case #5 (A) trace("Testcase #5 (upper, long) ------------------------------\n"); nCount = 300; @@ -753,12 +798,75 @@ START_TEST(IAutoComplete) // Test case #7 (B) trace("Testcase #7 ------------------------------\n"); - nCount = 500; + nCount = 16; pList = (LPWSTR *)CoTaskMemAlloc(nCount * sizeof(LPWSTR)); for (UINT i = 0; i < nCount; ++i) { - StringCbPrintfW(szText, sizeof(szText), L"testtest\\item-%u", i); + StringCbPrintfW(szText, sizeof(szText), L"test\\item-%u", i); + SHStrDupW(szText, &pList[i]); + } + static const TEST_B_ENTRY testcase7_entries[] = + { + { __LINE__, WM_CHAR, L't', 0, L"t", TRUE, 1, 1, -1, TRUE }, + { __LINE__, WM_CHAR, L'e', 0, L"te", TRUE, 2, 2, -1 }, + { __LINE__, WM_CHAR, L's', 0, L"tes", TRUE, 3, 3, -1 }, + { __LINE__, WM_CHAR, L'T', 0, L"tesT", TRUE, 4, 4, -1 }, + { __LINE__, WM_CHAR, L'\\', 0, L"tesT\\", TRUE, 5, 5, -1, TRUE, TRUE, L"tesT\\" }, + { __LINE__, WM_CHAR, L't', 0, L"tesT\\t", FALSE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"tesT\\", TRUE, 5, 5, -1 }, + { __LINE__, WM_CHAR, L'i', 0, L"tesT\\i", TRUE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_DOWN, 0, L"test\\item-0", TRUE, 11, 11, 0 }, + { __LINE__, WM_KEYDOWN, VK_DOWN, 0, L"test\\item-1", TRUE, 11, 11, 1 }, + { __LINE__, WM_KEYDOWN, VK_UP, 0, L"test\\item-0", TRUE, 11, 11, 0 }, + { __LINE__, WM_KEYDOWN, VK_UP, 0, L"tesT\\i", TRUE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_UP, 0, L"test\\item-9", TRUE, 11, 11, 15 }, + { __LINE__, WM_KEYDOWN, VK_DOWN, 0, L"tesT\\i", TRUE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"tesT\\", TRUE, 5, 5, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"tesT", TRUE, 4, 4, -1, TRUE }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"tes", TRUE, 3, 3, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"te", TRUE, 2, 2, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"t", TRUE, 1, 1, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"", FALSE, 0, 0, -1 }, + { __LINE__, WM_CHAR, L't', 0, L"t", TRUE, 1, 1, -1, TRUE }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"t", TRUE, 0, 0, -1 }, + { __LINE__, WM_KEYDOWN, VK_RIGHT, 0, L"t", TRUE, 1, 1, -1 }, + }; + DoTestCaseB(0, 0, 100, 30, pList, nCount, testcase7_entries, _countof(testcase7_entries)); + + // Test case #8 (B) + trace("Testcase #8 ------------------------------\n"); + nCount = 10; + pList = (LPWSTR *)CoTaskMemAlloc(nCount * sizeof(LPWSTR)); + for (UINT i = 0; i < nCount; ++i) + { + StringCbPrintfW(szText, sizeof(szText), L"test\\item-%u", i); SHStrDupW(szText, &pList[i]); } - DoTestCaseB(0, 0, 100, 30, L"testtest\\iX", pList, nCount); + static const TEST_B_ENTRY testcase8_entries[] = + { + { __LINE__, WM_CHAR, L'a', 0, L"a", FALSE, 1, 1, -1, TRUE }, + { __LINE__, WM_CHAR, L'b', 0, L"ab", FALSE, 2, 2, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"ab", FALSE, 1, 1, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"ab", FALSE, 0, 0, -1 }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"b", FALSE, 0, 0, -1, TRUE }, + { __LINE__, WM_CHAR, L't', 0, L"tb", FALSE, 1, 1, -1, TRUE }, + { __LINE__, WM_CHAR, L'e', 0, L"teb", FALSE, 2, 2, -1 }, + { __LINE__, WM_CHAR, L's', 0, L"tesb", FALSE, 3, 3, -1 }, + { __LINE__, WM_CHAR, L't', 0, L"testb", FALSE, 4, 4, -1 }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"test", TRUE, 4, 4, -1 }, + { __LINE__, WM_CHAR, L'\\', 0, L"test\\", TRUE, 5, 5, -1, TRUE, TRUE, L"test\\" }, + { __LINE__, WM_CHAR, L'i', 0, L"test\\i", TRUE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"test\\i", TRUE, 6, 6, -1 }, + { __LINE__, WM_CHAR, L'z', 0, L"test\\iz", FALSE, 7, 7, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"test\\iz", FALSE, 6, 6, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"test\\iz", FALSE, 5, 5, -1 }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"test\\z", FALSE, 5, 5, -1 }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"test\\", TRUE, 5, 5, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"test\\", TRUE, 4, 4, -1 }, + { __LINE__, WM_KEYDOWN, VK_LEFT, 0, L"test\\", TRUE, 3, 3, -1 }, + { __LINE__, WM_KEYDOWN, VK_BACK, 0, L"tet\\", FALSE, 2, 2, -1, TRUE, TRUE, L"tet\\" }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"te\\", FALSE, 2, 2, -1, TRUE, TRUE, L"te\\" }, + { __LINE__, WM_KEYDOWN, VK_DELETE, 0, L"te", TRUE, 2, 2, -1, TRUE }, + }; + DoTestCaseB(rcWork.right - 100, rcWork.bottom - 30, 80, 40, pList, nCount, testcase8_entries, _countof(testcase8_entries)); }

3 years, 9 months

[reactos] 01/01: [SDK:RTL] Statically initialize RtlCriticalSectionList

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65b6af58f9cc4ea2fa9f3… commit 65b6af58f9cc4ea2fa9f34aed7b2a7b5aaec57e8 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Mar 3 14:09:08 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Mar 3 14:10:47 2021 +0100 [SDK:RTL] Statically initialize RtlCriticalSectionList This might be used before RtlpInitDeferedCriticalSection gets called --- sdk/lib/rtl/critical.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sdk/lib/rtl/critical.c b/sdk/lib/rtl/critical.c index 0911a8ce76f..8ef2c7e9544 100644 --- a/sdk/lib/rtl/critical.c +++ b/sdk/lib/rtl/critical.c @@ -17,7 +17,7 @@ #define MAX_STATIC_CS_DEBUG_OBJECTS 64 static RTL_CRITICAL_SECTION RtlCriticalSectionLock; -static LIST_ENTRY RtlCriticalSectionList; +static LIST_ENTRY RtlCriticalSectionList = {&RtlCriticalSectionList, &RtlCriticalSectionList}; static BOOLEAN RtlpCritSectInitialized = FALSE; static RTL_CRITICAL_SECTION_DEBUG RtlpStaticDebugInfo[MAX_STATIC_CS_DEBUG_OBJECTS]; static BOOLEAN RtlpDebugInfoFreeList[MAX_STATIC_CS_DEBUG_OBJECTS]; @@ -265,9 +265,6 @@ VOID NTAPI RtlpInitDeferedCriticalSection(VOID) { - /* Initialize the Process Critical Section List */ - InitializeListHead(&RtlCriticalSectionList); - /* Initialize the CS Protecting the List */ RtlInitializeCriticalSection(&RtlCriticalSectionLock);

3 years, 9 months

[reactos] 02/02: [NTOS:KD] KdpDebugLogInit(): Close the thread handle

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7851ad8635f145d12d190… commit 7851ad8635f145d12d190183789a06a6c4733b29 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 09:01:37 2021 +0100 [NTOS:KD] KdpDebugLogInit(): Close the thread handle Addendum to 07dc415 (r43331). --- ntoskrnl/kd/kdio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 9804b52b50c..af7accb3afc 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -296,6 +296,8 @@ KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, ThreadPriority, &Priority, sizeof(Priority)); + + ZwClose(ThreadHandle); } }

3 years, 9 months

[reactos] 01/02: [NTOS:KD] KdpLoggerThread(): Assert being in kernel mode

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=802ad6d3ee93649febe0d… commit 802ad6d3ee93649febe0d31c0990c5592cb6b2ba Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 09:01:37 2021 +0100 [NTOS:KD] KdpLoggerThread(): Assert being in kernel mode to be explicit that using Nt*() is safe. Follow-up to 9537653. --- ntoskrnl/kd/kdio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 4ada3609a89..9804b52b50c 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -110,6 +110,8 @@ KdpLoggerThread(PVOID Context) ULONG beg, end, num; IO_STATUS_BLOCK Iosb; + ASSERT(ExGetPreviousMode() == KernelMode); + KdpLoggingEnabled = TRUE; while (TRUE)

3 years, 9 months

[reactos] 14/14: this seem to be the only combination which works on msbuild-msvc

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f82eb0fede4c3d93fde61… commit f82eb0fede4c3d93fde6122aafe0dd50600126fb Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Mar 3 05:00:33 2021 +0300 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 this seem to be the only combination which works on msbuild-msvc --- boot/freeldr/freeldr/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 3d30e2ea362..980265dd54a 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -282,9 +282,9 @@ if(MSVC) add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER") add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER") else() - target_link_options(freeldr_pe PRIVATE /ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:512 /ALIGN:512) + target_link_options(freeldr_pe PRIVATE /ignore:4078 /ignore:4254 /DYNAMICBASE:NO /FIXED /FILEALIGN:512 /ALIGN:512) add_linker_script(freeldr_pe freeldr_i386.msvc.lds) - target_link_options(freeldr_pe_dbg PRIVATE /ignore:4078 /ignore:4254 /DRIVER /DYNAMICBASE:NO /FIXED /FILEALIGN:512 /ALIGN:512) + target_link_options(freeldr_pe_dbg PRIVATE /ignore:4078 /ignore:4254 /DYNAMICBASE:NO /FIXED /FILEALIGN:512 /ALIGN:512) add_linker_script(freeldr_pe_dbg freeldr_i386.msvc.lds) endif() # We don't need hotpatching

3 years, 9 months

[reactos] 13/14: [FREELDR] Use target_link_options instead of add_target_link_flags

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ea6157cbfb7f6c613c58… commit 1ea6157cbfb7f6c613c589eaf6f6b01f71f14f08 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 3 20:07:57 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [FREELDR] Use target_link_options instead of add_target_link_flags CORE-17423 --- boot/freeldr/freeldr/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index f7fee2be3d0..3d30e2ea362 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -282,9 +282,9 @@ if(MSVC) add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER") add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER") else() - add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:512 /ALIGN:512") + target_link_options(freeldr_pe PRIVATE /ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:512 /ALIGN:512) add_linker_script(freeldr_pe freeldr_i386.msvc.lds) - add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:512 /ALIGN:512") + target_link_options(freeldr_pe_dbg PRIVATE /ignore:4078 /ignore:4254 /DRIVER /DYNAMICBASE:NO /FIXED /FILEALIGN:512 /ALIGN:512) add_linker_script(freeldr_pe_dbg freeldr_i386.msvc.lds) endif() # We don't need hotpatching

3 years, 9 months

[reactos] 12/14: [CMAKE] Define _SBCS when using VS generator

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d1ecc7575e899b1a3546… commit 5d1ecc7575e899b1a35466fc130e4b104fb8e755 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 3 18:35:12 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [CMAKE] Define _SBCS when using VS generator CORE-17423 --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fcd92b5512a..57fe94a8a5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,9 +127,10 @@ else() # Print build type message("-- Build Type: ${CMAKE_BUILD_TYPE}") - # Always add /MT in VS CMAKE_GENERATOR + # Always add /MT in VS CMAKE_GENERATOR and define _SBCS otherwise VS thinks it's a multi-byte or whatever project if (MSVC_IDE) add_compile_options("/MT") + add_compile_definitions(_SBCS) endif()

3 years, 9 months

[reactos] 11/14: [FREELDR] Use decimal numbers for section & file alignment

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7f08b3e30fdabe05686a… commit e7f08b3e30fdabe05686a693d87d97d8eb4642b6 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 3 17:20:41 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [FREELDR] Use decimal numbers for section & file alignment CORE-17423 --- boot/freeldr/freeldr/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index f4610d4c12f..f7fee2be3d0 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -282,9 +282,9 @@ if(MSVC) add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER") add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER") else() - add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:0x200 /ALIGN:0x200") + add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:512 /ALIGN:512") add_linker_script(freeldr_pe freeldr_i386.msvc.lds) - add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:0x200 /ALIGN:0x200") + add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:512 /ALIGN:512") add_linker_script(freeldr_pe_dbg freeldr_i386.msvc.lds) endif() # We don't need hotpatching

3 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2021