Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] CoUninitialize only if CoInitialize* is successful
by Katayama Hirofumi MZ 28 Sep '20

28 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a822eadce6b4f20066fdc… commit a822eadce6b4f20066fdc3b1a36f311d325b0c86 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 20:13:28 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 28 20:13:28 2020 +0900 [SHELL32] CoUninitialize only if CoInitialize* is successful Technically CoUninitialize should be called only if CoInitializeEx succeeded (including S_FALSE). CORE-1419 --- dll/win32/shell32/dialogs/dialogs.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 6996a416076..1e5635cb1d1 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -29,6 +29,7 @@ typedef struct LPCWSTR lpstrTitle; LPCWSTR lpstrDescription; UINT uFlags; + BOOL bCoInited; } RUNFILEDLGPARAMS; typedef BOOL (WINAPI * LPFNOFN) (OPENFILENAMEW *); @@ -549,14 +550,17 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA hwndEdit = ComboInfo.hwndItem; ASSERT(::IsWindow(hwndEdit)); - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); // SHAutoComplete needs co init + // SHAutoComplete needs co init + prfdp->bCoInited = SUCCEEDED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED)); + SHAutoComplete(hwndEdit, SHACF_FILESYSTEM | SHACF_FILESYS_ONLY | SHACF_URLALL); SetFocus(hwndCombo); return TRUE; case WM_DESTROY: - CoUninitialize(); + if (prfdp->bCoInited) + CoUninitialize(); break; case WM_COMMAND:

1 0

[reactos] 01/01: [BROWSEUI] Follow-up part 3 of #3242 (6b6f971)
by Katayama Hirofumi MZ 28 Sep '20

28 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=467feb9996308ea4d3d62… commit 467feb9996308ea4d3d6240a567a8faa7328610c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 10:58:22 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 28 10:58:22 2020 +0900 [BROWSEUI] Follow-up part 3 of #3242 (6b6f971) Also recognize slash, dot, colon, and semicolon. CORE-1419 --- dll/win32/browseui/CAutoComplete.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 1f300bc1a2a..008a8185baa 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -304,8 +304,10 @@ static void Edit_BackWord(HWND hwndEdit) for (; 0 < iStart; --iStart) { - if ((pszText[iStart - 1] == L'\\' && pszText[iStart] != 0) || - (IsCharSpaceW(pszText[iStart - 1]) && IsCharAlphaNumericW(pszText[iStart]))) + WCHAR ch1 = pszText[iStart - 1]; + WCHAR ch2 = pszText[iStart]; + if ((wcschr(L"\\/.:;", ch1) && ch2 && !IsCharSpaceW(ch2)) || + (IsCharSpaceW(ch1) && IsCharAlphaNumericW(ch2))) { SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L"");

1 0

[reactos] 01/01: [BROWSEUI] Follow-up part 2 of #3242 (6b6f971)
by Katayama Hirofumi MZ 28 Sep '20

28 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=737278276f66192d508c5… commit 737278276f66192d508c5dad9d024f29ee902de9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 10:41:21 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 28 10:41:21 2020 +0900 [BROWSEUI] Follow-up part 2 of #3242 (6b6f971) Don't recognize backslash of the last character. CORE-1419 --- dll/win32/browseui/CAutoComplete.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 5f4aff54140..1f300bc1a2a 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -304,7 +304,7 @@ static void Edit_BackWord(HWND hwndEdit) for (; 0 < iStart; --iStart) { - if (pszText[iStart - 1] == L'\\' || + if ((pszText[iStart - 1] == L'\\' && pszText[iStart] != 0) || (IsCharSpaceW(pszText[iStart - 1]) && IsCharAlphaNumericW(pszText[iStart]))) { SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd);

1 0

[reactos] 01/01: [BROWSEUI] Follow-up of #3242 (6b6f971)
by Katayama Hirofumi MZ 28 Sep '20

28 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9812bce2713b9620ac318… commit 9812bce2713b9620ac318c3d4bee5934147264fd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 10:14:36 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 28 10:14:36 2020 +0900 [BROWSEUI] Follow-up of #3242 (6b6f971) Recognize backslashes in Ctrl+Back. CORE-1419 --- dll/win32/browseui/CAutoComplete.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index e984dab2f17..5f4aff54140 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -304,7 +304,8 @@ static void Edit_BackWord(HWND hwndEdit) for (; 0 < iStart; --iStart) { - if (IsCharSpaceW(pszText[iStart - 1]) && IsCharAlphaNumericW(pszText[iStart])) + if (pszText[iStart - 1] == L'\\' || + (IsCharSpaceW(pszText[iStart - 1]) && IsCharAlphaNumericW(pszText[iStart]))) { SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L"");

1 0

[reactos] 01/01: [BROWSEUI][SHELL32] Enable Ctrl+Backspace in AutoComplete edit boxes (#3242)
by Katayama Hirofumi MZ 28 Sep '20

28 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b6f9719398ea56f93b31… commit 6b6f9719398ea56f93b31db5234b4b799af723ec Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 09:27:01 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 28 09:27:01 2020 +0900 [BROWSEUI][SHELL32] Enable Ctrl+Backspace in AutoComplete edit boxes (#3242) The key combination Ctrl+Back is well working in auto-completion edit boxes. CORE-1419 --- dll/win32/browseui/CAutoComplete.cpp | 51 +++++++++++++++++++++++++++++++++++ dll/win32/shell32/dialogs/dialogs.cpp | 7 +++++ 2 files changed, 58 insertions(+) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 8bf5b152e84..e984dab2f17 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -3,6 +3,7 @@ * * Copyright 2004 Maxime Belleng� <maxime.bellenge(a)laposte.net> * Copyright 2009 Andrew Hill + * Copyright 2020 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -279,6 +280,48 @@ HRESULT WINAPI CAutoComplete::SetOptions(DWORD dwFlag) return hr; } +/* Edit_BackWord --- Delete previous word in text box */ +static void Edit_BackWord(HWND hwndEdit) +{ + INT iStart, iEnd; + iStart = iEnd = 0; + SendMessageW(hwndEdit, EM_GETSEL, (WPARAM)&iStart, (LPARAM)&iEnd); + + if (iStart != iEnd) + return; + + DWORD cchText = GetWindowTextLengthW(hwndEdit); + size_t cb = (cchText + 1) * sizeof(WCHAR); + LPWSTR pszText = (LPWSTR)CoTaskMemAlloc(cb); + if (pszText == NULL) + return; + + if (GetWindowTextW(hwndEdit, pszText, cchText + 1) <= 0) + { + CoTaskMemFree(pszText); + return; + } + + for (; 0 < iStart; --iStart) + { + if (IsCharSpaceW(pszText[iStart - 1]) && IsCharAlphaNumericW(pszText[iStart])) + { + SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); + SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L""); + iStart = -1; + break; + } + } + + if (iStart == 0) + { + SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); + SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L""); + } + + CoTaskMemFree(pszText); +} + /* Window procedure for autocompletion */ @@ -407,6 +450,14 @@ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM }; break; case VK_BACK: + { + if (GetKeyState(VK_CONTROL) < 0) // Ctrl+Backspace + { + Edit_BackWord(hwnd); + return 0; + } + } + // FALL THROUGH case VK_DELETE: { if ((! *hwndText) && (pThis->options & ACO_AUTOSUGGEST)) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index aa71de0b1f4..6996a416076 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -547,11 +547,18 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA ComboInfo.cbSize = sizeof(ComboInfo); GetComboBoxInfo(hwndCombo, &ComboInfo); hwndEdit = ComboInfo.hwndItem; + ASSERT(::IsWindow(hwndEdit)); + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); // SHAutoComplete needs co init SHAutoComplete(hwndEdit, SHACF_FILESYSTEM | SHACF_FILESYS_ONLY | SHACF_URLALL); SetFocus(hwndCombo); return TRUE; + case WM_DESTROY: + CoUninitialize(); + break; + case WM_COMMAND: switch (LOWORD(wParam)) {

1 0

[reactos] 01/01: [CMD] Fix substring-substitute regression from commit cdc8e45b (use signed offsets).
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5ba9de2ee1ab825d9dd1… commit f5ba9de2ee1ab825d9dd108fade57860db0fad79 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Sep 28 00:30:18 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 28 00:41:17 2020 +0200 [CMD] Fix substring-substitute regression from commit cdc8e45b (use signed offsets). --- base/shell/cmd/cmd.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index a3253026f10..e92426d8cb3 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1421,21 +1421,19 @@ do { \ } else if (*Src == _T('~')) { - /* %VAR:~[start][,length]% - substring + /* %VAR:~[start][,length]% - Substring. * Negative values are offsets from the end. */ - size_t Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); - size_t End = VarLength; + SSIZE_T Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); + SSIZE_T End = (SSIZE_T)VarLength; if (Start < 0) Start += VarLength; - Start = max(Start, 0); - Start = min(Start, VarLength); + Start = min(max(Start, 0), VarLength); if (*Src == _T(',')) { End = _tcstol(Src + 1, (PTSTR*)&Src, 0); End += (End < 0) ? VarLength : Start; - End = max(End, Start); - End = min(End, VarLength); + End = min(max(End, Start), VarLength); } if (*Src++ != Delim) goto bad_subst;

1 0

[reactos] 01/01: [NTOS] Remove an old hack
by Timo Kreuzer 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2e3e8a1ebd5b5c27ea6f… commit f2e3e8a1ebd5b5c27ea6f155420e7b3764014b11 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Aug 8 12:28:33 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Sep 28 00:27:30 2020 +0200 [NTOS] Remove an old hack --- ntoskrnl/io/iomgr/driver.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 8727c26330f..330a0bf8ed9 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -1133,9 +1133,6 @@ IopInitializeBootDrivers(VOID) * See PiQueueDeviceAction function */ PnPBootDriversLoaded = TRUE; - - /* In old ROS, the loader list became empty after this point. Simulate. */ - InitializeListHead(&KeLoaderBlock->LoadOrderListHead); } INIT_FUNCTION

1 0

[reactos] 01/01: [NTOS:PS] Fix size handling in ProcessDeviceMap
by Timo Kreuzer 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d74037b66657d582e1e26… commit d74037b66657d582e1e26bb94a943e98d28f4517 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 27 17:32:27 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Sep 28 00:24:53 2020 +0200 [NTOS:PS] Fix size handling in ProcessDeviceMap If you want to know the details, browse history or use git blame. --- ntoskrnl/ps/query.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index 5e340c7ccdf..60f440ab9bc 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -564,12 +564,6 @@ NtQueryInformationProcess(IN HANDLE ProcessHandle, /* DOS Device Map */ case ProcessDeviceMap: - if (ProcessInformationLength < sizeof(PROCESS_DEVICEMAP_INFORMATION)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - if (ProcessInformationLength == sizeof(PROCESS_DEVICEMAP_INFORMATION_EX)) { /* Protect read in SEH */ @@ -601,7 +595,8 @@ NtQueryInformationProcess(IN HANDLE ProcessHandle, } else { - if (ProcessInformationLength != sizeof(PROCESS_DEVICEMAP_INFORMATION)) + /* This has to be the size of the Query union field for x64 compatibility! */ + if (ProcessInformationLength != RTL_FIELD_SIZE(PROCESS_DEVICEMAP_INFORMATION, Query)) { Status = STATUS_INFO_LENGTH_MISMATCH; break;

1 0

[reactos] 01/01: [CMD] Cleanup all batch contexts if the execution loop stopped due to EXIT.
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=895dccd4ac7cc9c8dcb4a… commit 895dccd4ac7cc9c8dcb4a679e34fe0b50c560b2e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 27 20:24:38 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 27 20:26:36 2020 +0200 [CMD] Cleanup all batch contexts if the execution loop stopped due to EXIT. --- base/shell/cmd/batch.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 671be4189d9..36600cd0720 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -478,6 +478,11 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) ret = ExecuteCommandWithEcho(Cmd); FreeCommand(Cmd); } + if (bExit) + { + /* Stop all execution */ + ExitAllBatches(); + } /* Perform top-level batch cleanup */ if (!bc || bTopLevel)

1 0

[reactos] 01/01: [SHELL32] Fix usage of return value
by Timo Kreuzer 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68cb54dc58251d7ee8cab… commit 68cb54dc58251d7ee8cabebe42421a44796eba9c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 27 17:30:18 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 27 19:58:21 2020 +0200 [SHELL32] Fix usage of return value --- dll/win32/shell32/shellmenu/CStartMenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/shellmenu/CStartMenu.cpp b/dll/win32/shell32/shellmenu/CStartMenu.cpp index 8831ab860b5..d701013f160 100644 --- a/dll/win32/shell32/shellmenu/CStartMenu.cpp +++ b/dll/win32/shell32/shellmenu/CStartMenu.cpp @@ -517,7 +517,7 @@ RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv) pCallback->AddRef(); // CreateInstance returns object with 0 ref count */ pCallback->Initialize(pShellMenu, pBandSite, pDeskBar); - pShellMenu->Initialize(pCallback, (UINT) -1, 0, SMINIT_TOPLEVEL | SMINIT_VERTICAL); + hr = pShellMenu->Initialize(pCallback, (UINT) -1, 0, SMINIT_TOPLEVEL | SMINIT_VERTICAL); if (FAILED_UNEXPECTEDLY(hr)) return hr;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs