Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 01/01: [BROWSEUI_APITEST] Follow-up of #3249 (b1c3329)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=828a65f470ec5b1504b07… commit 828a65f470ec5b1504b0776bac182d051b855473 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 1 05:03:34 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 1 05:03:34 2020 +0900 [BROWSEUI_APITEST] Follow-up of #3249 (b1c3329) CORE-9281 --- modules/rostests/apitests/browseui/IACLCustomMRU.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/browseui/IACLCustomMRU.cpp b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp index cfde9d11cfc..89eb058261d 100644 --- a/modules/rostests/apitests/browseui/IACLCustomMRU.cpp +++ b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp @@ -411,8 +411,12 @@ RestoreTypedURLs(const CStringW& url1, const CStringW& url2) key.Open(HKEY_CURRENT_USER, TYPED_URLS_KEY, KEY_WRITE); if (url1 != L"") key.SetStringValue(L"url1", url1); + else + key.DeleteValue(L"url1"); if (url2 != L"") key.SetStringValue(L"url2", url2); + else + key.DeleteValue(L"url2"); } static void @@ -421,7 +425,7 @@ test_IACLCustomMRU_TypedURLs() // TypedURLs is special case CStringW url1, url2; // Save values { CRegKey key; - key.Open(HKEY_CURRENT_USER, TYPED_URLS_KEY, KEY_READ | KEY_WRITE); + key.Create(HKEY_CURRENT_USER, TYPED_URLS_KEY); WCHAR Value[MAX_PATH]; ULONG cch = _countof(Value);

4 years, 2 months

[reactos] 01/01: [BROWSEUI_APITEST] Strengthen IACLCustomMRU testcase (#3249)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1c33293b0c9a444a0a3c… commit b1c33293b0c9a444a0a3c3e67d79a60ff1ef3661 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 30 20:51:49 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 30 20:51:49 2020 +0900 [BROWSEUI_APITEST] Strengthen IACLCustomMRU testcase (#3249) Add some tests for "TypedURLs" of a special case. The TypedURLs registry key consists of the registry values of "url1", "url2", "url3" etc instead of "MRUList", "a", "b" etc. CORE-9281 --- .../rostests/apitests/browseui/IACLCustomMRU.cpp | 146 ++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/browseui/IACLCustomMRU.cpp b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp index 9cf5ef765d4..cfde9d11cfc 100644 --- a/modules/rostests/apitests/browseui/IACLCustomMRU.cpp +++ b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp @@ -29,7 +29,8 @@ ULONG DbgPrint(PCH Format,...); #expression, (int)(result), _value, (char)key); \ } while (0) - +#define ok_wstri(x, y) \ + ok(lstrcmpiW(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x) struct CCoInit { @@ -401,6 +402,148 @@ test_IACLCustomMRU_Continue() verify_mru(CustomMRU, L"ba", L"FIRST_ENTRY", L"SECOND_ENTRY"); } +#define TYPED_URLS_KEY L"Software\\Microsoft\\Internet Explorer\\TypedURLs" + +static void +RestoreTypedURLs(const CStringW& url1, const CStringW& url2) +{ + CRegKey key; + key.Open(HKEY_CURRENT_USER, TYPED_URLS_KEY, KEY_WRITE); + if (url1 != L"") + key.SetStringValue(L"url1", url1); + if (url2 != L"") + key.SetStringValue(L"url2", url2); +} + +static void +test_IACLCustomMRU_TypedURLs() // TypedURLs is special case +{ + CStringW url1, url2; // Save values + { + CRegKey key; + key.Open(HKEY_CURRENT_USER, TYPED_URLS_KEY, KEY_READ | KEY_WRITE); + + WCHAR Value[MAX_PATH]; + ULONG cch = _countof(Value); + LSTATUS Status = key.QueryStringValue(L"url1", Value, &cch); + if (!Status) + url1 = Value; + + cch = _countof(Value); + Status = key.QueryStringValue(L"url2", Value, &cch); + if (!Status) + url2 = Value; + + // Set values + key.SetStringValue(L"url1", L"aaa"); + key.SetStringValue(L"url2", L"bbb"); + } + + CComPtr<IACLCustomMRU> CustomMRU; + HRESULT hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, + IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (FAILED(hr)) + { + skip("IACLCustomMRU was NULL\n"); + RestoreTypedURLs(url1, url2); + return; + } + + CComPtr<IACList> ACList; + hr = CustomMRU->QueryInterface(IID_PPV_ARG(IACList, &ACList)); + ok_hex(hr, S_OK); + if (SUCCEEDED(hr)) + { + hr = ACList->Expand(L"C:"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\Program Files"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\Program Files\\"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"http://"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"https://"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"https://google.co.jp/"); + ok_hex(hr, E_NOTIMPL); + } + + hr = CustomMRU->Initialize(TYPED_URLS_KEY, 64); + ok_hex(hr, S_OK); + + if (ACList) + { + hr = ACList->Expand(L"C:"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\Program Files"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"C:\\Program Files\\"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"http://"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"https://"); + ok_hex(hr, E_NOTIMPL); + hr = ACList->Expand(L"https://google.co.jp/"); + ok_hex(hr, E_NOTIMPL); + } + + CComPtr<IEnumString> pEnum; + hr = CustomMRU->QueryInterface(IID_PPV_ARG(IEnumString, &pEnum)); + ok_hex(hr, S_OK); + if (FAILED(hr)) + { + skip("IEnumString was NULL\n"); + RestoreTypedURLs(url1, url2); + return; + } + + CComPtr<IEnumString> pEnumClone; + hr = pEnum->Clone(&pEnumClone); + ok_hex(hr, E_NOTIMPL); + + hr = pEnum->Skip(1); + ok_hex(hr, E_NOTIMPL); + +#define INVALID_LPOLESTR ((LPOLESTR)(LONG_PTR)0xDEADBEEF) + LPOLESTR apsz[2] = { NULL, INVALID_LPOLESTR }; + ULONG c = 0; + hr = pEnum->Next(2, apsz, &c); + ok_hex(hr, S_OK); + ok_wstri(apsz[0], L"aaa"); + ok_int(c, 1); + ok(apsz[1] == INVALID_LPOLESTR, "apsz[1] was '%S'\n", apsz[1]); + CoTaskMemFree(apsz[0]); + + LPOLESTR psz = INVALID_LPOLESTR; + c = 0; + hr = pEnum->Next(0, &psz, &c); + ok_hex(hr, S_OK); + ok(psz == INVALID_LPOLESTR, "psz was '%S'\n", psz); + ok_int(c, 0); + + psz = NULL; + c = 0; + hr = pEnum->Next(1, &psz, &c); + ok_hex(hr, S_OK); + ok_wstri(psz, L"bbb"); + ok_int(c, 1); + CoTaskMemFree(psz); + + hr = CustomMRU->AddMRUString(L"https://google.co.jp"); + ok_hex(hr, E_FAIL); + hr = CustomMRU->AddMRUString(L"C:"); + ok_hex(hr, E_FAIL); + hr = CustomMRU->AddMRUString(L"C:\\"); + ok_hex(hr, E_FAIL); + + RestoreTypedURLs(url1, url2); +} + START_TEST(IACLCustomMRU) { CCoInit init; @@ -412,6 +555,7 @@ START_TEST(IACLCustomMRU) test_IACLCustomMRU_UpdateOrder(); test_IACLCustomMRU_ExtraChars(); test_IACLCustomMRU_Continue(); + test_IACLCustomMRU_TypedURLs(); Cleanup_Testdata(); }

4 years, 2 months

[reactos] 01/01: [MSGINA] Allow to pair FriendlyShutDownDlg with 'Server' CORE-17282

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2bbf54b6f6f8ffdc3fd4… commit d2bbf54b6f6f8ffdc3fd4a0d91c836dd7e5a135f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Sep 30 13:08:58 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Sep 30 13:08:58 2020 +0200 [MSGINA] Allow to pair FriendlyShutDownDlg with 'Server' CORE-17282 A ros specific addition that does not exist on Windows. Default for Server is still the classic shutdown dlg, no change on that. But interested users can manually now create the registry setting "EnforceFriendlyShutdown" REG_DWORD to "1" within "SYSTEM\\CurrentControlSet\\Control\\Windows" to allow overriding the Windows default behavior without relying on changing the product version number, because that would not be side-effect-free. Addendum to 0.4.15-dev-650-g 2edcb58e6550fd6283cf3a7d332ee61849704f3d --- dll/win32/msgina/shutdown.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dll/win32/msgina/shutdown.c b/dll/win32/msgina/shutdown.c index 88f1036d5dd..bc6e97949d6 100644 --- a/dll/win32/msgina/shutdown.c +++ b/dll/win32/msgina/shutdown.c @@ -100,7 +100,6 @@ IsFriendlyUIActive(VOID) HKEY hKey; LONG lRet; - /* Check product version number first */ lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Windows", 0, @@ -109,6 +108,25 @@ IsFriendlyUIActive(VOID) if (lRet != ERROR_SUCCESS) return FALSE; + /* CORE-17282 First check an optional ReactOS specific override, that Windows does not check. + We use this to allow users pairing 'Server'-configuration with FriendlyShutdown. + Otherwise users would have to change CSDVersion or LogonType (side-effects AppCompat) */ + dwValue = 0; + dwSize = sizeof(dwValue); + lRet = RegQueryValueExW(hKey, + L"EnforceFriendlyShutdown", + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize); + + if (lRet == ERROR_SUCCESS && dwType == REG_DWORD && dwValue == 0x1) + { + RegCloseKey(hKey); + return TRUE; + } + + /* Check product version number */ dwValue = 0; dwSize = sizeof(dwValue); lRet = RegQueryValueExW(hKey,

4 years, 2 months

[reactos] 01/01: [BROWSEUI] Fix Edit_BackWord function (#3247)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1a01de7f7cbd6529b70b… commit e1a01de7f7cbd6529b70bfc00c61b4df1fab82a8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 28 22:05:14 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 28 22:05:14 2020 +0900 [BROWSEUI] Fix Edit_BackWord function (#3247) Fix and improve Edit_BackWord function (for Ctrl+Back key combination on auto-completion in edit boxes) by using GetStringTypeW. CORE-1419 --- dll/win32/browseui/CAutoComplete.cpp | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 008a8185baa..b18956b6547 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -287,32 +287,30 @@ static void Edit_BackWord(HWND hwndEdit) iStart = iEnd = 0; SendMessageW(hwndEdit, EM_GETSEL, (WPARAM)&iStart, (LPARAM)&iEnd); - if (iStart != iEnd) + if (iStart != iEnd || iStart < 0) return; - DWORD cchText = GetWindowTextLengthW(hwndEdit); - size_t cb = (cchText + 1) * sizeof(WCHAR); - LPWSTR pszText = (LPWSTR)CoTaskMemAlloc(cb); - if (pszText == NULL) + size_t cchText = GetWindowTextLengthW(hwndEdit); + if (cchText < (size_t)iStart || (INT)cchText <= 0) + return; + + CComHeapPtr<WCHAR> pszText; + if (!pszText.Allocate(cchText + 1)) return; if (GetWindowTextW(hwndEdit, pszText, cchText + 1) <= 0) - { - CoTaskMemFree(pszText); return; - } - for (; 0 < iStart; --iStart) + WORD types[2]; + for (--iStart; 0 < iStart; --iStart) { - WCHAR ch1 = pszText[iStart - 1]; - WCHAR ch2 = pszText[iStart]; - if ((wcschr(L"\\/.:;", ch1) && ch2 && !IsCharSpaceW(ch2)) || - (IsCharSpaceW(ch1) && IsCharAlphaNumericW(ch2))) + GetStringTypeW(CT_CTYPE1, &pszText[iStart - 1], 2, types); + if (((types[0] & C1_PUNCT) && !(types[1] & C1_SPACE)) || + ((types[0] & C1_SPACE) && (types[1] & (C1_ALPHA | C1_DIGIT)))) { SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L""); - iStart = -1; - break; + return; } } @@ -321,8 +319,6 @@ static void Edit_BackWord(HWND hwndEdit) SendMessageW(hwndEdit, EM_SETSEL, iStart, iEnd); SendMessageW(hwndEdit, EM_REPLACESEL, TRUE, (LPARAM)L""); } - - CoTaskMemFree(pszText); } /*

4 years, 2 months

[reactos] 01/01: [SHELL32] CoUninitialize only if CoInitialize* is successful

by Katayama Hirofumi MZ

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:

4 years, 2 months

[reactos] 01/01: [BROWSEUI] Follow-up part 3 of #3242 (6b6f971)

by Katayama Hirofumi MZ

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"");

4 years, 2 months

[reactos] 01/01: [BROWSEUI] Follow-up part 2 of #3242 (6b6f971)

by Katayama Hirofumi MZ

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);

4 years, 2 months

[reactos] 01/01: [BROWSEUI] Follow-up of #3242 (6b6f971)

by Katayama Hirofumi MZ

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"");

4 years, 2 months

[reactos] 01/01: [BROWSEUI][SHELL32] Enable Ctrl+Backspace in AutoComplete edit boxes (#3242)

by Katayama Hirofumi MZ

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)) {

4 years, 2 months

[reactos] 01/01: [CMD] Fix substring-substitute regression from commit cdc8e45b (use signed offsets).

by Hermès Bélusca-Maïto

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;

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