Ros-diffs March 2021

ros-diffs@reactos.org

15 participants
161 discussions

[reactos] 01/01: [NTOS:MM] Fix compilation when PFN tracing is enabled
by Jérôme Gardou 30 Mar '21

30 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c731adc041e611622c2d… commit 4c731adc041e611622c2dbb39cd67d49bd48ed19 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Feb 11 18:15:25 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Mar 30 17:22:09 2021 +0200 [NTOS:MM] Fix compilation when PFN tracing is enabled --- ntoskrnl/mm/freelist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ntoskrnl/mm/freelist.c b/ntoskrnl/mm/freelist.c index b00cf1fbc04..69b8b6d1e96 100644 --- a/ntoskrnl/mm/freelist.c +++ b/ntoskrnl/mm/freelist.c @@ -613,7 +613,6 @@ MmAllocPage(ULONG Type) #if MI_TRACE_PFNS switch(Type) { - case MC_CACHE: case MC_SYSTEM: MI_SET_USAGE(MI_USAGE_CACHE); break;

1 0

[reactos] 01/01: [KDGDB] Break and ignore when being prompted.
by Jérôme Gardou 30 Mar '21

30 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10379811c0e871e2829c7… commit 10379811c0e871e2829c76da96dabadbb1c9718b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 10 12:26:31 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Mar 30 17:20:57 2021 +0200 [KDGDB] Break and ignore when being prompted. --- drivers/base/kdgdb/kdpacket.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/base/kdgdb/kdpacket.c b/drivers/base/kdgdb/kdpacket.c index fe776eef55e..dfe4ee7f261 100644 --- a/drivers/base/kdgdb/kdpacket.c +++ b/drivers/base/kdgdb/kdpacket.c @@ -378,10 +378,12 @@ KdReceivePacket( if (PacketType == PACKET_TYPE_KD_DEBUG_IO) { + static BOOLEAN ignore = 0; KDDBGPRINT("Debug prompt.\n"); - /* HACK ! RtlAssert asks for (boipt), always say "o" --> break once. */ + /* HACK ! Debug prompt asks for break or ignore. First break, then ignore. */ MessageData->Length = 1; - MessageData->Buffer[0] = 'o'; + MessageData->Buffer[0] = ignore ? 'i' : 'b'; + ignore = !ignore; return KdPacketReceived; }

1 0

[reactos] 01/01: [NTOS/MM] Remove an outdated check
by Jérôme Gardou 30 Mar '21

30 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80f8beeeeea3fe5a61fdc… commit 80f8beeeeea3fe5a61fdc09d403b8203a6cde345 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Oct 22 15:26:21 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Mar 30 17:13:19 2021 +0200 [NTOS/MM] Remove an outdated check --- ntoskrnl/mm/marea.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index 6e4226b6c35..92eebc173cb 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -588,9 +588,6 @@ MmDeleteProcessAddressSpace(PEPROCESS Process) #endif MmLockAddressSpace(&Process->Vm); - /* There should not be any memory areas left! */ - ASSERT(Process->Vm.WorkingSetExpansionLinks.Flink == NULL); - #if (_MI_PAGING_LEVELS == 2) { KIRQL OldIrql;

1 0

[reactos] 01/01: [NTOS:MM] Fix PFN tracing
by Jérôme Gardou 30 Mar '21

30 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0187c1e11394095ca644d… commit 0187c1e11394095ca644d5cf622737cb3bca6f14 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Mar 30 16:20:25 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Mar 30 16:26:43 2021 +0200 [NTOS:MM] Fix PFN tracing --- ntoskrnl/cc/view.c | 19 ------------------- ntoskrnl/include/internal/mm.h | 42 +++++++++++++++++++++++++++++++++++++++++- ntoskrnl/mm/ARM3/mminit.c | 4 ++-- ntoskrnl/mm/ARM3/pagfault.c | 9 +++++++++ ntoskrnl/mm/ARM3/pfnlist.c | 13 ++++++------- ntoskrnl/mm/ARM3/sysldr.c | 9 +-------- ntoskrnl/mm/freelist.c | 15 +++++++++++++++ ntoskrnl/mm/section.c | 6 ------ 8 files changed, 74 insertions(+), 43 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 6481c340fe0..cb99d809a5d 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -806,25 +806,6 @@ Retry: InsertTailList(&VacbLruListHead, &current->VacbLruListEntry); KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); - MI_SET_USAGE(MI_USAGE_CACHE); -#if MI_TRACE_PFNS - if ((SharedCacheMap->FileObject) && (SharedCacheMap->FileObject->FileName.Buffer)) - { - PWCHAR pos; - ULONG len = 0; - pos = wcsrchr(SharedCacheMap->FileObject->FileName.Buffer, '\\'); - if (pos) - { - len = wcslen(pos) * sizeof(WCHAR); - snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); - } - else - { - snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%wZ", &SharedCacheMap->FileObject->FileName); - } - } -#endif - /* Reference it to allow release */ CcRosVacbIncRefCount(current); diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index a661aa469f3..074dbd4e454 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -245,9 +245,45 @@ MM_RMAP_ENTRY, *PMM_RMAP_ENTRY; extern ULONG MI_PFN_CURRENT_USAGE; extern CHAR MI_PFN_CURRENT_PROCESS_NAME[16]; #define MI_SET_USAGE(x) MI_PFN_CURRENT_USAGE = x -#define MI_SET_PROCESS2(x) memcpy(MI_PFN_CURRENT_PROCESS_NAME, x, 16) +#define MI_SET_PROCESS2(x) memcpy(MI_PFN_CURRENT_PROCESS_NAME, x, min(sizeof(x), sizeof(MI_PFN_CURRENT_PROCESS_NAME))) +FORCEINLINE +void +MI_SET_PROCESS(PEPROCESS Process) +{ + if (!Process) + MI_SET_PROCESS2("Kernel"); + else if (Process == (PEPROCESS)1) + MI_SET_PROCESS2("Hydra"); + else + MI_SET_PROCESS2(Process->ImageFileName); +} + +FORCEINLINE +void +MI_SET_PROCESS_USTR(PUNICODE_STRING ustr) +{ + PWSTR pos, strEnd; + int i; + + if (!ustr->Buffer || ustr->Length == 0) + { + MI_PFN_CURRENT_PROCESS_NAME[0] = 0; + return; + } + + pos = strEnd = &ustr->Buffer[ustr->Length / sizeof(WCHAR)]; + while ((*pos != L'\\') && (pos > ustr->Buffer)) + pos--; + + if (*pos == L'\\') + pos++; + + for (i = 0; i < sizeof(MI_PFN_CURRENT_PROCESS_NAME) && pos <= strEnd; i++, pos++) + MI_PFN_CURRENT_PROCESS_NAME[i] = (CHAR)*pos; +} #else #define MI_SET_USAGE(x) +#define MI_SET_PROCESS(x) #define MI_SET_PROCESS2(x) #endif @@ -275,6 +311,9 @@ typedef enum _MI_PFN_USAGES MI_USAGE_PFN_DATABASE, MI_USAGE_BOOT_DRIVER, MI_USAGE_INIT_MEMORY, + MI_USAGE_PAGE_FILE, + MI_USAGE_COW, + MI_USAGE_WSLE, MI_USAGE_FREE_PAGE } MI_PFN_USAGES; @@ -355,6 +394,7 @@ typedef struct _MMPFN #if MI_TRACE_PFNS MI_PFN_USAGES PfnUsage; CHAR ProcessName[16]; +#define MI_SET_PFN_PROCESS_NAME(pfn, x) memcpy(pfn->ProcessName, x, min(sizeof(x), sizeof(pfn->ProcessName))) #endif // HACK until WS lists are supported diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index 64e2193a558..9b18537f3ac 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -801,7 +801,7 @@ MiBuildPfnDatabaseFromPages(IN PLOADER_PARAMETER_BLOCK LoaderBlock) Pfn1->u3.e1.CacheAttribute = MiNonCached; #if MI_TRACE_PFNS Pfn1->PfnUsage = MI_USAGE_INIT_MEMORY; - memcpy(Pfn1->ProcessName, "Initial PDE", 16); + MI_SET_PFN_PROCESS_NAME(Pfn1, "Initial PDE"); #endif } else @@ -848,7 +848,7 @@ MiBuildPfnDatabaseFromPages(IN PLOADER_PARAMETER_BLOCK LoaderBlock) Pfn2->u3.e1.CacheAttribute = MiNonCached; #if MI_TRACE_PFNS Pfn2->PfnUsage = MI_USAGE_INIT_MEMORY; - memcpy(Pfn1->ProcessName, "Initial PTE", 16); + MI_SET_PFN_PROCESS_NAME(Pfn2, "Initial PTE"); #endif } } diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 6d60645debd..87c789c1742 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -899,6 +899,9 @@ MiResolvePageFileFault(_In_ BOOLEAN StoreInstruction, ASSERT(CurrentProcess > HYDRA_PROCESS); ASSERT(*OldIrql != MM_NOIRQL); + MI_SET_USAGE(MI_USAGE_PAGE_FILE); + MI_SET_PROCESS(CurrentProcess); + /* We must hold the PFN lock */ MI_ASSERT_PFN_LOCK_HELD(); @@ -1210,6 +1213,9 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, ASSERT(TempPte.u.Hard.Valid == 1); ProtoPageFrameIndex = PFN_FROM_PTE(&TempPte); + MI_SET_USAGE(MI_USAGE_COW); + MI_SET_PROCESS(Process); + /* Get a new page for the private copy */ if (Process > HYDRA_PROCESS) Color = MI_GET_NEXT_PROCESS_COLOR(Process); @@ -2210,6 +2216,9 @@ UserFault: ASSERT(MmAvailablePages > 0); + MI_SET_USAGE(MI_USAGE_COW); + MI_SET_PROCESS(CurrentProcess); + /* Allocate a new page and copy it */ PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_PROCESS_COLOR(CurrentProcess)); OldPageFrameIndex = PFN_FROM_PTE(&TempPte); diff --git a/ntoskrnl/mm/ARM3/pfnlist.c b/ntoskrnl/mm/ARM3/pfnlist.c index f175541a500..a75f2194396 100644 --- a/ntoskrnl/mm/ARM3/pfnlist.c +++ b/ntoskrnl/mm/ARM3/pfnlist.c @@ -254,8 +254,8 @@ MiUnlinkFreeOrZeroedPage(IN PMMPFN Entry) ASSERT(MI_PFN_CURRENT_USAGE != MI_USAGE_NOT_SET); Entry->PfnUsage = MI_PFN_CURRENT_USAGE; memcpy(Entry->ProcessName, MI_PFN_CURRENT_PROCESS_NAME, 16); -// MI_PFN_CURRENT_USAGE = MI_USAGE_NOT_SET; -// memcpy(MI_PFN_CURRENT_PROCESS_NAME, "Not Set", 16); + MI_PFN_CURRENT_USAGE = MI_USAGE_NOT_SET; + MI_SET_PROCESS2("Not Set"); #endif } @@ -459,11 +459,11 @@ MiRemovePageByColor(IN PFN_NUMBER PageIndex, MiDecrementAvailablePages(); #if MI_TRACE_PFNS - //ASSERT(MI_PFN_CURRENT_USAGE != MI_USAGE_NOT_SET); + ASSERT(MI_PFN_CURRENT_USAGE != MI_USAGE_NOT_SET); Pfn1->PfnUsage = MI_PFN_CURRENT_USAGE; memcpy(Pfn1->ProcessName, MI_PFN_CURRENT_PROCESS_NAME, 16); - //MI_PFN_CURRENT_USAGE = MI_USAGE_NOT_SET; - //memcpy(MI_PFN_CURRENT_PROCESS_NAME, "Not Set", 16); + MI_PFN_CURRENT_USAGE = MI_USAGE_NOT_SET; + MI_SET_PROCESS2("Not Set"); #endif /* Return the page */ @@ -937,9 +937,8 @@ MiInsertPageInList(IN PMMPFNLIST ListHead, ColorHead->Count++; #if MI_TRACE_PFNS - //ASSERT(MI_PFN_CURRENT_USAGE == MI_USAGE_NOT_SET); + ASSERT(MI_PFN_CURRENT_USAGE == MI_USAGE_NOT_SET); Pfn1->PfnUsage = MI_USAGE_FREE_PAGE; - MI_PFN_CURRENT_USAGE = MI_USAGE_NOT_SET; RtlZeroMemory(Pfn1->ProcessName, 16); #endif } diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 0ebcae75e29..745543403f4 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -188,14 +188,7 @@ MiLoadImageSection(_Inout_ PSECTION *SectionPtr, /* Some debug stuff */ MI_SET_USAGE(MI_USAGE_DRIVER_PAGE); #if MI_TRACE_PFNS - if (FileName->Buffer) - { - PWCHAR pos = NULL; - ULONG len = 0; - pos = wcsrchr(FileName->Buffer, '\\'); - len = wcslen(pos) * sizeof(WCHAR); - if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); - } + MI_SET_PROCESS_USTR(FileName); #endif /* Grab a page */ diff --git a/ntoskrnl/mm/freelist.c b/ntoskrnl/mm/freelist.c index 4aa15a12582..b00cf1fbc04 100644 --- a/ntoskrnl/mm/freelist.c +++ b/ntoskrnl/mm/freelist.c @@ -610,6 +610,21 @@ MmAllocPage(ULONG Type) OldIrql = MiAcquirePfnLock(); +#if MI_TRACE_PFNS + switch(Type) + { + case MC_CACHE: + case MC_SYSTEM: + MI_SET_USAGE(MI_USAGE_CACHE); + break; + case MC_USER: + MI_SET_USAGE(MI_USAGE_SECTION); + break; + default: + ASSERT(FALSE); + } +#endif + PfnOffset = MiRemoveZeroPage(MI_GET_NEXT_COLOR()); if (!PfnOffset) { diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index b3e300a58cc..3ff8098937d 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1803,9 +1803,6 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - MI_SET_USAGE(MI_USAGE_SECTION); - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Section"); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { @@ -1975,9 +1972,6 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, /* * Allocate a page */ - MI_SET_USAGE(MI_USAGE_SECTION); - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Section"); Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &NewPage); if (!NT_SUCCESS(Status)) {

1 0

[reactos] 01/01: [BROWSEUI] Enable AutoAppend of auto-completion (#3552)
by Katayama Hirofumi MZ 29 Mar '21

29 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91e591b3d590df3c5164e… commit 91e591b3d590df3c5164ed6f88ac8da389d42cba Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Mar 30 06:50:32 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 30 06:50:32 2021 +0900 [BROWSEUI] Enable AutoAppend of auto-completion (#3552) Fix and improve Auto-Append of auto-completion. CORE-9281 - Implement CAutoComplete::DoAutoAppend method. --- dll/win32/browseui/CAutoComplete.cpp | 481 +++++++++++++++++------------------ dll/win32/browseui/CAutoComplete.h | 58 +---- 2 files changed, 239 insertions(+), 300 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index b2ebc12ba68..d23b6d5cb78 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -40,6 +40,35 @@ static HHOOK s_hMouseHook = NULL; // hook handle static HWND s_hWatchWnd = NULL; // the window handle to watch +struct PREFIX_INFO +{ + LPCWSTR psz; + INT cch; +}; +static const PREFIX_INFO s_prefixes[] = +{ + { L"https://", 8 }, + { L"http://www.", 11 }, + { L"http://", 7 }, + { L"www.", 4 }, +}; + +static inline BOOL DropPrefix(const CStringW& str, CStringW& strBody) +{ + for (size_t iPrefix = 0; iPrefix < _countof(s_prefixes); ++iPrefix) + { + LPCWSTR psz = s_prefixes[iPrefix].psz; + INT cch = s_prefixes[iPrefix].cch; + if (::StrCmpNIW(str, psz, cch) == 0) + { + strBody = str.Mid(cch); + return TRUE; + } + } + strBody = str; + return FALSE; +} + // mouse hook procedure to watch the mouse click // https://docs.microsoft.com/en-us/previous-versions/windows/desktop/legacy/m… static LRESULT CALLBACK MouseProc(INT nCode, WPARAM wParam, LPARAM lParam) @@ -80,33 +109,41 @@ static LRESULT CALLBACK MouseProc(INT nCode, WPARAM wParam, LPARAM lParam) typedef CSimpleArray<CStringW> list_t; -static inline INT pivot(list_t& a, INT i, INT j) +static inline INT compare1(const CStringW& str1, const CStringW& str2) +{ + CStringW s1, s2; + DropPrefix(str1, s1); + DropPrefix(str2, s2); + return s1.CompareNoCase(s2); +} + +static inline INT pivot(list_t& list, INT i, INT j) { INT k = i + 1; - while (k <= j && a[i].CompareNoCase(a[k]) == 0) + while (k <= j && compare1(list[i], list[k]) == 0) k++; if (k > j) return -1; - if (a[i].CompareNoCase(a[k]) >= 0) + if (compare1(list[i], list[k]) >= 0) return i; return k; - } +} -static inline INT partition(list_t& a, INT i, INT j, const CStringW& x) +static inline INT partition(list_t& list, INT i, INT j, const CStringW& x) { INT left = i, right = j; while (left <= right) { - while (left <= j && a[left].CompareNoCase(x) < 0) + while (left <= j && compare1(list[left], x) < 0) left++; - while (right >= i && a[right].CompareNoCase(x) >= 0) + while (right >= i && compare1(list[right], x) >= 0) right--; if (left > right) break; - CStringW tmp = a[left]; - a[left] = a[right]; - a[right] = tmp; + CStringW tmp = list[left]; + list[left] = list[right]; + list[right] = tmp; left++; right--; @@ -114,16 +151,16 @@ static inline INT partition(list_t& a, INT i, INT j, const CStringW& x) return left; } -static void quicksort(list_t& a, INT i, INT j) +static void quicksort(list_t& list, INT i, INT j) { if (i == j) return; - INT p = pivot(a, i, j); + INT p = pivot(list, i, j); if (p == -1) return; - INT k = partition(a, i, j, a[p]); - quicksort(a, i, k - 1); - quicksort(a, k, j); + INT k = partition(list, i, j, list[p]); + quicksort(list, i, k - 1); + quicksort(list, k, j); } static inline void DoSort(list_t& list) @@ -142,7 +179,7 @@ static INT DoUnique(list_t& list) INT result = first; while (++first != last) { - if (list[result].CompareNoCase(list[first]) != 0) + if (compare1(list[result], list[first]) != 0) list[++result] = list[first]; } return ++result; @@ -158,7 +195,6 @@ static inline void DoUniqueAndTrim(list_t& list) } ////////////////////////////////////////////////////////////////////////////// -// CACEditCtrl // range of WCHAR (inclusive) struct RANGE @@ -217,176 +253,103 @@ EditWordBreakProcW(LPWSTR lpch, INT index, INT count, INT code) { case WB_ISDELIMITER: return IsWordBreak(lpch[index]); - case WB_LEFT: + { if (index) --index; while (index && !IsWordBreak(lpch[index])) --index; return index; - + } case WB_RIGHT: + { if (!count) break; while (index < count && lpch[index] && !IsWordBreak(lpch[index])) ++index; return index; - - default: - break; + } } return 0; } -CACEditCtrl::CACEditCtrl() : m_pDropDown(NULL), m_fnOldWordBreakProc(NULL) +static LRESULT CALLBACK +EditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, + UINT_PTR uSubclassID, DWORD_PTR dwData) { + CAutoComplete *pThis = reinterpret_cast<CAutoComplete *>(dwData); + return pThis->EditWndProc(hwnd, uMsg, wParam, lParam); } -VOID CACEditCtrl::HookWordBreakProc(BOOL bHook) +LRESULT CAutoComplete::EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - if (bHook) + LRESULT ret; + HWND hwndGotFocus; + switch (uMsg) { - m_fnOldWordBreakProc = reinterpret_cast<EDITWORDBREAKPROCW>( - SendMessageW(EM_SETWORDBREAKPROC, 0, - reinterpret_cast<LPARAM>(EditWordBreakProcW))); - } - else - { - SendMessageW(EM_SETWORDBREAKPROC, 0, - reinterpret_cast<LPARAM>(m_fnOldWordBreakProc)); - } -} - -// WM_CHAR -// This message is posted to the window with the keyboard focus when WM_KEYDOWN is translated. -LRESULT CACEditCtrl::OnChar(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - TRACE("CACEditCtrl::OnChar(%p, %p)\n", this, wParam); - ATLASSERT(m_pDropDown); - return m_pDropDown->OnEditChar(wParam, lParam); -} - -// WM_CUT / WM_PASTE / WM_CLEAR @implemented -LRESULT CACEditCtrl::OnCutPasteClear(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - TRACE("CACEditCtrl::OnCutPasteClear(%p)\n", this); - ATLASSERT(m_pDropDown); - LRESULT ret = DefWindowProcW(uMsg, wParam, lParam); // do default - m_pDropDown->OnEditUpdate(TRUE); - return ret; -} - -// WM_DESTROY -// This message is sent when a window is being destroyed. -LRESULT CACEditCtrl::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - TRACE("CACEditCtrl::OnDestroy(%p)\n", this); - ATLASSERT(m_pDropDown); - CAutoComplete *pDropDown = m_pDropDown; - - // unhook word break procedure - HookWordBreakProc(FALSE); - - // unsubclass because we don't watch any more - HWND hwndEdit = UnsubclassWindow(); - - // close the drop-down window - if (pDropDown) - { - pDropDown->PostMessageW(WM_CLOSE, 0, 0); - } - - return ::DefWindowProcW(hwndEdit, uMsg, wParam, lParam); // do default -} - -// WM_GETDLGCODE -// By responding to this message, an application can take control of a particular type of -// input and process the input itself. -LRESULT CACEditCtrl::OnGetDlgCode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - TRACE("CACEditCtrl::OnGetDlgCode(%p)\n", this); - ATLASSERT(m_pDropDown); - - LRESULT ret = DefWindowProcW(uMsg, wParam, lParam); // get default - - if (m_pDropDown) - { - // some special keys need default processing. we handle them here - switch (wParam) - { - case VK_RETURN: - if (m_pDropDown->IsWindowVisible() || ::GetKeyState(VK_CONTROL) < 0) - m_pDropDown->OnEditKeyDown(VK_RETURN, 0); - break; - case VK_TAB: - if (m_pDropDown->IsWindowVisible() && m_pDropDown->UseTab()) - ret |= DLGC_WANTALLKEYS; // we want all keys to manipulate the list - break; - case VK_ESCAPE: - if (m_pDropDown->IsWindowVisible()) + case WM_CHAR: + return OnEditChar(wParam, lParam); + case WM_CUT: case WM_PASTE: case WM_CLEAR: + ret = ::DefSubclassProc(hwnd, uMsg, wParam, lParam); // do default + OnEditUpdate(TRUE); + return ret; + case WM_GETDLGCODE: + ret = ::DefSubclassProc(hwnd, uMsg, wParam, lParam); // do default + // some special keys need default processing. we handle them here + switch (wParam) + { + case VK_RETURN: + if (IsWindowVisible() || ::GetKeyState(VK_CONTROL) < 0) + OnEditKeyDown(VK_RETURN, 0); + break; + case VK_TAB: + if (IsWindowVisible() && UseTab()) + ret |= DLGC_WANTALLKEYS; // we want all keys to manipulate the list + break; + case VK_ESCAPE: + if (IsWindowVisible()) + ret |= DLGC_WANTALLKEYS; // we want all keys to manipulate the list + break; + default: + { ret |= DLGC_WANTALLKEYS; // we want all keys to manipulate the list - break; - default: + break; + } + } + return ret; + case WM_KEYDOWN: + if (OnEditKeyDown(wParam, lParam)) + return TRUE; // eat + break; + case WM_SETFOCUS: + break; + case WM_KILLFOCUS: + // hide the list if lost focus + hwndGotFocus = (HWND)wParam; + if (hwndGotFocus != m_hwndEdit && hwndGotFocus != m_hWnd) + HideDropDown(); + break; + case WM_SETTEXT: + if (!m_bInSetText) + HideDropDown(); // it's mechanical WM_SETTEXT + break; + case WM_DESTROY: + { + if (m_fnOldWordBreakProc) { - ret |= DLGC_WANTALLKEYS; // we want all keys to manipulate the list - break; + ::SendMessageW(hwnd, EM_SETWORDBREAKPROC, 0, reinterpret_cast<LPARAM>(m_fnOldWordBreakProc)); + m_fnOldWordBreakProc = NULL; } + ::RemoveWindowSubclass(hwnd, EditSubclassProc, 0); + if (::IsWindow(m_hWnd)) + PostMessageW(WM_CLOSE, 0, 0); + // remove reference to m_hwndEdit + Release(); + break; } } - return ret; -} - -// WM_KEYDOWN -// This message is posted to the window with the keyboard focus when a non-system key is pressed. -LRESULT CACEditCtrl::OnKeyDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - TRACE("CACEditCtrl::OnKeyDown(%p, %p)\n", this, wParam); - ATLASSERT(m_pDropDown); - if (m_pDropDown->OnEditKeyDown(wParam, lParam)) - return 1; // eat - bHandled = FALSE; // do default - return 0; -} - -// WM_KILLFOCUS @implemented -// This message is sent to a window immediately before it loses the keyboard focus. -LRESULT CACEditCtrl::OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - TRACE("CACEditCtrl::OnKillFocus(%p)\n", this); - ATLASSERT(m_pDropDown); - - // hide the list if lost focus - HWND hwndGotFocus = (HWND)wParam; - if (hwndGotFocus != m_hWnd && hwndGotFocus != m_pDropDown->m_hWnd) - { - m_pDropDown->HideDropDown(); - } - - bHandled = FALSE; // do default - return 0; -} - -// WM_SETFOCUS -// This message is sent to a window after it has gained the keyboard focus. -LRESULT CACEditCtrl::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - TRACE("CACEditCtrl::OnSetFocus(%p)\n", this); - ATLASSERT(m_pDropDown); - bHandled = FALSE; // do default - return 0; -} - -// WM_SETTEXT -// An application sends this message to set the text of a window. -LRESULT CACEditCtrl::OnSetText(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - TRACE("CACEditCtrl::OnSetText(%p)\n", this); - ATLASSERT(m_pDropDown); - if (!m_pDropDown->m_bInSetText) - m_pDropDown->HideDropDown(); // it's mechanical WM_SETTEXT - bHandled = FALSE; // do default - return 0; + return ::DefSubclassProc(hwnd, uMsg, wParam, lParam); // do default } ////////////////////////////////////////////////////////////////////////////// @@ -503,7 +466,7 @@ LRESULT CACListView::OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL if (iItem != -1) { m_pDropDown->SelectItem(iItem); // select the item - CString strText = GetItemText(iItem); // get text of item + CStringW strText = GetItemText(iItem); // get text of item m_pDropDown->SetEditText(strText); // set text m_pDropDown->SetEditSel(0, strText.GetLength()); // select all m_pDropDown->HideDropDown(); // hide @@ -545,10 +508,6 @@ LRESULT CACListView::OnNCHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL & ////////////////////////////////////////////////////////////////////////////// // CACScrollBar -CACScrollBar::CACScrollBar() : m_pDropDown(NULL) -{ -} - HWND CACScrollBar::Create(HWND hwndParent) { ATLASSERT(m_hWnd == NULL); @@ -563,10 +522,6 @@ HWND CACScrollBar::Create(HWND hwndParent) ////////////////////////////////////////////////////////////////////////////// // CACSizeBox -CACSizeBox::CACSizeBox() : m_pDropDown(NULL), m_bDowner(TRUE), m_bLongList(FALSE) -{ -} - HWND CACSizeBox::Create(HWND hwndParent) { ATLASSERT(m_hWnd == NULL); @@ -684,6 +639,7 @@ CAutoComplete::CAutoComplete() : m_bInSetText(FALSE), m_bInSelectItem(FALSE) , m_bDowner(TRUE), m_dwOptions(ACO_AUTOAPPEND | ACO_AUTOSUGGEST) , m_bEnabled(TRUE), m_hwndCombo(NULL), m_hFont(NULL), m_bResized(FALSE) + , m_hwndEdit(NULL), m_fnOldEditProc(NULL), m_fnOldWordBreakProc(NULL) { } @@ -693,7 +649,8 @@ HWND CAutoComplete::CreateDropDown() DWORD dwStyle = WS_POPUP | /*WS_VISIBLE |*/ WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_BORDER; DWORD dwExStyle = WS_EX_TOOLWINDOW | WS_EX_TOPMOST | WS_EX_NOPARENTNOTIFY; Create(NULL, NULL, NULL, dwStyle, dwExStyle); - TRACE("CAutoComplete::CreateDropDown(%p): m_hWnd == %p\n", this, m_hWnd); + TRACE("CAutoComplete::CreateDropDown(%p): m_hWnd=%p, m_hwndEdit=%p\n", + this, m_hWnd, m_hwndEdit); return m_hWnd; } @@ -705,6 +662,9 @@ CAutoComplete::~CAutoComplete() ::DeleteObject(m_hFont); m_hFont = NULL; } + // quit holding them + m_pEnum.Release(); + m_pACList.Release(); } BOOL CAutoComplete::CanAutoSuggest() @@ -729,6 +689,11 @@ BOOL CAutoComplete::IsComboBoxDropped() return (BOOL)::SendMessageW(m_hwndCombo, CB_GETDROPPEDSTATE, 0, 0); } +BOOL CAutoComplete::FilterPrefixes() +{ + return !!(m_dwOptions & ACO_FILTERPREFIXES) && m_bEnabled; +} + INT CAutoComplete::GetItemCount() { return m_outerList.GetSize(); @@ -743,20 +708,16 @@ CStringW CAutoComplete::GetItemText(INT iItem) CStringW CAutoComplete::GetEditText() { - BSTR bstrText = NULL; - CStringW strText; - if (m_hwndEdit.GetWindowTextW(bstrText)) - { - strText = bstrText; - ::SysFreeString(bstrText); - } - return strText; + WCHAR szText[L_MAX_URL_LENGTH]; + if (::GetWindowTextW(m_hwndEdit, szText, _countof(szText))) + return szText; + return L""; } VOID CAutoComplete::SetEditText(LPCWSTR pszText) { m_bInSetText = TRUE; // don't hide drop-down - m_hwndEdit.SetWindowTextW(pszText); + ::CallWindowProcW(m_fnOldEditProc, m_hwndEdit, WM_SETTEXT, 0, reinterpret_cast<LPARAM>(pszText)); m_bInSetText = FALSE; } @@ -771,7 +732,7 @@ CStringW CAutoComplete::GetStemText() VOID CAutoComplete::SetEditSel(INT ich0, INT ich1) { - m_hwndEdit.SendMessageW(EM_SETSEL, ich0, ich1); + ::CallWindowProcW(m_fnOldEditProc, m_hwndEdit, EM_SETSEL, ich0, ich1); } VOID CAutoComplete::ShowDropDown() @@ -817,23 +778,52 @@ VOID CAutoComplete::DoAutoAppend() // get the common string CStringW strCommon; + BOOL bFound = FALSE; for (INT iItem = 0; iItem < cItems; ++iItem) { - const CString& strItem = m_innerList[iItem]; // get the text of the item + const CStringW& strItem = m_innerList[iItem]; // get the text of the item - if (iItem == 0) // the first item + CStringW strBody; + if (DropPrefix(strItem, strBody) && + ::StrCmpNIW(strBody, strText, strText.GetLength()) == 0) { - strCommon = strItem; // store the text + if (!bFound) + { + bFound = TRUE; + strCommon = strBody; + continue; + } + for (INT ich = 0; ich < strBody.GetLength(); ++ich) + { + if (strCommon.GetLength() <= ich) + break; + if (ChrCmpIW(strCommon[ich], strBody[ich]) != 0) + { + strCommon = strCommon.Left(ich); + break; + } + } continue; } - for (INT ich = 0; ich < strCommon.GetLength(); ++ich) + if (::StrCmpNIW(strItem, strText, strText.GetLength()) == 0) { - if (ich < strItem.GetLength() && - ::ChrCmpIW(strCommon[ich], strItem[ich]) != 0) + if (!bFound) { - strCommon = strCommon.Left(ich); // shrink the common string - break; + bFound = TRUE; + strCommon = strItem; + continue; + } + + for (INT ich = 0; ich < strItem.GetLength(); ++ich) + { + if (strCommon.GetLength() <= ich) + break; + if (ChrCmpIW(strCommon[ich], strItem[ich]) != 0) + { + strCommon = strCommon.Left(ich); + break; + } } } } @@ -842,13 +832,10 @@ VOID CAutoComplete::DoAutoAppend() return; // no suggestion // append suggestion - INT cchOld = strText.GetLength(); - INT cchAppend = strCommon.GetLength() - cchOld; - strText += strCommon.Right(cchAppend); - SetEditText(strText); + SetEditText(strCommon); // select the appended suggestion - SetEditSel(cchOld, strText.GetLength()); + SetEditSel(strText.GetLength(), strCommon.GetLength()); } // go back a word ([Ctrl]+[Backspace]) @@ -856,8 +843,8 @@ VOID CAutoComplete::DoBackWord() { // get current selection INT ich0, ich1; - m_hwndEdit.SendMessageW(EM_GETSEL, reinterpret_cast<WPARAM>(&ich0), - reinterpret_cast<LPARAM>(&ich1)); + ::CallWindowProcW(m_fnOldEditProc, m_hwndEdit, EM_GETSEL, + reinterpret_cast<WPARAM>(&ich0), reinterpret_cast<LPARAM>(&ich1)); if (ich0 <= 0 || ich0 != ich1) // there is selection or left-side end return; // don't do anything // get text @@ -870,7 +857,7 @@ VOID CAutoComplete::DoBackWord() // select range SetEditSel(ich0, ich1); // replace selection with empty text (this is actually deletion) - m_hwndEdit.SendMessageW(EM_REPLACESEL, TRUE, (LPARAM)L""); + ::CallWindowProcW(m_fnOldEditProc, m_hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L""); } VOID CAutoComplete::UpdateScrollBar() @@ -940,7 +927,7 @@ BOOL CAutoComplete::OnEditKeyDown(WPARAM wParam, LPARAM lParam) } } // select all - INT cch = m_hwndEdit.GetWindowTextLengthW(); + INT cch = ::CallWindowProcW(m_fnOldEditProc, m_hwndEdit, WM_GETTEXTLENGTH, 0, 0); SetEditSel(0, cch); // hide HideDropDown(); @@ -963,7 +950,7 @@ BOOL CAutoComplete::OnEditKeyDown(WPARAM wParam, LPARAM lParam) // is suggestion available? if (!CanAutoSuggest()) return FALSE; // do default - m_hwndEdit.DefWindowProcW(WM_KEYDOWN, VK_DELETE, 0); // do default + ::DefSubclassProc(m_hwndEdit, WM_KEYDOWN, VK_DELETE, 0); // do default OnEditUpdate(FALSE); return TRUE; // eat } @@ -976,10 +963,6 @@ BOOL CAutoComplete::OnEditKeyDown(WPARAM wParam, LPARAM lParam) } break; } - default: - { - break; - } } return FALSE; // default } @@ -989,7 +972,7 @@ LRESULT CAutoComplete::OnEditChar(WPARAM wParam, LPARAM lParam) TRACE("CACEditCtrl::OnEditChar(%p, %p)\n", this, wParam); if (wParam == L'\n' || wParam == L'\t') return 0; // eat - LRESULT ret = m_hwndEdit.DefWindowProcW(WM_CHAR, wParam, lParam); // do default + LRESULT ret = ::DefSubclassProc(m_hwndEdit, WM_CHAR, wParam, lParam); // do default if (CanAutoSuggest() || CanAutoAppend()) OnEditUpdate(wParam != VK_BACK); return ret; @@ -997,7 +980,7 @@ LRESULT CAutoComplete::OnEditChar(WPARAM wParam, LPARAM lParam) VOID CAutoComplete::OnEditUpdate(BOOL bAppendOK) { - CString strText = GetEditText(); + CStringW strText = GetEditText(); if (m_strText.CompareNoCase(strText) == 0) { // no change @@ -1105,7 +1088,7 @@ BOOL CAutoComplete::OnListUpDown(UINT vk) // @implemented STDMETHODIMP CAutoComplete::Enable(BOOL fEnable) { - TRACE("(%p)->(%d)\n", this, fEnable); + TRACE("(%p)->Enable(%d)\n", this, fEnable); m_bEnabled = fEnable; return S_OK; } @@ -1114,37 +1097,42 @@ STDMETHODIMP CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR pwszRegKeyPath, LPCOLESTR pwszQuickComplete) { - TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", + TRACE("(%p)->Init(0x%08lx, %p, %s, %s)\n", this, hwndEdit, punkACL, debugstr_w(pwszRegKeyPath), debugstr_w(pwszQuickComplete)); - // sanity check if (m_hwndEdit || !punkACL) - { - ATLASSERT(0); return E_FAIL; - } - - // set this pointer to m_hwndEdit - m_hwndEdit.m_pDropDown = this; - + if (!hwndEdit) + return E_INVALIDARG; // do subclass textbox to watch messages - m_hwndEdit.SubclassWindow(hwndEdit); + m_fnOldEditProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtrW(hwndEdit, GWLP_WNDPROC)); + if (!m_fnOldEditProc) + return E_FAIL; + if (!::SetWindowSubclass(hwndEdit, EditSubclassProc, 0, reinterpret_cast<DWORD_PTR>(this))) + return E_FAIL; + m_hwndEdit = hwndEdit; + // add reference to m_hwndEdit + AddRef(); // set word break procedure - m_hwndEdit.HookWordBreakProc(TRUE); + m_fnOldWordBreakProc = reinterpret_cast<EDITWORDBREAKPROCW>( + ::SendMessageW(m_hwndEdit, EM_SETWORDBREAKPROC, 0, + reinterpret_cast<LPARAM>(EditWordBreakProcW))); // save position - m_hwndEdit.GetWindowRect(&m_rcEdit); + ::GetWindowRect(m_hwndEdit, &m_rcEdit); // get an IEnumString ATLASSERT(!m_pEnum); punkACL->QueryInterface(IID_IEnumString, (VOID **)&m_pEnum); TRACE("m_pEnum: %p\n", static_cast<void *>(m_pEnum)); + if (m_pEnum) + m_pEnum->AddRef(); // hold not to be freed // get an IACList ATLASSERT(!m_pACList); punkACL->QueryInterface(IID_IACList, (VOID **)&m_pACList); TRACE("m_pACList: %p\n", static_cast<void *>(m_pACList)); - - AddRef(); // add reference + if (m_pACList) + m_pACList->AddRef(); // hold not to be freed UpdateDropDownState(); // create/hide the drop-down window if necessary @@ -1238,13 +1226,8 @@ STDMETHODIMP CAutoComplete::ResetEnumerator() { FIXME("(%p): stub\n", this); - HideDropDown(); - - if (IsWindowVisible()) - { - OnEditUpdate(FALSE); - } - + Reset(); + m_innerList.RemoveAll(); return S_OK; } @@ -1305,11 +1288,7 @@ VOID CAutoComplete::UpdateDropDownState() { // create the drop-down window if not existed if (!m_hWnd) - { - AddRef(); - if (!CreateDropDown()) - Release(); - } + CreateDropDown(); } else { @@ -1424,7 +1403,7 @@ VOID CAutoComplete::RepositionDropDown() // get m_hwndEdit position RECT rcEdit; - m_hwndEdit.GetWindowRect(&rcEdit); + ::GetWindowRect(m_hwndEdit, &rcEdit); INT x = rcEdit.left, y = rcEdit.bottom; // get list extent @@ -1572,6 +1551,15 @@ INT CAutoComplete::UpdateOuterList() { // is the beginning matched? const CStringW& strTarget = m_innerList[iItem]; + CStringW strBody; + if (DropPrefix(strTarget, strBody)) + { + if (::StrCmpNIW(strBody, strText, strText.GetLength()) == 0) + { + m_outerList.Add(strTarget); + continue; + } + } if (::StrCmpNIW(strTarget, strText, strText.GetLength()) == 0) { m_outerList.Add(strTarget); @@ -1614,13 +1602,11 @@ VOID CAutoComplete::UpdateCompletion(BOOL bAppendOK) RepositionDropDown(); else HideDropDown(); - return; } if (CanAutoAppend() && bAppendOK) // can we auto-append? { DoAutoAppend(); - return; } } @@ -1659,28 +1645,21 @@ LRESULT CAutoComplete::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b m_hFont = reinterpret_cast<HFONT>(::GetStockObject(DEFAULT_GUI_FONT)); m_hwndList.SetFont(m_hFont); + // add reference to CAutoComplete::m_hWnd + AddRef(); return 0; // success } -// WM_DESTROY -// This message is sent when a window is being destroyed. -LRESULT CAutoComplete::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +// WM_NCDESTROY +LRESULT CAutoComplete::OnNCDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - TRACE("CAutoComplete::OnDestroy(%p)\n", this); + TRACE("CAutoComplete::OnNCDestroy(%p)\n", this); // hide if (IsWindowVisible()) HideDropDown(); - // unsubclass EDIT control - if (m_hwndEdit) - { - m_hwndEdit.HookWordBreakProc(FALSE); - m_hwndEdit.UnsubclassWindow(); - } - // clear CAutoComplete pointers - m_hwndEdit.m_pDropDown = NULL; m_hwndList.m_pDropDown = NULL; m_hwndScrollBar.m_pDropDown = NULL; m_hwndSizeBox.m_pDropDown = NULL; @@ -1692,8 +1671,8 @@ LRESULT CAutoComplete::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL & // clean up m_hwndCombo = NULL; + // remove reference to CAutoComplete::m_hWnd Release(); - return 0; } @@ -1709,7 +1688,7 @@ LRESULT CAutoComplete::OnExitSizeMove(UINT uMsg, WPARAM wParam, LPARAM lParam, B UINT uSWP_ = SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOACTIVATE; SetWindowPos(NULL, 0, 0, 0, 0, uSWP_); - m_hwndEdit.SetFocus(); // restore focus + ::SetFocus(m_hwndEdit); // restore focus return 0; } @@ -1943,8 +1922,6 @@ LRESULT CAutoComplete::OnNCHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL // This message is sent when the window size is changed. LRESULT CAutoComplete::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - TRACE("CAutoComplete::OnSize(%p)\n", this); - // calculate the positions of the controls CRect rcList, rcScrollBar, rcSizeBox; CalcRects(m_bDowner, rcList, rcScrollBar, rcSizeBox); @@ -1974,6 +1951,8 @@ LRESULT CAutoComplete::OnShowWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO BOOL bShow = (BOOL)wParam; if (bShow) { + if (s_hWatchWnd != m_hWnd && ::IsWindowVisible(s_hWatchWnd)) + ::ShowWindowAsync(s_hWatchWnd, SW_HIDE); s_hWatchWnd = m_hWnd; // watch this // unhook mouse if any @@ -2034,7 +2013,7 @@ LRESULT CAutoComplete::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bH // m_hwndEdit is moved? RECT rcEdit; - m_hwndEdit.GetWindowRect(&rcEdit); + ::GetWindowRect(m_hwndEdit, &rcEdit); if (!::EqualRect(&rcEdit, &m_rcEdit)) { // if so, hide diff --git a/dll/win32/browseui/CAutoComplete.h b/dll/win32/browseui/CAutoComplete.h index eb979baf314..f779fdaf4bf 100644 --- a/dll/win32/browseui/CAutoComplete.h +++ b/dll/win32/browseui/CAutoComplete.h @@ -24,53 +24,11 @@ #include "atltypes.h" #include "rosctrls.h" -class CACEditCtrl; class CACListView; class CACScrollBar; class CACSizeBox; class CAutoComplete; -////////////////////////////////////////////////////////////////////////////// -// CACEditCtrl --- auto-completion textbox - -class CACEditCtrl - : public CWindowImpl<CACEditCtrl, CWindow, CControlWinTraits> -{ -public: - CAutoComplete* m_pDropDown; - static LPCWSTR GetWndClassName() { return WC_EDITW; } - - CACEditCtrl(); - VOID HookWordBreakProc(BOOL bHook); - - // message map - BEGIN_MSG_MAP(CACEditCtrl) - MESSAGE_HANDLER(WM_CHAR, OnChar) - MESSAGE_HANDLER(WM_CLEAR, OnCutPasteClear) - MESSAGE_HANDLER(WM_CUT, OnCutPasteClear) - MESSAGE_HANDLER(WM_DESTROY, OnDestroy) - MESSAGE_HANDLER(WM_GETDLGCODE, OnGetDlgCode) - MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) - MESSAGE_HANDLER(WM_KILLFOCUS, OnKillFocus) - MESSAGE_HANDLER(WM_PASTE, OnCutPasteClear) - MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus) - MESSAGE_HANDLER(WM_SETTEXT, OnSetText) - END_MSG_MAP() - -protected: - // protected variables - EDITWORDBREAKPROCW m_fnOldWordBreakProc; - // message handlers - LRESULT OnChar(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnCutPasteClear(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnGetDlgCode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnKeyDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnSetText(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); -}; - ////////////////////////////////////////////////////////////////////////////// // CACListView --- auto-completion list control @@ -121,8 +79,7 @@ class CACScrollBar : public CWindowImpl<CACScrollBar> public: CAutoComplete* m_pDropDown; static LPCWSTR GetWndClassName() { return WC_SCROLLBARW; } - - CACScrollBar(); + CACScrollBar() : m_pDropDown(NULL) { } HWND Create(HWND hwndParent); protected: @@ -139,8 +96,7 @@ class CACSizeBox : public CWindowImpl<CACSizeBox> public: CAutoComplete* m_pDropDown; static LPCWSTR GetWndClassName() { return WC_SCROLLBARW; } - - CACSizeBox(); + CACSizeBox() : m_pDropDown(NULL), m_bDowner(TRUE), m_bLongList(FALSE) { } HWND Create(HWND hwndParent); VOID SetStatus(BOOL bDowner, BOOL bLongList); @@ -188,6 +144,7 @@ public: BOOL CanAutoAppend(); BOOL UseTab(); BOOL IsComboBoxDropped(); + BOOL FilterPrefixes(); INT GetItemCount(); CStringW GetItemText(INT iItem); @@ -203,6 +160,7 @@ public: VOID DoBackWord(); VOID UpdateScrollBar(); + LRESULT EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); LRESULT OnEditChar(WPARAM wParam, LPARAM lParam); BOOL OnEditKeyDown(WPARAM wParam, LPARAM lParam); VOID OnEditUpdate(BOOL bAppendOK); @@ -234,11 +192,13 @@ protected: HFONT m_hFont; // the font BOOL m_bResized; // re-sized by size-box? RECT m_rcEdit; // in screen coordinates, to watch the position + HWND m_hwndEdit; // the textbox + WNDPROC m_fnOldEditProc; // old textbox procedure + EDITWORDBREAKPROCW m_fnOldWordBreakProc; // The following variables are non-POD: CStringW m_strText; // internal text (used in selecting item and reverting text) CStringW m_strStemText; // dirname + '\\' CStringW m_strQuickComplete; // used for [Ctrl]+[Enter] - CACEditCtrl m_hwndEdit; // subclassed to watch CACListView m_hwndList; // this listview is virtual CACScrollBar m_hwndScrollBar; // scroll bar contol CACSizeBox m_hwndSizeBox; // the size grip @@ -259,7 +219,7 @@ protected: // message map BEGIN_MSG_MAP(CAutoComplete) MESSAGE_HANDLER(WM_CREATE, OnCreate) - MESSAGE_HANDLER(WM_DESTROY, OnDestroy) + MESSAGE_HANDLER(WM_NCDESTROY, OnNCDestroy) MESSAGE_HANDLER(WM_DRAWITEM, OnDrawItem) MESSAGE_HANDLER(WM_EXITSIZEMOVE, OnExitSizeMove) MESSAGE_HANDLER(WM_GETMINMAXINFO, OnGetMinMaxInfo) @@ -276,7 +236,7 @@ protected: END_MSG_MAP() // message handlers LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnNCDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnDrawItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnExitSizeMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnGetMinMaxInfo(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);

1 0

[reactos] 01/01: [WIDL] Do not transfer an explicit primitive binding handle to the server
by Eric Kohl 28 Mar '21

28 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b04e463044c7f1f705e4… commit 6b04e463044c7f1f705e488c7b5bb0d3d4a02ae4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 28 16:20:10 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 28 16:20:10 2021 +0200 [WIDL] Do not transfer an explicit primitive binding handle to the server This enables us to run WIDL-generated code on Windows XP again. This patch has already been sent upstream. --- sdk/tools/widl/typegen.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/sdk/tools/widl/typegen.c b/sdk/tools/widl/typegen.c index baa2b189a0e..2aeb6ebca44 100644 --- a/sdk/tools/widl/typegen.c +++ b/sdk/tools/widl/typegen.c @@ -1321,7 +1321,9 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, } stack_size += get_stack_size( var, NULL ); param_num++; - nb_args++; + + if (var != handle_var || implicit_fc || explicit_fc != FC_BIND_PRIMITIVE) + nb_args++; } if (!is_void( type_function_get_rettype( func->type ))) { @@ -1428,6 +1430,8 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i int is_interpreted = is_interpreted_func( iface, func ); int is_new_style = is_interpreted && (get_stub_mode() == MODE_Oif); var_t *retval = type_function_get_retval( func->type ); + unsigned char explicit_fc, implicit_fc; + const var_t *handle_var = get_func_handle_var( iface, func, &explicit_fc, &implicit_fc ); if (is_interpreted) write_proc_func_header( file, indent, iface, func, offset, num_proc ); @@ -1437,11 +1441,18 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i const var_t *var; LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) { - print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); - if (is_new_style) - *offset += write_new_procformatstring_type(file, indent, var, FALSE, &stack_offset); + if (var != handle_var || implicit_fc || explicit_fc != FC_BIND_PRIMITIVE) + { + print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); + if (is_new_style) + *offset += write_new_procformatstring_type(file, indent, var, FALSE, &stack_offset); + else + *offset += write_old_procformatstring_type(file, indent, var, FALSE, is_interpreted); + } else - *offset += write_old_procformatstring_type(file, indent, var, FALSE, is_interpreted); + { + stack_offset += pointer_size; + } } }

1 0

[reactos] 01/01: [LIBCNTPR] Fix a typo
by Jérôme Gardou 25 Mar '21

25 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a14c97d0c7004a0d72a1… commit 3a14c97d0c7004a0d72a1f7e0b0b418587d1b26d Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Mar 25 11:52:22 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Mar 25 11:54:49 2021 +0100 [LIBCNTPR] Fix a typo There is no console to display to. --- sdk/lib/crt/libcntpr.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/crt/libcntpr.cmake b/sdk/lib/crt/libcntpr.cmake index e91db0896cc..2ffb192219d 100644 --- a/sdk/lib/crt/libcntpr.cmake +++ b/sdk/lib/crt/libcntpr.cmake @@ -12,7 +12,7 @@ list(APPEND LIBCNTPR_SOURCE misc/fltused.c printf/_snprintf.c printf/_snwprintf.c - printf/_vcprintf.c + printf/_vscprintf.c printf/_vscwprintf.c printf/_vsnprintf.c printf/_vsnwprintf.c

1 0

[reactos] 01/01: [ATL] CWindowImplBaseT::WindowProc(): Narrow 2 ATLASSERT() down (#3529)
by Serge Gautherie 25 Mar '21

25 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49639c77599c9c7dbc742… commit 49639c77599c9c7dbc742846a5498f5f05348b50 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Mar 25 11:51:29 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 25 19:51:29 2021 +0900 [ATL] CWindowImplBaseT::WindowProc(): Narrow 2 ATLASSERT() down (#3529) Addendum to e076e05. CORE-17505 --- sdk/lib/atl/atlwin.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index c25fd1404d0..214c2959789 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1579,9 +1579,12 @@ public: LONG_PTR saveWindowProc; ATLASSERT(pThis != NULL); - ATLASSERT(pThis != NULL && (pThis->m_dwState & WINSTATE_DESTROYED) == 0); - ATLASSERT(pThis != NULL && pThis->m_hWnd != NULL); - if (pThis == NULL || (pThis->m_dwState & WINSTATE_DESTROYED) != 0 || pThis->m_hWnd == NULL) + if (pThis == NULL) + return 0; + + ATLASSERT((pThis->m_dwState & WINSTATE_DESTROYED) == 0); + ATLASSERT(pThis->m_hWnd != NULL); + if ((pThis->m_dwState & WINSTATE_DESTROYED) != 0 || pThis->m_hWnd == NULL) return 0; hWnd = pThis->m_hWnd;

1 0

[reactos] 04/04: [NTOS:SE] Specify the code section of SepCreateSystemProcessToken as INIT
by George Bișoc 24 Mar '21

24 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eba68ffb9ccf0681e9f08… commit eba68ffb9ccf0681e9f08a3dbdccf6495b25c5f3 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Mar 13 20:45:15 2021 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu Mar 25 02:30:46 2021 +0300 [NTOS:SE] Specify the code section of SepCreateSystemProcessToken as INIT This function is used during the Security kernel module phase initialisation to set up the system process token which the phase initialisation procedure in itself is stored in the INIT section. With that being said, do the same for SepCreateSystemProcessToken too and add a header documentation as an addition. --- ntoskrnl/se/token.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index bd56397225f..31601411b07 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -1389,6 +1389,15 @@ Quit: return Status; } +/** + * @brief + * Creates the system process token. + * + * @return + * Returns the system process token if the operations have + * completed successfully. + */ +CODE_SEG("INIT") PTOKEN NTAPI SepCreateSystemProcessToken(VOID)

1 0

[reactos] 03/04: [NTOS:SE] Create the anonymous logon tokens on Security initialisation phase
by George Bișoc 24 Mar '21

24 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b5b814af8a9c5e5e7a54… commit 5b5b814af8a9c5e5e7a54b7a05baaf38bf8bb06f Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Mar 13 20:32:18 2021 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu Mar 25 02:30:46 2021 +0300 [NTOS:SE] Create the anonymous logon tokens on Security initialisation phase --- ntoskrnl/include/internal/se.h | 4 ++++ ntoskrnl/se/semgr.c | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 8f73dce719c..ed5989c7054 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -198,6 +198,10 @@ extern PSECURITY_DESCRIPTOR SeSystemDefaultSd; extern PSECURITY_DESCRIPTOR SeUnrestrictedSd; extern PSECURITY_DESCRIPTOR SeSystemAnonymousLogonSd; +/* Anonymous Logon Tokens */ +extern PTOKEN SeAnonymousLogonToken; +extern PTOKEN SeAnonymousLogonTokenNoEveryone; + #define SepAcquireTokenLockExclusive(Token) \ { \ diff --git a/ntoskrnl/se/semgr.c b/ntoskrnl/se/semgr.c index 56b9d5093be..4e217c8a982 100644 --- a/ntoskrnl/se/semgr.c +++ b/ntoskrnl/se/semgr.c @@ -15,6 +15,8 @@ /* GLOBALS ********************************************************************/ +PTOKEN SeAnonymousLogonToken = NULL; +PTOKEN SeAnonymousLogonTokenNoEveryone = NULL; PSE_EXPORTS SeExports = NULL; SE_EXPORTS SepExports; ULONG SidInTokenCalls = 0; @@ -122,6 +124,16 @@ SepInitializationPhase0(VOID) ObInitializeFastReference(&PsGetCurrentProcess()->Token, NULL); ObInitializeFastReference(&PsGetCurrentProcess()->Token, SepCreateSystemProcessToken()); + + /* Initialise the anonymous logon tokens */ + SeAnonymousLogonToken = SepCreateSystemAnonymousLogonToken(); + if (!SeAnonymousLogonToken) + return FALSE; + + SeAnonymousLogonTokenNoEveryone = SepCreateSystemAnonymousLogonTokenNoEveryone(); + if (!SeAnonymousLogonTokenNoEveryone) + return FALSE; + return TRUE; }

1 0

Jump to page:

2025

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