Ros-diffs October 2020

ros-diffs@reactos.org

22 participants
156 discussions

[reactos] 01/01: [BROWSEUI] Accept TypedURLs to CLSID_ACLCustomMRU (#3250)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb8cb671b8259b52bf640… commit bb8cb671b8259b52bf64011657b76244132732e8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 2 21:27:23 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 2 21:27:23 2020 +0900 [BROWSEUI] Accept TypedURLs to CLSID_ACLCustomMRU (#3250) Related to #3249. IACLCustomMRU has a special case of TypedURLs. The TypedURLs key consists of the registry values of "url1", "url2", "url3" etc instead of "MRUList", "a", "b" etc. CORE-9281 --- dll/win32/browseui/ACLCustomMRU.cpp | 127 ++++++++++++++++++++++++++++++++++-- dll/win32/browseui/ACLCustomMRU.h | 22 ++++++- 2 files changed, 142 insertions(+), 7 deletions(-) diff --git a/dll/win32/browseui/ACLCustomMRU.cpp b/dll/win32/browseui/ACLCustomMRU.cpp index 1f0f03f29e1..c142397e86f 100644 --- a/dll/win32/browseui/ACLCustomMRU.cpp +++ b/dll/win32/browseui/ACLCustomMRU.cpp @@ -3,27 +3,77 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Custom MRU AutoComplete List * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" +#define TYPED_URLS_KEY L"Software\\Microsoft\\Internet Explorer\\TypedURLs" + CACLCustomMRU::CACLCustomMRU() - :m_bDirty(false) + : m_bDirty(false), m_bTypedURLs(FALSE), m_ielt(0) { } CACLCustomMRU::~CACLCustomMRU() { PersistMRU(); - m_Key.Close(); +} + +STDMETHODIMP CACLCustomMRU::Next(ULONG celt, LPWSTR *rgelt, ULONG *pceltFetched) +{ + if (!pceltFetched || !rgelt) + return E_POINTER; + + *pceltFetched = 0; + if (celt == 0) + return S_OK; + + *rgelt = NULL; + if (INT(m_ielt) >= m_MRUData.GetSize()) + return S_FALSE; + + size_t cb = (m_MRUData[m_ielt].GetLength() + 1) * sizeof(WCHAR); + LPWSTR psz = (LPWSTR)CoTaskMemAlloc(cb); + if (!psz) + return S_FALSE; + + CopyMemory(psz, (LPCWSTR)m_MRUData[m_ielt], cb); + *rgelt = psz; + *pceltFetched = 1; + ++m_ielt; + return S_OK; +} + +STDMETHODIMP CACLCustomMRU::Skip(ULONG celt) +{ + return E_NOTIMPL; +} + +STDMETHODIMP CACLCustomMRU::Reset() +{ + m_ielt = 0; + return S_OK; +} + +STDMETHODIMP CACLCustomMRU::Clone(IEnumString ** ppenum) +{ + *ppenum = NULL; + return E_NOTIMPL; +} + +STDMETHODIMP CACLCustomMRU::Expand(LPCOLESTR pszExpand) +{ + return E_NOTIMPL; } void CACLCustomMRU::PersistMRU() { + if (!m_bDirty || m_bTypedURLs) + return; + WCHAR Key[2] = { 0, 0 }; - if (!m_bDirty) - return; m_bDirty = false; if (m_Key.m_hKey) @@ -37,14 +87,78 @@ void CACLCustomMRU::PersistMRU() } } +static LSTATUS +RegQueryCStringW(CRegKey& key, LPCWSTR pszValueName, CStringW& str) +{ + // Check type and size + DWORD dwType, cbData; + LSTATUS ret = key.QueryValue(pszValueName, &dwType, NULL, &cbData); + if (ret != ERROR_SUCCESS) + return ret; + if (dwType != REG_SZ && dwType != REG_EXPAND_SZ) + return ERROR_INVALID_DATA; + + // Allocate buffer + LPWSTR pszBuffer = str.GetBuffer(cbData / sizeof(WCHAR) + 1); + if (pszBuffer == NULL) + return ERROR_OUTOFMEMORY; + + // Get the data + ret = key.QueryValue(pszValueName, NULL, pszBuffer, &cbData); + + // Release buffer + str.ReleaseBuffer(); + return ret; +} + +HRESULT CACLCustomMRU::LoadTypedURLs(DWORD dwMax) +{ + dwMax = max(0, dwMax); + dwMax = min(29, dwMax); + + WCHAR szName[32]; + CStringW strData; + LSTATUS status; + for (DWORD i = 1; i <= dwMax; ++i) + { + // Build a registry value name + StringCbPrintfW(szName, sizeof(szName), L"url%lu", i); + + // Read a registry value + status = RegQueryCStringW(m_Key, szName, strData); + if (status != ERROR_SUCCESS) + break; + + m_MRUData.Add(strData); + } + + return S_OK; +} + // *** IACLCustomMRU methods *** HRESULT STDMETHODCALLTYPE CACLCustomMRU::Initialize(LPCWSTR pwszMRURegKey, DWORD dwMax) { + m_ielt = 0; + LSTATUS Status = m_Key.Create(HKEY_CURRENT_USER, pwszMRURegKey); if (Status != ERROR_SUCCESS) return HRESULT_FROM_WIN32(Status); m_MRUData.RemoveAll(); + if (lstrcmpiW(pwszMRURegKey, TYPED_URLS_KEY) == 0) + { + m_bTypedURLs = TRUE; + return LoadTypedURLs(dwMax); + } + else + { + m_bTypedURLs = FALSE; + return LoadMRUList(dwMax); + } +} + +HRESULT CACLCustomMRU::LoadMRUList(DWORD dwMax) +{ dwMax = max(0, dwMax); dwMax = min(29, dwMax); while (dwMax--) @@ -53,7 +167,7 @@ HRESULT STDMETHODCALLTYPE CACLCustomMRU::Initialize(LPCWSTR pwszMRURegKey, DWORD WCHAR MRUList[40]; ULONG nChars = _countof(MRUList); - Status = m_Key.QueryStringValue(L"MRUList", MRUList, &nChars); + LSTATUS Status = m_Key.QueryStringValue(L"MRUList", MRUList, &nChars); if (Status != ERROR_SUCCESS) return S_OK; @@ -92,6 +206,9 @@ HRESULT STDMETHODCALLTYPE CACLCustomMRU::AddMRUString(LPCWSTR pwszEntry) { ATLASSERT(m_MRUData.GetSize() <= m_MRUList.GetLength()); + if (m_bTypedURLs) + return E_FAIL; + m_bDirty = true; CStringW NewElement = pwszEntry; diff --git a/dll/win32/browseui/ACLCustomMRU.h b/dll/win32/browseui/ACLCustomMRU.h index 7aa9c9b2e68..8ea5a8aeb79 100644 --- a/dll/win32/browseui/ACLCustomMRU.h +++ b/dll/win32/browseui/ACLCustomMRU.h @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Custom MRU AutoComplete List * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #pragma once @@ -10,6 +11,8 @@ class CACLCustomMRU : public CComCoClass<CACLCustomMRU, &CLSID_ACLCustomMRU>, public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IEnumString, + public IACList, public IACLCustomMRU { private: @@ -17,16 +20,29 @@ private: CStringW m_MRUList; CSimpleArray<CStringW> m_MRUData; bool m_bDirty; + BOOL m_bTypedURLs; + ULONG m_ielt; void PersistMRU(); + HRESULT LoadTypedURLs(DWORD dwMax); + HRESULT LoadMRUList(DWORD dwMax); public: CACLCustomMRU(); ~CACLCustomMRU(); + // *** IEnumString methods *** + STDMETHODIMP Next(ULONG celt, LPWSTR *rgelt, ULONG *pceltFetched) override; + STDMETHODIMP Skip(ULONG celt) override; + STDMETHODIMP Reset() override; + STDMETHODIMP Clone(IEnumString ** ppenum) override; + + // *** IACList methods *** + STDMETHODIMP Expand(LPCOLESTR pszExpand) override; + // *** IACLCustomMRU methods *** - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCWSTR pwszMRURegKey, DWORD dwMax); - virtual HRESULT STDMETHODCALLTYPE AddMRUString(LPCWSTR pwszEntry); + STDMETHODIMP Initialize(LPCWSTR pwszMRURegKey, DWORD dwMax) override; + STDMETHODIMP AddMRUString(LPCWSTR pwszEntry) override; public: @@ -36,6 +52,8 @@ public: DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CACLCustomMRU) + COM_INTERFACE_ENTRY_IID(IID_IEnumString, IEnumString) + COM_INTERFACE_ENTRY_IID(IID_IACList, IACList) COM_INTERFACE_ENTRY_IID(IID_IACLCustomMRU, IACLCustomMRU) END_COM_MAP() };

4 years, 2 months

[reactos] 02/02: [USETUP] Do a trick to avoid visual "blinking" during screen clearing. (#3255) CORE-17312

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=434fa562cec395fdda203… commit 434fa562cec395fdda203f78f3682958663c1e3b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 2 00:11:32 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 2 00:20:21 2020 +0200 [USETUP] Do a trick to avoid visual "blinking" during screen clearing. (#3255) CORE-17312 Hide everything under the same foreground & background colors, so that the actual color and text blanking reset does not create a visual "blinking". Then, blank the text and finally reset the actual foreground & background colors. We do this because we cannot do the screen scrolling trick that would allow to change both the text and the colors at the same time (the function is currently not available in our console "emulation" layer). --- base/setup/usetup/consup.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index 59e39ea2d7b..2a5336cb5e5 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -235,17 +235,32 @@ CONSOLE_ClearScreen(VOID) coPos.X = 0; coPos.Y = 0; + /* + * Hide everything under the same foreground & background colors, so that + * the actual color and text blanking reset does not create a visual "blinking". + * We do this because we cannot do the screen scrolling trick that would + * allow to change both the text and the colors at the same time (the + * function is currently not available in our console "emulation" layer). + */ FillConsoleOutputAttribute(StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, + FOREGROUND_BLUE | BACKGROUND_BLUE, xScreen * yScreen, coPos, &Written); + /* Blank the text */ FillConsoleOutputCharacterA(StdOutput, ' ', xScreen * yScreen, coPos, &Written); + + /* Reset the actual foreground & background colors */ + FillConsoleOutputAttribute(StdOutput, + FOREGROUND_WHITE | BACKGROUND_BLUE, + xScreen * yScreen, + coPos, + &Written); } VOID

4 years, 2 months

[reactos] 01/02: [USETUP] Minor formatting only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66302e477cbfc18bf8d27… commit 66302e477cbfc18bf8d27aa32291e7bb4e0db08d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 2 00:04:11 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 2 00:04:11 2020 +0200 [USETUP] Minor formatting only. --- base/setup/usetup/consup.c | 304 +++++++++++++++++++++------------------------ base/setup/usetup/consup.h | 25 ++-- 2 files changed, 155 insertions(+), 174 deletions(-) diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index 84ef416ed7f..59e39ea2d7b 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -42,8 +42,7 @@ SHORT yScreen = 0; /* FUNCTIONS *****************************************************************/ BOOLEAN -CONSOLE_Init( - VOID) +CONSOLE_Init(VOID) { CONSOLE_SCREEN_BUFFER_INFO csbi; if (!AllocConsole()) @@ -108,12 +107,11 @@ CONSOLE_ConOutChar( { DWORD Written; - WriteConsole( - StdOutput, - &c, - 1, - &Written, - NULL); + WriteConsole(StdOutput, + &c, + 1, + &Written, + NULL); } VOID @@ -122,18 +120,16 @@ CONSOLE_ConOutPuts( { DWORD Written; - WriteConsole( - StdOutput, - szText, - (ULONG)strlen(szText), - &Written, - NULL); - WriteConsole( - StdOutput, - "\n", - 1, - &Written, - NULL); + WriteConsole(StdOutput, + szText, + (ULONG)strlen(szText), + &Written, + NULL); + WriteConsole(StdOutput, + "\n", + 1, + &Written, + NULL); } VOID @@ -146,12 +142,11 @@ CONSOLE_ConOutPrintfV( vsprintf(szOut, szFormat, args); - WriteConsole( - StdOutput, - szOut, - (ULONG)strlen(szOut), - &dwWritten, - NULL); + WriteConsole(StdOutput, + szOut, + (ULONG)strlen(szOut), + &dwWritten, + NULL); } VOID @@ -175,8 +170,8 @@ CONSOLE_Flush(VOID) VOID CONSOLE_GetCursorXY( - PSHORT x, - PSHORT y) + OUT PSHORT x, + OUT PSHORT y) { CONSOLE_SCREEN_BUFFER_INFO csbi; @@ -240,19 +235,17 @@ CONSOLE_ClearScreen(VOID) coPos.X = 0; coPos.Y = 0; - FillConsoleOutputAttribute( - StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, - xScreen * yScreen, - coPos, - &Written); + FillConsoleOutputAttribute(StdOutput, + FOREGROUND_WHITE | BACKGROUND_BLUE, + xScreen * yScreen, + coPos, + &Written); - FillConsoleOutputCharacterA( - StdOutput, - ' ', - xScreen * yScreen, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + ' ', + xScreen * yScreen, + coPos, + &Written); } VOID @@ -269,12 +262,11 @@ CONSOLE_InvertTextXY( { coPos.X = x; - FillConsoleOutputAttribute( - StdOutput, - FOREGROUND_BLUE | BACKGROUND_WHITE, - col, - coPos, - &Written); + FillConsoleOutputAttribute(StdOutput, + FOREGROUND_BLUE | BACKGROUND_WHITE, + col, + coPos, + &Written); } } @@ -292,12 +284,11 @@ CONSOLE_NormalTextXY( { coPos.X = x; - FillConsoleOutputAttribute( - StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, - col, - coPos, - &Written); + FillConsoleOutputAttribute(StdOutput, + FOREGROUND_WHITE | BACKGROUND_BLUE, + col, + coPos, + &Written); } } @@ -313,12 +304,11 @@ CONSOLE_SetTextXY( coPos.X = x; coPos.Y = y; - WriteConsoleOutputCharacterA( - StdOutput, - Text, - (ULONG)strlen(Text), - coPos, - &Written); + WriteConsoleOutputCharacterA(StdOutput, + Text, + (ULONG)strlen(Text), + coPos, + &Written); } VOID @@ -357,29 +347,26 @@ CONSOLE_SetInputTextXY( if (Length > len - 1) Length = len - 1; - FillConsoleOutputAttribute( - StdOutput, - BACKGROUND_WHITE, - len, - coPos, - &Written); + FillConsoleOutputAttribute(StdOutput, + BACKGROUND_WHITE, + len, + coPos, + &Written); - WriteConsoleOutputCharacterW( - StdOutput, - Text, - (ULONG)Length, - coPos, - &Written); + WriteConsoleOutputCharacterW(StdOutput, + Text, + (ULONG)Length, + coPos, + &Written); coPos.X += Length; if (len > Length) { - FillConsoleOutputCharacterA( - StdOutput, - ' ', - len - Length, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + ' ', + len - Length, + coPos, + &Written); } } @@ -398,20 +385,18 @@ CONSOLE_SetUnderlinedTextXY( Length = (ULONG)strlen(Text); - WriteConsoleOutputCharacterA( - StdOutput, - Text, - Length, - coPos, - &Written); + WriteConsoleOutputCharacterA(StdOutput, + Text, + Length, + coPos, + &Written); coPos.Y++; - FillConsoleOutputCharacterA( - StdOutput, - 0xCD, - Length, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xCD, + Length, + coPos, + &Written); } VOID @@ -429,28 +414,25 @@ CONSOLE_SetStatusTextXV( coPos.X = 0; coPos.Y = yScreen - 1; - FillConsoleOutputAttribute( - StdOutput, - BACKGROUND_WHITE, - xScreen, - coPos, - &Written); + FillConsoleOutputAttribute(StdOutput, + BACKGROUND_WHITE, + xScreen, + coPos, + &Written); - FillConsoleOutputCharacterA( - StdOutput, - ' ', - xScreen, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + ' ', + xScreen, + coPos, + &Written); coPos.X = x; - WriteConsoleOutputCharacterA( - StdOutput, - Buffer, - (ULONG)strlen(Buffer), - coPos, - &Written); + WriteConsoleOutputCharacterA(StdOutput, + Buffer, + (ULONG)strlen(Buffer), + coPos, + &Written); } VOID @@ -490,8 +472,9 @@ CONSOLE_SetStatusText( static VOID -CONSOLE_ClearStatusTextX(IN SHORT x, - IN SHORT Length) +CONSOLE_ClearStatusTextX( + IN SHORT x, + IN SHORT Length) { COORD coPos; DWORD Written; @@ -506,12 +489,12 @@ CONSOLE_ClearStatusTextX(IN SHORT x, &Written); } - VOID __cdecl CONSOLE_SetStatusTextAutoFitX( IN SHORT x, - IN LPCSTR fmt, ...) + IN LPCSTR fmt, + ...) { CHAR Buffer[128]; DWORD Length; @@ -525,11 +508,11 @@ CONSOLE_SetStatusTextAutoFitX( if (Length + x <= 79) { - CONSOLE_SetStatusTextX (x , Buffer); + CONSOLE_SetStatusTextX(x , Buffer); } else { - CONSOLE_SetStatusTextX (79 - Length , Buffer); + CONSOLE_SetStatusTextX(79 - Length , Buffer); } } @@ -548,19 +531,17 @@ CONSOLE_SetInvertedTextXY( Length = (ULONG)strlen(Text); - FillConsoleOutputAttribute( - StdOutput, - FOREGROUND_BLUE | BACKGROUND_WHITE, - Length, - coPos, - &Written); + FillConsoleOutputAttribute(StdOutput, + FOREGROUND_BLUE | BACKGROUND_WHITE, + Length, + coPos, + &Written); - WriteConsoleOutputCharacterA( - StdOutput, - Text, - Length, - coPos, - &Written); + WriteConsoleOutputCharacterA(StdOutput, + Text, + Length, + coPos, + &Written); } VOID @@ -578,19 +559,17 @@ CONSOLE_SetHighlightedTextXY( Length = (ULONG)strlen(Text); - FillConsoleOutputAttribute( - StdOutput, - FOREGROUND_WHITE | FOREGROUND_INTENSITY | BACKGROUND_BLUE, - Length, - coPos, - &Written); + FillConsoleOutputAttribute(StdOutput, + FOREGROUND_WHITE | FOREGROUND_INTENSITY | BACKGROUND_BLUE, + Length, + coPos, + &Written); - WriteConsoleOutputCharacterA( - StdOutput, - Text, - Length, - coPos, - &Written); + WriteConsoleOutputCharacterA(StdOutput, + Text, + Length, + coPos, + &Written); } VOID @@ -598,7 +577,8 @@ __cdecl CONSOLE_PrintTextXY( IN SHORT x, IN SHORT y, - IN LPCSTR fmt, ...) + IN LPCSTR fmt, + ...) { CHAR buffer[512]; va_list ap; @@ -612,12 +592,11 @@ CONSOLE_PrintTextXY( coPos.X = x; coPos.Y = y; - WriteConsoleOutputCharacterA( - StdOutput, - buffer, - (ULONG)strlen(buffer), - coPos, - &Written); + WriteConsoleOutputCharacterA(StdOutput, + buffer, + (ULONG)strlen(buffer), + coPos, + &Written); } VOID @@ -626,7 +605,8 @@ CONSOLE_PrintTextXYN( IN SHORT x, IN SHORT y, IN SHORT len, - IN LPCSTR fmt, ...) + IN LPCSTR fmt, + ...) { CHAR buffer[512]; va_list ap; @@ -645,23 +625,21 @@ CONSOLE_PrintTextXYN( if (Length > len - 1) Length = len - 1; - WriteConsoleOutputCharacterA( - StdOutput, - buffer, - Length, - coPos, - &Written); + WriteConsoleOutputCharacterA(StdOutput, + buffer, + Length, + coPos, + &Written); coPos.X += Length; if (len > Length) { - FillConsoleOutputCharacterA( - StdOutput, - ' ', - len - Length, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + ' ', + len - Length, + coPos, + &Written); } } @@ -693,7 +671,7 @@ CONSOLE_SetStyledText( if (Flags & TEXT_ALIGN_CENTER) { - coPos.X = (xScreen - Length) /2; + coPos.X = (xScreen - Length) / 2; } else if(Flags & TEXT_ALIGN_RIGHT) { @@ -749,12 +727,12 @@ CONSOLE_SetStyledText( } } - VOID -CONSOLE_ClearStyledText(IN SHORT x, - IN SHORT y, - IN INT Flags, - IN SHORT Length) +CONSOLE_ClearStyledText( + IN SHORT x, + IN SHORT y, + IN INT Flags, + IN SHORT Length) { COORD coPos; @@ -774,7 +752,7 @@ CONSOLE_ClearStyledText(IN SHORT x, if (Flags & TEXT_ALIGN_CENTER) { - coPos.X = (xScreen - Length) /2; + coPos.X = (xScreen - Length) / 2; } else if(Flags & TEXT_ALIGN_RIGHT) { diff --git a/base/setup/usetup/consup.h b/base/setup/usetup/consup.h index a14e3b10f7d..b87513cad24 100644 --- a/base/setup/usetup/consup.h +++ b/base/setup/usetup/consup.h @@ -54,8 +54,7 @@ extern HANDLE StdInput, StdOutput; extern SHORT xScreen, yScreen; BOOLEAN -CONSOLE_Init( - VOID); +CONSOLE_Init(VOID); VOID CONSOLE_ClearScreen(VOID); @@ -92,8 +91,8 @@ CONSOLE_Flush(VOID); VOID CONSOLE_GetCursorXY( - PSHORT x, - PSHORT y); + OUT PSHORT x, + OUT PSHORT y); SHORT CONSOLE_GetCursorX(VOID); @@ -120,7 +119,8 @@ __cdecl CONSOLE_PrintTextXY( IN SHORT x, IN SHORT y, - IN LPCSTR fmt, ...); + IN LPCSTR fmt, + ...); VOID __cdecl @@ -128,7 +128,8 @@ CONSOLE_PrintTextXYN( IN SHORT x, IN SHORT y, IN SHORT len, - IN LPCSTR fmt, ...); + IN LPCSTR fmt, + ...); VOID CONSOLE_SetCursorType( @@ -192,7 +193,8 @@ VOID __cdecl CONSOLE_SetStatusTextAutoFitX( IN SHORT x, - IN LPCSTR fmt, ...); + IN LPCSTR fmt, + ...); VOID CONSOLE_SetTextXY( @@ -220,9 +222,10 @@ CONSOLE_SetStyledText( IN LPCSTR Text); VOID -CONSOLE_ClearStyledText(IN SHORT x, - IN SHORT y, - IN INT Flags, - IN SHORT Length); +CONSOLE_ClearStyledText( + IN SHORT x, + IN SHORT y, + IN INT Flags, + IN SHORT Length); /* EOF */

4 years, 2 months

[reactos] 01/01: [COMCTL32] Fix wrong behavior about Tab key

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0733d96d9d90337c9c053… commit 0733d96d9d90337c9c0537c0406650c9aa429ab7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 1 22:53:59 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 1 22:53:59 2020 +0900 [COMCTL32] Fix wrong behavior about Tab key Pressing Tab key should focus next dialog item. Fix 0a8fb87 and 3f30b1e. CORE-3479 --- dll/win32/comctl32/ipaddress.c | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/dll/win32/comctl32/ipaddress.c b/dll/win32/comctl32/ipaddress.c index ece99e9a5d7..42a016b55fe 100644 --- a/dll/win32/comctl32/ipaddress.c +++ b/dll/win32/comctl32/ipaddress.c @@ -563,26 +563,6 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; } break; -#ifdef __REACTOS__ - case VK_TAB: - if (GetKeyState(VK_SHIFT) < 0) - { - /* Shift+Tab */ - if (index == 0) - SetFocus(GetNextDlgTabItem(GetParent(infoPtr->Self), infoPtr->Self, TRUE)); - else - IPADDRESS_GotoNextField(infoPtr, index - 2, POS_SELALL); - } - else - { - /* Tab */ - if (index == 3) - SetFocus(GetNextDlgTabItem(GetParent(infoPtr->Self), infoPtr->Self, FALSE)); - else - IPADDRESS_GotoNextField(infoPtr, index, POS_SELALL); - } - break; -#endif } break; case WM_KILLFOCUS: @@ -593,14 +573,6 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (IPADDRESS_GetPartIndex(infoPtr, (HWND)wParam) < 0) IPADDRESS_Notify(infoPtr, EN_SETFOCUS); break; -#ifdef __REACTOS__ - case WM_GETDLGCODE: - { - LRESULT result = CallWindowProcW(part->OrigProc, hwnd, uMsg, wParam, lParam); - result |= DLGC_WANTALLKEYS | DLGC_WANTCHARS | DLGC_WANTTAB; - return result; - } -#endif } return CallWindowProcW (part->OrigProc, hwnd, uMsg, wParam, lParam); } @@ -631,9 +603,9 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return IPADDRESS_Paint (infoPtr, (HDC)wParam); #ifdef __REACTOS__ - case WM_SETFOCUS: - IPADDRESS_GotoNextField(infoPtr, -1, POS_SELALL); - return 0; + case WM_SETFOCUS: + IPADDRESS_GotoNextField(infoPtr, -1, POS_SELALL); + return 0; #endif case WM_COMMAND: switch(wParam >> 16) {

4 years, 2 months

[reactos] 01/01: [NTOS:MM] Fix paged pool initialization on x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d17a7590d706ac88dd6d… commit 3d17a7590d706ac88dd6d7997f2cbecc873e9405 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 4 19:20:20 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 1 11:24:42 2020 +0200 [NTOS:MM] Fix paged pool initialization on x64 --- ntoskrnl/mm/ARM3/mminit.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index b83588a4cca..0bae38e3e02 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -1755,7 +1755,7 @@ MiBuildPagedPool(VOID) MMPDE TempPde = ValidKernelPde; PFN_NUMBER PageFrameIndex; KIRQL OldIrql; - SIZE_T Size; + SIZE_T Size, NumberOfPages, NumberOfPdes; ULONG BitMapSize; #if (_MI_PAGING_LEVELS >= 3) MMPPE TempPpe = ValidKernelPpe; @@ -1814,17 +1814,17 @@ MiBuildPagedPool(VOID) // Size = MmSizeOfPagedPoolInBytes; if (Size < MI_MIN_INIT_PAGED_POOLSIZE) Size = MI_MIN_INIT_PAGED_POOLSIZE; - Size = BYTES_TO_PAGES(Size); + NumberOfPages = BYTES_TO_PAGES(Size); // - // Now check how many PTEs will be required for these many pages. + // Now check how many PDEs will be required for these many pages. // - Size = (Size + (1024 - 1)) / 1024; + NumberOfPdes = (NumberOfPages + (PTE_PER_PAGE - 1)) / PTE_PER_PAGE; // - // Recompute the page-aligned size of the paged pool, in bytes and pages. + // Recompute the PDE-aligned size of the paged pool, in bytes and pages. // - MmSizeOfPagedPoolInBytes = Size * PAGE_SIZE * 1024; + MmSizeOfPagedPoolInBytes = NumberOfPdes * PTE_PER_PAGE * PAGE_SIZE; MmSizeOfPagedPoolInPages = MmSizeOfPagedPoolInBytes >> PAGE_SHIFT; #ifdef _M_IX86 @@ -1860,6 +1860,9 @@ MiBuildPagedPool(VOID) /* It is not, so map a fresh zeroed page */ TempPpe.u.Hard.PageFrameNumber = MiRemoveZeroPage(0); MI_WRITE_VALID_PPE(PointerPpe, TempPpe); + MiInitializePfnForOtherProcess(TempPpe.u.Hard.PageFrameNumber, + (PMMPTE)PointerPpe, + PFN_FROM_PTE(MiAddressToPte(PointerPpe))); } } #endif @@ -1921,10 +1924,10 @@ MiBuildPagedPool(VOID) // // We'll also allocate the bitmap header itself part of the same buffer. // - Size = Size * 1024; - ASSERT(Size == MmSizeOfPagedPoolInPages); - BitMapSize = (ULONG)Size; - Size = sizeof(RTL_BITMAP) + (((Size + 31) / 32) * sizeof(ULONG)); + NumberOfPages = NumberOfPdes * PTE_PER_PAGE; + ASSERT(NumberOfPages == MmSizeOfPagedPoolInPages); + BitMapSize = (ULONG)NumberOfPages; + Size = sizeof(RTL_BITMAP) + (((BitMapSize + 31) / 32) * sizeof(ULONG)); // // Allocate the allocation bitmap, which tells us which regions have not yet @@ -1943,7 +1946,7 @@ MiBuildPagedPool(VOID) (PULONG)(MmPagedPoolInfo.PagedPoolAllocationMap + 1), BitMapSize); RtlSetAllBits(MmPagedPoolInfo.PagedPoolAllocationMap); - RtlClearBits(MmPagedPoolInfo.PagedPoolAllocationMap, 0, 1024); + RtlClearBits(MmPagedPoolInfo.PagedPoolAllocationMap, 0, PTE_PER_PAGE); // // We have a second bitmap, which keeps track of where allocations end.

4 years, 2 months

[reactos] 01/01: [UMPNPMGR][USETUP] Fix the way device-install events are queued and dequeued. Fixes CORE-16103.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffc96d26ec297a6f9feec… commit ffc96d26ec297a6f9feec7c1e526efefa08809e0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Sep 28 22:38:55 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Oct 1 01:52:09 2020 +0200 [UMPNPMGR][USETUP] Fix the way device-install events are queued and dequeued. Fixes CORE-16103. Dedicated to the hard work of Joachim Henze! xD This reverts part of commit 043a98dd (see also commit b2aeafca). Contrary to what I assumed in commit 043a98dd (and was also assumed in the older commit b2aeafca), we cannot use the singled-linked lists to queue and dequeue the PnP device-install events, because: - the events must be treated from the oldest to the newest ones, for consistency, otherwise this creates problems, as shown by e.g. CORE-16103; - the system singled-linked lists only offer access to the top of the list (like a stack) instead of to both the top and the bottom of the list, as would be required for a queue. Using the SLISTs would mean that only the newest-received events would be treated first, while the oldest (which were the first received) events would be treated last, and this is wrong. Therefore one must use e.g. the standard doubly-linked list. Also, using locked operations (insertion & removal) on the list of device-install events is necessary, because these operations are done concurrently by two different threads: PnpEventThread() and DeviceInstallThread(). Since the interlocked linked list functions are not available in user-mode, we need to use instead locking access through e.g. a mutex. --- base/services/umpnpmgr/install.c | 14 ++++++--- base/services/umpnpmgr/precomp.h | 8 +++-- base/services/umpnpmgr/umpnpmgr.c | 38 +++++++++++++++++------- base/setup/usetup/devinst.c | 61 ++++++++++++++++++++++++++++----------- 4 files changed, 86 insertions(+), 35 deletions(-) diff --git a/base/services/umpnpmgr/install.c b/base/services/umpnpmgr/install.c index 4c876e490ef..80ef8258900 100644 --- a/base/services/umpnpmgr/install.c +++ b/base/services/umpnpmgr/install.c @@ -22,7 +22,7 @@ * FILE: base/services/umpnpmgr/install.c * PURPOSE: Device installer * PROGRAMMER: Eric Kohl (eric.kohl(a)reactos.org) - * Herv� Poussineau (hpoussin(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) * Colin Finck (colin(a)reactos.org) */ @@ -40,7 +40,9 @@ HANDLE hUserToken = NULL; HANDLE hInstallEvent = NULL; HANDLE hNoPendingInstalls = NULL; -SLIST_HEADER DeviceInstallListHead; +/* Device-install event list */ +HANDLE hDeviceInstallListMutex; +LIST_ENTRY DeviceInstallListHead; HANDLE hDeviceInstallListNotEmpty; @@ -354,7 +356,7 @@ DWORD WINAPI DeviceInstallThread(LPVOID lpParameter) { - PSLIST_ENTRY ListEntry; + PLIST_ENTRY ListEntry; DeviceInstallParams* Params; BOOL showWizard; @@ -366,7 +368,11 @@ DeviceInstallThread(LPVOID lpParameter) while (TRUE) { - ListEntry = InterlockedPopEntrySList(&DeviceInstallListHead); + /* Dequeue the next oldest device-install event */ + WaitForSingleObject(hDeviceInstallListMutex, INFINITE); + ListEntry = (IsListEmpty(&DeviceInstallListHead) + ? NULL : RemoveHeadList(&DeviceInstallListHead)); + ReleaseMutex(hDeviceInstallListMutex); if (ListEntry == NULL) { diff --git a/base/services/umpnpmgr/precomp.h b/base/services/umpnpmgr/precomp.h index f7d7b4f9f72..d24a760884a 100644 --- a/base/services/umpnpmgr/precomp.h +++ b/base/services/umpnpmgr/precomp.h @@ -35,8 +35,8 @@ typedef struct { - SLIST_ENTRY ListEntry; - WCHAR DeviceIds[1]; + LIST_ENTRY ListEntry; + WCHAR DeviceIds[ANYSIZE_ARRAY]; } DeviceInstallParams; /* install.c */ @@ -45,7 +45,9 @@ extern HANDLE hUserToken; extern HANDLE hInstallEvent; extern HANDLE hNoPendingInstalls; -extern SLIST_HEADER DeviceInstallListHead; +/* Device-install event list */ +extern HANDLE hDeviceInstallListMutex; +extern LIST_ENTRY DeviceInstallListHead; extern HANDLE hDeviceInstallListNotEmpty; BOOL diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index 0195f73813c..826efbde66b 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -104,13 +104,18 @@ PnpEventThread(LPVOID lpParameter) DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds); if (DeviceIdLength) { - /* Queue device install (will be dequeued by DeviceInstallThread) */ + /* Allocate a new device-install event */ len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1) * sizeof(WCHAR); Params = HeapAlloc(GetProcessHeap(), 0, len); if (Params) { wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds); - InterlockedPushEntrySList(&DeviceInstallListHead, &Params->ListEntry); + + /* Queue the event (will be dequeued by DeviceInstallThread) */ + WaitForSingleObject(hDeviceInstallListMutex, INFINITE); + InsertTailList(&DeviceInstallListHead, &Params->ListEntry); + ReleaseMutex(hDeviceInstallListMutex); + SetEvent(hDeviceInstallListNotEmpty); } } @@ -413,26 +418,37 @@ InitializePnPManager(VOID) return dwError; } + hNoPendingInstalls = CreateEventW(NULL, + TRUE, + FALSE, + L"Global\\PnP_No_Pending_Install_Events"); + if (hNoPendingInstalls == NULL) + { + dwError = GetLastError(); + DPRINT1("Could not create the Pending-Install Event! (Error %lu)\n", dwError); + return dwError; + } + + /* + * Initialize the device-install event list + */ + hDeviceInstallListNotEmpty = CreateEventW(NULL, FALSE, FALSE, NULL); if (hDeviceInstallListNotEmpty == NULL) { dwError = GetLastError(); - DPRINT1("Could not create the Event! (Error %lu)\n", dwError); + DPRINT1("Could not create the List Event! (Error %lu)\n", dwError); return dwError; } - hNoPendingInstalls = CreateEventW(NULL, - TRUE, - FALSE, - L"Global\\PnP_No_Pending_Install_Events"); - if (hNoPendingInstalls == NULL) + hDeviceInstallListMutex = CreateMutexW(NULL, FALSE, NULL); + if (hDeviceInstallListMutex == NULL) { dwError = GetLastError(); - DPRINT1("Could not create the Event! (Error %lu)\n", dwError); + DPRINT1("Could not create the List Mutex! (Error %lu)\n", dwError); return dwError; } - - InitializeSListHead(&DeviceInstallListHead); + InitializeListHead(&DeviceInstallListHead); /* Query the SuppressUI registry value and cache it for our whole lifetime */ GetBooleanRegValue(HKEY_LOCAL_MACHINE, diff --git a/base/setup/usetup/devinst.c b/base/setup/usetup/devinst.c index d9fc5c2a576..c9ca64dc949 100644 --- a/base/setup/usetup/devinst.c +++ b/base/setup/usetup/devinst.c @@ -25,12 +25,14 @@ static HANDLE hNoPendingInstalls = NULL; static HANDLE hPnpThread = NULL; static HANDLE hDeviceInstallThread = NULL; -static SLIST_HEADER DeviceInstallListHead; +/* Device-install event list */ +static HANDLE hDeviceInstallListMutex = NULL; +static LIST_ENTRY DeviceInstallListHead; static HANDLE hDeviceInstallListNotEmpty = NULL; typedef struct { - SLIST_ENTRY ListEntry; + LIST_ENTRY ListEntry; WCHAR DeviceIds[ANYSIZE_ARRAY]; } DeviceInstallParams; @@ -363,13 +365,17 @@ static ULONG NTAPI DeviceInstallThread(IN PVOID Parameter) { HINF hSetupInf = *(HINF*)Parameter; - PSLIST_ENTRY ListEntry; + PLIST_ENTRY ListEntry; DeviceInstallParams* Params; LARGE_INTEGER Timeout; for (;;) { - ListEntry = RtlInterlockedPopEntrySList(&DeviceInstallListHead); + /* Dequeue the next oldest device-install event */ + NtWaitForSingleObject(hDeviceInstallListMutex, FALSE, NULL); + ListEntry = (IsListEmpty(&DeviceInstallListHead) + ? NULL : RemoveHeadList(&DeviceInstallListHead)); + NtReleaseMutant(hDeviceInstallListMutex, NULL); if (ListEntry == NULL) { @@ -454,18 +460,23 @@ PnpEventThread(IN PVOID Parameter) ULONG len; ULONG DeviceIdLength; - DPRINT("Device enumerated event: %S\n", PnpEvent->TargetDevice.DeviceIds); + DPRINT("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds); DeviceIdLength = wcslen(PnpEvent->TargetDevice.DeviceIds); if (DeviceIdLength) { - /* Queue device install (will be dequeued by DeviceInstallThread) */ + /* Allocate a new device-install event */ len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1) * sizeof(WCHAR); Params = RtlAllocateHeap(ProcessHeap, 0, len); if (Params) { wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds); - RtlInterlockedPushEntrySList(&DeviceInstallListHead, &Params->ListEntry); + + /* Queue the event (will be dequeued by DeviceInstallThread) */ + NtWaitForSingleObject(hDeviceInstallListMutex, FALSE, NULL); + InsertTailList(&DeviceInstallListHead, &Params->ListEntry); + NtReleaseMutant(hDeviceInstallListMutex, NULL); + NtSetEvent(hDeviceInstallListNotEmpty, NULL); } else @@ -559,29 +570,41 @@ InitializeUserModePnpManager( UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum"); UNICODE_STRING ServicesU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); - Status = NtCreateEvent(&hDeviceInstallListNotEmpty, + Status = NtCreateEvent(&hNoPendingInstalls, EVENT_ALL_ACCESS, NULL, - SynchronizationEvent, + NotificationEvent, FALSE); if (!NT_SUCCESS(Status)) { - DPRINT1("Could not create the event! (Status 0x%08lx)\n", Status); + DPRINT1("Could not create the Pending-Install Event! (Status 0x%08lx)\n", Status); goto Failure; } - Status = NtCreateEvent(&hNoPendingInstalls, + /* + * Initialize the device-install event list + */ + + Status = NtCreateEvent(&hDeviceInstallListNotEmpty, EVENT_ALL_ACCESS, NULL, - NotificationEvent, + SynchronizationEvent, FALSE); if (!NT_SUCCESS(Status)) { - DPRINT1("Could not create the event! (Status 0x%08lx)\n", Status); + DPRINT1("Could not create the List Event! (Status 0x%08lx)\n", Status); goto Failure; } - RtlInitializeSListHead(&DeviceInstallListHead); + Status = NtCreateMutant(&hDeviceInstallListMutex, + MUTANT_ALL_ACCESS, + NULL, FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not create the List Mutex! (Status 0x%08lx)\n", Status); + goto Failure; + } + InitializeListHead(&DeviceInstallListHead); InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = NtOpenKey(&hEnumKey, KEY_QUERY_VALUE, &ObjectAttributes); @@ -653,14 +676,18 @@ Failure: NtClose(hEnumKey); hEnumKey = NULL; - if (hNoPendingInstalls) - NtClose(hNoPendingInstalls); - hNoPendingInstalls = NULL; + if (hDeviceInstallListMutex) + NtClose(hDeviceInstallListMutex); + hDeviceInstallListMutex = NULL; if (hDeviceInstallListNotEmpty) NtClose(hDeviceInstallListNotEmpty); hDeviceInstallListNotEmpty = NULL; + if (hNoPendingInstalls) + NtClose(hNoPendingInstalls); + hNoPendingInstalls = NULL; + return Status; }

4 years, 2 months

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 October 2020