Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [FREETYPE][NTGDI] Use Face->num_faces instead of ttc_header.count (#7646)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4f283b67b36511fd894f… commit d4f283b67b36511fd894f6cc1a1d7a5c2ec53360 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 20 22:09:16 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 20 22:09:16 2025 +0900 [FREETYPE][NTGDI] Use Face->num_faces instead of ttc_header.count (#7646) Supporting raster fonts. Using num_faces is the generic way. JIRA issue: CORE-16165 - Use FT_FaceRec.num_faces instead of TT_Face.ttc_header.count in counting the font faces in IntGdiLoadFontsFromMemory function. --- win32ss/gdi/ntgdi/freetype.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 86e3c7a4106..86efc2e2c30 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1986,17 +1986,10 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, if (FontIndex == -1) { - if (FT_IS_SFNT(Face)) + FT_Long iFace, num_faces = Face->num_faces; + for (iFace = 1; iFace < num_faces; ++iFace) { - TT_Face TrueType = (TT_Face)Face; - if (TrueType->ttc_header.count > 1) - { - FT_Long i; - for (i = 1; i < TrueType->ttc_header.count; ++i) - { - FaceCount += IntGdiLoadFontsFromMemory(pLoadFont, NULL, i, -1); - } - } + FaceCount += IntGdiLoadFontsFromMemory(pLoadFont, NULL, iFace, -1); } FontIndex = 0; }

5 months, 2 weeks

[reactos] 01/01: [FREELDR] Fix wrong segment register at `lgdt` instruction in amd64.S

by Daniel Victor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d72864de9558928ecaefc… commit d72864de9558928ecaefc9acf4ea925c385e6836 Author: Daniel Victor <ilauncherdeveloper(a)gmail.com> AuthorDate: Wed Dec 11 19:35:57 2024 -0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Jan 20 08:34:44 2025 +0200 [FREELDR] Fix wrong segment register at `lgdt` instruction in amd64.S --- boot/freeldr/freeldr/arch/realmode/amd64.S | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/boot/freeldr/freeldr/arch/realmode/amd64.S b/boot/freeldr/freeldr/arch/realmode/amd64.S index cfd6a396cdb..2c4f19b6c6b 100644 --- a/boot/freeldr/freeldr/arch/realmode/amd64.S +++ b/boot/freeldr/freeldr/arch/realmode/amd64.S @@ -67,11 +67,7 @@ Msg_LongModeSupported: call writestr /* Load the GDT */ -#ifdef _USE_ML - lgdt fword ptr [gdtptr] -#else - lgdt cs:[gdtptr] -#endif + lgdt lXdtPrefix ds:[gdtptr] /* Build the startup page tables */ call BuildPageTables

5 months, 2 weeks

[reactos] 01/01: [SHELL32][SDK] Follow-up of #7622; LPWSTR to PWSTR etc.

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2186ce3d580bf66449106… commit 2186ce3d580bf664491060ded28e697d1f8c17e8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 20 10:12:35 2025 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jan 20 10:12:35 2025 +0900 [SHELL32][SDK] Follow-up of #7622; LPWSTR to PWSTR etc. And LPCWSTR to PCWSTR. CORE-19278 --- dll/win32/shell32/utils.cpp | 4 ++-- sdk/include/psdk/shellapi.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 4e0949eb2bb..8214a9bb10c 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -926,10 +926,10 @@ EXTERN_C HRESULT WINAPI SHGetUnreadMailCountW( _In_opt_ HKEY hKeyUser, - _In_opt_ LPCWSTR pszMailAddress, + _In_opt_ PCWSTR pszMailAddress, _Out_opt_ PDWORD pdwCount, _Inout_opt_ PFILETIME pFileTime, - _Out_writes_opt_(cchShellExecuteCommand) LPWSTR pszShellExecuteCommand, + _Out_writes_opt_(cchShellExecuteCommand) PWSTR pszShellExecuteCommand, _In_ INT cchShellExecuteCommand) { LSTATUS error; diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h index f343928aa62..fa94826ade4 100644 --- a/sdk/include/psdk/shellapi.h +++ b/sdk/include/psdk/shellapi.h @@ -662,10 +662,10 @@ SHEnumerateUnreadMailAccountsW( HRESULT WINAPI SHGetUnreadMailCountW( _In_opt_ HKEY hKeyUser, - _In_opt_ LPCWSTR pszMailAddress, + _In_opt_ PCWSTR pszMailAddress, _Out_opt_ PDWORD pdwCount, _Inout_opt_ PFILETIME pFileTime, - _Out_writes_opt_(cchShellExecuteCommand) LPWSTR pszShellExecuteCommand, + _Out_writes_opt_(cchShellExecuteCommand) PWSTR pszShellExecuteCommand, _In_ INT cchShellExecuteCommand); #ifdef UNICODE

5 months, 2 weeks

[reactos] 01/01: [SHELL32][SHELL32_APITEST][SDK] Implement SHGetUnreadMailCountW (#7622)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84607161b4701bc7eb89e… commit 84607161b4701bc7eb89e443eff6c6f484247184 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 20 09:51:27 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 20 09:51:27 2025 +0900 [SHELL32][SHELL32_APITEST][SDK] Implement SHGetUnreadMailCountW (#7622) Implementing missing features... JIRA issue: CORE-19278 - Modify shell32.spec. - Move function definition from stubs.cpp into utils.cpp. - Add SHELL_ReadSingleUnreadMailCount helper function. - Add prototype to <shellapi.h>. --- dll/win32/shell32/shell32.spec | 2 +- dll/win32/shell32/stubs.cpp | 16 --- dll/win32/shell32/utils.cpp | 117 +++++++++++++++++++++ modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../apitests/shell32/SHGetUnreadMailCountW.cpp | 81 ++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + sdk/include/psdk/shellapi.h | 9 ++ 7 files changed, 211 insertions(+), 17 deletions(-) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index 9a4f8b07c43..86a376f49e6 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -317,7 +317,7 @@ 317 stdcall SHGetSpecialFolderLocation(long long ptr) 318 stdcall SHGetSpecialFolderPathA(long ptr long long) 319 stdcall SHGetSpecialFolderPathW(long ptr long long) -320 stdcall SHGetUnreadMailCountW (long wstr long ptr wstr long) +320 stdcall SHGetUnreadMailCountW(ptr wstr ptr ptr ptr long) 321 stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLLA 322 stdcall SHHelpShortcuts_RunDLLA(long long long long) 323 stdcall SHHelpShortcuts_RunDLLW(long long long long) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 5698b7dc0c8..f9ef73a2d7e 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -14,22 +14,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -/* - * Unimplemented - */ -EXTERN_C HRESULT -WINAPI -SHGetUnreadMailCountW(HKEY hKeyUser, - LPCWSTR pszMailAddress, - DWORD *pdwCount, - FILETIME *pFileTime, - LPWSTR pszShellExecuteCommand, - int cchShellExecuteCommand) -{ - FIXME("SHGetUnreadMailCountW() stub\n"); - return E_FAIL; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 831d52d3c1e..4e0949eb2bb 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -878,6 +878,123 @@ SHCreatePropertyBag(_In_ REFIID riid, _Out_ void **ppvObj) return SHCreatePropertyBagOnMemory(STGM_READWRITE, riid, ppvObj); } +// The helper function for SHGetUnreadMailCountW +static DWORD +SHELL_ReadSingleUnreadMailCount( + _In_ HKEY hKey, + _Out_opt_ PDWORD pdwCount, + _Out_opt_ PFILETIME pFileTime, + _Out_writes_opt_(cchShellExecuteCommand) LPWSTR pszShellExecuteCommand, + _In_ INT cchShellExecuteCommand) +{ + DWORD dwType, dwCount, cbSize = sizeof(dwCount); + DWORD error = SHQueryValueExW(hKey, L"MessageCount", 0, &dwType, &dwCount, &cbSize); + if (error) + return error; + if (pdwCount && dwType == REG_DWORD) + *pdwCount = dwCount; + + FILETIME FileTime; + cbSize = sizeof(FileTime); + error = SHQueryValueExW(hKey, L"TimeStamp", 0, &dwType, &FileTime, &cbSize); + if (error) + return error; + if (pFileTime && dwType == REG_BINARY) + *pFileTime = FileTime; + + WCHAR szName[2 * MAX_PATH]; + cbSize = sizeof(szName); + error = SHQueryValueExW(hKey, L"Application", 0, &dwType, szName, &cbSize); + if (error) + return error; + + if (pszShellExecuteCommand && dwType == REG_SZ && + FAILED(StringCchCopyW(pszShellExecuteCommand, cchShellExecuteCommand, szName))) + { + return ERROR_INSUFFICIENT_BUFFER; + } + + return ERROR_SUCCESS; +} + +/************************************************************************* + * SHGetUnreadMailCountW [SHELL32.320] + * + * @see https://learn.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-sh… + */ +EXTERN_C +HRESULT WINAPI +SHGetUnreadMailCountW( + _In_opt_ HKEY hKeyUser, + _In_opt_ LPCWSTR pszMailAddress, + _Out_opt_ PDWORD pdwCount, + _Inout_opt_ PFILETIME pFileTime, + _Out_writes_opt_(cchShellExecuteCommand) LPWSTR pszShellExecuteCommand, + _In_ INT cchShellExecuteCommand) +{ + LSTATUS error; + HKEY hKey; + + if (!hKeyUser) + hKeyUser = HKEY_CURRENT_USER; + + if (pszMailAddress) + { + CStringW strKey = L"Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail"; + strKey += L'\\'; + strKey += pszMailAddress; + + error = RegOpenKeyExW(hKeyUser, strKey, 0, KEY_QUERY_VALUE, &hKey); + if (error) + return HRESULT_FROM_WIN32(error); + + error = SHELL_ReadSingleUnreadMailCount(hKey, pdwCount, pFileTime, + pszShellExecuteCommand, cchShellExecuteCommand); + } + else + { + if (pszShellExecuteCommand || cchShellExecuteCommand) + return E_INVALIDARG; + + *pdwCount = 0; + + error = RegOpenKeyExW(hKeyUser, L"Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail", + 0, KEY_ENUMERATE_SUB_KEYS, &hKey); + if (error) + return HRESULT_FROM_WIN32(error); + + for (DWORD dwIndex = 0; !error; ++dwIndex) + { + WCHAR Name[2 * MAX_PATH]; + DWORD cchName = _countof(Name); + FILETIME LastWritten; + error = RegEnumKeyExW(hKey, dwIndex, Name, &cchName, NULL, NULL, NULL, &LastWritten); + if (error) + break; + + HKEY hSubKey; + error = RegOpenKeyExW(hKey, Name, 0, KEY_QUERY_VALUE, &hSubKey); + if (error) + break; + + FILETIME FileTime; + DWORD dwCount; + error = SHELL_ReadSingleUnreadMailCount(hSubKey, &dwCount, &FileTime, NULL, 0); + if (!error && (!pFileTime || CompareFileTime(&FileTime, pFileTime) >= 0)) + *pdwCount += dwCount; + + RegCloseKey(hSubKey); + } + + if (error == ERROR_NO_MORE_ITEMS) + error = ERROR_SUCCESS; + } + + RegCloseKey(hKey); + + return error ? HRESULT_FROM_WIN32(error) : S_OK; +} + /************************************************************************* * SHSetUnreadMailCountW [SHELL32.336] * diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index cb6c11bcf8e..3c9a2e73dcf 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -31,6 +31,7 @@ list(APPEND SOURCE SHCreateDataObject.cpp SHCreateFileDataObject.cpp SHCreateFileExtractIconW.cpp + SHGetUnreadMailCountW.cpp SHParseDisplayName.cpp SHRestricted.cpp SHShouldShowWizards.cpp diff --git a/modules/rostests/apitests/shell32/SHGetUnreadMailCountW.cpp b/modules/rostests/apitests/shell32/SHGetUnreadMailCountW.cpp new file mode 100644 index 00000000000..a669cbe1269 --- /dev/null +++ b/modules/rostests/apitests/shell32/SHGetUnreadMailCountW.cpp @@ -0,0 +1,81 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for SHGetUnreadMailCountW + * COPYRIGHT: Copyright 2025 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "shelltest.h" + +static VOID SetUnreadMailInfo(PDWORD pdwDisposition) +{ + HKEY hKey; + LSTATUS error = RegCreateKeyExW( + HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail\\example.com", + 0, NULL, 0, KEY_WRITE, NULL, &hKey, pdwDisposition); + ok_long(error, ERROR_SUCCESS); + + DWORD dwCount = 1; + error = SHSetValueW(hKey, NULL, L"MessageCount", REG_DWORD, &dwCount, sizeof(dwCount)); + ok_long(error, ERROR_SUCCESS); + + FILETIME FileTime; + GetSystemTimeAsFileTime(&FileTime); + error = SHSetValueW(hKey, NULL, L"TimeStamp", REG_BINARY, &FileTime, sizeof(FileTime)); + ok_long(error, ERROR_SUCCESS); + + LPCWSTR pszApp = L"MyMailerApp"; + DWORD cbValue = (lstrlenW(pszApp) + 1) * sizeof(WCHAR); + error = SHSetValueW(hKey, NULL, L"Application", REG_SZ, pszApp, cbValue); + ok_long(error, ERROR_SUCCESS); + + RegCloseKey(hKey); +} + +START_TEST(SHGetUnreadMailCountW) +{ + HRESULT hr; + + DWORD dwDisposition; + SetUnreadMailInfo(&dwDisposition); + + hr = SHGetUnreadMailCountW(NULL, L"example.com", NULL, NULL, NULL, 0); + ok_hex(hr, S_OK); + + FILETIME FileTime; + ZeroMemory(&FileTime, sizeof(FileTime)); + hr = SHGetUnreadMailCountW(HKEY_CURRENT_USER, L"example.com", NULL, &FileTime, NULL, 0); + ok_hex(hr, S_OK); + ok(FileTime.dwHighDateTime != 0, "FileTime.dwHighDateTime was zero\n"); + + DWORD dwCount = 0; + ZeroMemory(&FileTime, sizeof(FileTime)); + hr = SHGetUnreadMailCountW(NULL, NULL, &dwCount, &FileTime, NULL, 0); + ok_hex(hr, S_OK); + ok_long(dwCount, 1); + ok_long(FileTime.dwHighDateTime, 0); + + dwCount = 0; + hr = SHGetUnreadMailCountW(NULL, L"example.com", &dwCount, NULL, NULL, 0); + ok_hex(hr, S_OK); + ok_long(dwCount, 1); + + hr = SHGetUnreadMailCountW(NULL, NULL, &dwCount, NULL, NULL, 0); + ok_hex(hr, S_OK); + + WCHAR szAppName[MAX_PATH]; + dwCount = 0; + hr = SHGetUnreadMailCountW(NULL, NULL, &dwCount, NULL, szAppName, _countof(szAppName)); + ok_hex(hr, E_INVALIDARG); + ok_long(dwCount, 0); + + hr = SHGetUnreadMailCountW(NULL, L"example.com", NULL, NULL, szAppName, _countof(szAppName)); + ok_hex(hr, S_OK); + ok_wstr(szAppName, L"MyMailerApp"); + + if (dwDisposition == REG_CREATED_NEW_KEY) + { + RegDeleteKeyW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail\\example.com"); + } +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index fc879889ebe..3c1cbd7e045 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -44,6 +44,7 @@ extern void func_ShellHook(void); extern void func_ShellState(void); extern void func_SHGetAttributesFromDataObject(void); extern void func_SHGetFileInfo(void); +extern void func_SHGetUnreadMailCountW(void); extern void func_SHGetUserDisplayName(void); extern void func_SHLimitInputEdit(void); extern void func_SHParseDisplayName(void); @@ -96,6 +97,7 @@ const struct test winetest_testlist[] = { "ShellState", func_ShellState }, { "SHGetAttributesFromDataObject", func_SHGetAttributesFromDataObject }, { "SHGetFileInfo", func_SHGetFileInfo }, + { "SHGetUnreadMailCountW", func_SHGetUnreadMailCountW }, { "SHGetUserDisplayName", func_SHGetUserDisplayName }, { "SHLimitInputEdit", func_SHLimitInputEdit }, { "SHParseDisplayName", func_SHParseDisplayName }, diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h index b707d6d41df..f343928aa62 100644 --- a/sdk/include/psdk/shellapi.h +++ b/sdk/include/psdk/shellapi.h @@ -659,6 +659,15 @@ SHEnumerateUnreadMailAccountsW( _Out_writes_(cchMailAddress) PWSTR pszMailAddress, _In_ INT cchMailAddress); +HRESULT WINAPI +SHGetUnreadMailCountW( + _In_opt_ HKEY hKeyUser, + _In_opt_ LPCWSTR pszMailAddress, + _Out_opt_ PDWORD pdwCount, + _Inout_opt_ PFILETIME pFileTime, + _Out_writes_opt_(cchShellExecuteCommand) LPWSTR pszShellExecuteCommand, + _In_ INT cchShellExecuteCommand); + #ifdef UNICODE #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE

5 months, 2 weeks

[reactos] 01/01: [SHELL32][SHELL32_APITEST][SDK] Implement StrRStrA/W (#7621)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=157e18b215ce0f5334c4f… commit 157e18b215ce0f5334c4f2ca895447a28d650d16 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 20 08:50:26 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 20 08:50:26 2025 +0900 [SHELL32][SHELL32_APITEST][SDK] Implement StrRStrA/W (#7621) Implementing missing features... JIRA issue: CORE-19278 - Move function definitions from stubs.cpp to utils.cpp. - Add prototypes to <undocshell.h>. --- dll/win32/shell32/stubs.cpp | 22 ------ dll/win32/shell32/utils.cpp | 82 ++++++++++++++++++++ modules/rostests/apitests/shell32/CMakeLists.txt | 1 + modules/rostests/apitests/shell32/StrRStr.cpp | 97 ++++++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + sdk/include/reactos/undocshell.h | 12 +++ 6 files changed, 194 insertions(+), 22 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 8967dd49ab8..5698b7dc0c8 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -235,28 +235,6 @@ RealDriveTypeFlags(INT iDrive, BOOL bUnknown) return 1; } -/* - * Unimplemented - */ -EXTERN_C LPWSTR -WINAPI -StrRStrW(LPWSTR lpSrc, LPWSTR lpLast, LPWSTR lpSearch) -{ - FIXME("StrRStrW() stub\n"); - return NULL; -} - -/* - * Unimplemented - */ -EXTERN_C LPWSTR -WINAPI -StrRStrA(LPSTR lpSrc, LPSTR lpLast, LPSTR lpSearch) -{ - FIXME("StrRStrA() stub\n"); - return NULL; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 1f4ff07a88e..831d52d3c1e 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -13,6 +13,88 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +static PCSTR StrEndNA(_In_ PCSTR psz, _In_ INT_PTR cch) +{ + PCSTR pch, pchEnd = &psz[cch]; + for (pch = psz; *pch && pch < pchEnd; pch = CharNextA(pch)) + ; + if (pchEnd < pch) // A double-byte character detected at last? + pch -= 2; // The width of a double-byte character is 2 + return pch; +} + +static PCWSTR StrEndNW(_In_ PCWSTR psz, _In_ INT_PTR cch) +{ + PCWSTR pch, pchEnd = &psz[cch]; + for (pch = psz; *pch && pch < pchEnd; ++pch) + ; + return pch; +} + +/************************************************************************* + * StrRStrA [SHELL32.389] + */ +EXTERN_C +PSTR WINAPI +StrRStrA( + _In_ PCSTR pszSrc, + _In_opt_ PCSTR pszLast, + _In_ PCSTR pszSearch) +{ + INT cchSearch = lstrlenA(pszSearch); + + PCSTR pchEnd = pszLast ? pszLast : &pszSrc[lstrlenA(pszSrc)]; + if (pchEnd == pszSrc) + return NULL; + + INT_PTR cchEnd = pchEnd - pszSrc; + for (;;) + { + --pchEnd; + --cchEnd; + if (!pchEnd) + break; + if (!StrCmpNA(pchEnd, pszSearch, cchSearch) && pchEnd == StrEndNA(pszSrc, cchEnd)) + break; + if (pchEnd == pszSrc) + return NULL; + } + + return const_cast<PSTR>(pchEnd); +} + +/************************************************************************* + * StrRStrW [SHELL32.392] + */ +EXTERN_C +PWSTR WINAPI +StrRStrW( + _In_ PCWSTR pszSrc, + _In_opt_ PCWSTR pszLast, + _In_ PCWSTR pszSearch) +{ + INT cchSearch = lstrlenW(pszSearch); + + PCWSTR pchEnd = pszLast ? pszLast : &pszSrc[lstrlenW(pszSrc)]; + if (pchEnd == pszSrc) + return NULL; + + INT_PTR cchEnd = pchEnd - pszSrc; + for (;;) + { + --pchEnd; + --cchEnd; + if (!pchEnd) + break; + if (!StrCmpNW(pchEnd, pszSearch, cchSearch) && pchEnd == StrEndNW(pszSrc, cchEnd)) + break; + if (pchEnd == pszSrc) + return NULL; + } + + return const_cast<PWSTR>(pchEnd); +} + HWND CStubWindow32::FindStubWindow(UINT Type, LPCWSTR Path) { diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index aff71a65c90..cb6c11bcf8e 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -47,6 +47,7 @@ list(APPEND SOURCE SHGetUserDisplayName.cpp SHLimitInputEdit.cpp SHSetUnreadMailCountW.cpp + StrRStr.cpp menu.cpp shelltest.cpp) diff --git a/modules/rostests/apitests/shell32/StrRStr.cpp b/modules/rostests/apitests/shell32/StrRStr.cpp new file mode 100644 index 00000000000..a78181f791f --- /dev/null +++ b/modules/rostests/apitests/shell32/StrRStr.cpp @@ -0,0 +1,97 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for StrRStrA/W + * COPYRIGHT: Copyright 2025 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "shelltest.h" +#include <versionhelpers.h> + +typedef PSTR (WINAPI *FN_StrRStrA)(PCSTR, PCSTR, PCSTR pszSearch); +typedef PWSTR (WINAPI *FN_StrRStrW)(PCWSTR, PCWSTR, PCWSTR pszSearch); + +static VOID TEST_StrRStrA(VOID) +{ + PCSTR psz, pch; + PSTR ret; + FN_StrRStrA StrRStrA = (FN_StrRStrA)GetProcAddress(GetModuleHandleW(L"shell32"), MAKEINTRESOURCEA(389)); + + if (!StrRStrA) + { + skip("StrRStrA not found\n"); + return; + } + + psz = "ABCBC"; + ret = StrRStrA(psz, NULL, "BC"); + ok_ptr(ret, psz + 3); + + psz = "ABCBC"; + pch = &psz[2]; + ret = StrRStrA(psz, pch, "BC"); + ok_ptr(ret, &psz[1]); + + psz = "ABCBC"; + ret = StrRStrA(psz, psz, "BC"); + ok(!ret, "ret was '%s'\n", ret); + + psz = "ABCBC"; + pch = &psz[lstrlenA(psz)]; + ret = StrRStrA(psz, pch, "BC"); + ok_ptr(ret, psz + 3); +} + +static VOID TEST_StrRStrW(VOID) +{ + PCWSTR psz, pch; + PWSTR ret; + FN_StrRStrW StrRStrW = (FN_StrRStrW)GetProcAddress(GetModuleHandleW(L"shell32"), MAKEINTRESOURCEA(392)); + + if (!StrRStrW) + { + skip("StrRStrW not found\n"); + return; + } + + psz = L"ABCBC"; + ret = StrRStrW(psz, NULL, L"BC"); + ok_ptr(ret, psz + 3); + + psz = L"ABCBC"; + pch = &psz[2]; + ret = StrRStrW(psz, pch, L"BC"); + ok_ptr(ret, &psz[1]); + + psz = L"ABCBC"; + ret = StrRStrW(psz, psz, L"BC"); + ok(!ret, "ret was '%S'\n", ret); + + psz = L"ABCBC"; + pch = &psz[lstrlenW(psz)]; + ret = StrRStrW(psz, pch, L"BC"); + ok_ptr(ret, psz + 3); +} + +static BOOL IsWindowsServer2003SP2OrGreater(VOID) +{ + return IsWindowsVersionOrGreater(5, 2, 2); +} + +START_TEST(StrRStr) +{ + if (IsWindowsVistaOrGreater()) + { + skip("Vista+\n"); + return; + } + + if (!IsWindowsServer2003SP2OrGreater()) + { + skip("Before 2K3 SP3\n"); + return; + } + + TEST_StrRStrA(); + TEST_StrRStrW(); +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index daa699a8e32..fc879889ebe 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -51,6 +51,7 @@ extern void func_SHShouldShowWizards(void); extern void func_SHSimpleIDListFromPath(void); extern void func_SHRestricted(void); extern void func_SHSetUnreadMailCountW(void); +extern void func_StrRStr(void); const struct test winetest_testlist[] = { @@ -102,6 +103,7 @@ const struct test winetest_testlist[] = { "SHSimpleIDListFromPath", func_SHSimpleIDListFromPath }, { "SHRestricted", func_SHRestricted }, { "SHSetUnreadMailCountW", func_SHSetUnreadMailCountW }, + { "StrRStr", func_StrRStr }, { 0, 0 } }; diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index beb840c89e2..797979334ee 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -794,6 +794,18 @@ BOOL WINAPI GUIDFromStringW( _In_ PCWSTR psz, _Out_ LPGUID pguid); +PSTR WINAPI +StrRStrA( + _In_ PCSTR pszSrc, + _In_opt_ PCSTR pszLast, + _In_ PCSTR pszSearch); + +PWSTR WINAPI +StrRStrW( + _In_ PCWSTR pszSrc, + _In_opt_ PCWSTR pszLast, + _In_ PCWSTR pszSearch); + LPSTR WINAPI SheRemoveQuotesA(LPSTR psz); LPWSTR WINAPI SheRemoveQuotesW(LPWSTR psz);

5 months, 2 weeks

[reactos] 01/01: [SHELL32][SHELL32_APITEST][SDK] Implement SHEnumerateUnreadMailAccountsW (#7619)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa52c3f5ebb588adbf710… commit aa52c3f5ebb588adbf710310dcb9dd5bfb3a3ba6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 20 08:32:07 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 20 08:32:07 2025 +0900 [SHELL32][SHELL32_APITEST][SDK] Implement SHEnumerateUnreadMailAccountsW (#7619) Implementing missing features... JIRA issue: CORE-19278 - Move function definition from stubs.cpp into utils.cpp. - Add prototype to <shellapi.h>. --- dll/win32/shell32/stubs.cpp | 15 ---------- dll/win32/shell32/utils.cpp | 33 ++++++++++++++++++++++ modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../shell32/SHEnumerateUnreadMailAccountsW.cpp | 33 ++++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 ++ sdk/include/psdk/shellapi.h | 7 +++++ 6 files changed, 76 insertions(+), 15 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index 70918f6f18a..8967dd49ab8 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -30,21 +30,6 @@ SHGetUnreadMailCountW(HKEY hKeyUser, return E_FAIL; } -/* - * Unimplemented - */ -EXTERN_C HRESULT -WINAPI -SHEnumerateUnreadMailAccountsW(HKEY user, - DWORD idx, - LPWSTR mailaddress, - INT mailaddresslen) -{ - FIXME("SHEnumerateUnreadMailAccountsW(%p %d %p %d) stub\n", - user, idx, mailaddress, mailaddresslen); - return E_NOTIMPL; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 391acbd8461..1f4ff07a88e 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -901,6 +901,39 @@ SheRemoveQuotesW(LPWSTR psz) return psz; } +/************************************************************************* + * SHEnumerateUnreadMailAccountsW [SHELL32.287] + * + * @see https://learn.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-sh… + */ +EXTERN_C +HRESULT WINAPI +SHEnumerateUnreadMailAccountsW( + _In_opt_ HKEY hKeyUser, + _In_ DWORD dwIndex, + _Out_writes_(cchMailAddress) PWSTR pszMailAddress, + _In_ INT cchMailAddress) +{ + if (!hKeyUser) + hKeyUser = HKEY_CURRENT_USER; + + HKEY hKey; + LSTATUS error = RegOpenKeyExW(hKeyUser, + L"Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail", + 0, KEY_ENUMERATE_SUB_KEYS, &hKey); + if (error) + return HRESULT_FROM_WIN32(error); + + FILETIME FileTime; + error = RegEnumKeyExW(hKey, dwIndex, pszMailAddress, (PDWORD)&cchMailAddress, NULL, NULL, + NULL, &FileTime); + if (error) + *pszMailAddress = UNICODE_NULL; + + RegCloseKey(hKey); + return error ? HRESULT_FROM_WIN32(error) : S_OK; +} + /************************************************************************* * SHFindComputer [SHELL32.91] * diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 7a7b523a68d..aff71a65c90 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -34,6 +34,7 @@ list(APPEND SOURCE SHParseDisplayName.cpp SHRestricted.cpp SHShouldShowWizards.cpp + SHEnumerateUnreadMailAccountsW.cpp She.cpp ShellExec_RunDLL.cpp ShellExecCmdLine.cpp diff --git a/modules/rostests/apitests/shell32/SHEnumerateUnreadMailAccountsW.cpp b/modules/rostests/apitests/shell32/SHEnumerateUnreadMailAccountsW.cpp new file mode 100644 index 00000000000..5abc2df9a44 --- /dev/null +++ b/modules/rostests/apitests/shell32/SHEnumerateUnreadMailAccountsW.cpp @@ -0,0 +1,33 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for SHEnumerateUnreadMailAccountsW + * COPYRIGHT: Copyright 2025 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "shelltest.h" + +START_TEST(SHEnumerateUnreadMailAccountsW) +{ + HRESULT hr; + WCHAR szMailAddress[MAX_PATH]; + HKEY hKey; + LSTATUS error; + DWORD dwDisposition; + + error = RegCreateKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail\\example.com", + 0, NULL, 0, KEY_WRITE, NULL, &hKey, &dwDisposition); + ok_long(error, ERROR_SUCCESS); + + szMailAddress[0] = UNICODE_NULL; + hr = SHEnumerateUnreadMailAccountsW(NULL, 0, szMailAddress, _countof(szMailAddress)); + ok_hex(hr, S_OK); + ok(szMailAddress[0] != UNICODE_NULL, "szMailAddress was empty\n"); + + if (dwDisposition == REG_CREATED_NEW_KEY) + { + RegDeleteKeyW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail\\example.com"); + } +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index d98d529c6fb..daa699a8e32 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -34,6 +34,7 @@ extern void func_SHChangeNotify(void); extern void func_SHCreateDataObject(void); extern void func_SHCreateFileDataObject(void); extern void func_SHCreateFileExtractIconW(void); +extern void func_SHEnumerateUnreadMailAccountsW(void); extern void func_She(void); extern void func_ShellExec_RunDLL(void); extern void func_ShellExecCmdLine(void); @@ -84,6 +85,7 @@ const struct test winetest_testlist[] = { "SHCreateDataObject", func_SHCreateDataObject }, { "SHCreateFileDataObject", func_SHCreateFileDataObject }, { "SHCreateFileExtractIconW", func_SHCreateFileExtractIconW }, + { "SHEnumerateUnreadMailAccountsW", func_SHEnumerateUnreadMailAccountsW }, { "She", func_She }, { "ShellExec_RunDLL", func_ShellExec_RunDLL }, { "ShellExecCmdLine", func_ShellExecCmdLine }, diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h index eeda59cfcfb..b707d6d41df 100644 --- a/sdk/include/psdk/shellapi.h +++ b/sdk/include/psdk/shellapi.h @@ -652,6 +652,13 @@ SHTestTokenMembership( _In_ ULONG ulRID); #endif +HRESULT WINAPI +SHEnumerateUnreadMailAccountsW( + _In_opt_ HKEY hKeyUser, + _In_ DWORD dwIndex, + _Out_writes_(cchMailAddress) PWSTR pszMailAddress, + _In_ INT cchMailAddress); + #ifdef UNICODE #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE

5 months, 2 weeks

[reactos] 01/01: [SHELL32] Follow-up of #7620: Simplify string handling

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bb8b46ba8e5c25c95a42… commit 0bb8b46ba8e5c25c95a4250edbac8863523b8608 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 20 08:27:26 2025 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jan 20 08:28:58 2025 +0900 [SHELL32] Follow-up of #7620: Simplify string handling CORE-19278 --- dll/win32/shell32/utils.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 575dadaa338..391acbd8461 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -808,8 +808,7 @@ SHSetUnreadMailCountW( _In_ DWORD dwCount, _In_ PCWSTR pszShellExecuteCommand) { - CString strKey = L"Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail"; - strKey += L'\\'; + CString strKey = L"Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail\\"; strKey += pszMailAddress; HKEY hKey;

5 months, 2 weeks

[reactos] 01/01: [SHELL32] Temporarily disable LVS_EX_DOUBLEBUFFER in DefView (#7642)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b87c6b879907980aee4fd… commit b87c6b879907980aee4fd957b8cecbd1b2ded407 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Jan 19 23:20:34 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 19 23:20:34 2025 +0100 [SHELL32] Temporarily disable LVS_EX_DOUBLEBUFFER in DefView (#7642) Hackfix for CORE-19624 and CORE-19818 until ListView is fixed --- dll/win32/shell32/CDefView.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 21e7c1bcc4f..55c99e6f7ad 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -828,7 +828,9 @@ BOOL CDefView::CreateList() { dwStyle |= LVS_SHOWSELALWAYS; // MSDN says FWF_SHOWSELALWAYS is deprecated, always turn on for folders dwStyle |= (m_FolderSettings.fFlags & FWF_ALIGNLEFT) ? LVS_ALIGNLEFT : LVS_ALIGNTOP; +#if 0 // FIXME: Temporarily disabled until ListView is fixed (CORE-19624, CORE-19818) ListExStyle |= LVS_EX_DOUBLEBUFFER; +#endif } ViewMode = m_FolderSettings.ViewMode;

5 months, 2 weeks

[reactos] 01/01: [SHELL32] Allow DnD to create shortcuts across different drives (#7607)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aebaa14eba88056e15f46… commit aebaa14eba88056e15f46adbb30767a3889f2d1d Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Jan 19 21:00:55 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 19 21:00:55 2025 +0100 [SHELL32] Allow DnD to create shortcuts across different drives (#7607) CORE-17871 CORE-18271 --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 61 +++++++++++++++++-------- dll/win32/shell32/droptargets/CFSDropTarget.h | 1 + dll/win32/shell32/folders/CDrivesFolder.cpp | 9 ++-- dll/win32/shell32/shldataobject.cpp | 5 +- 4 files changed, 49 insertions(+), 27 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index fce1a88d5b8..e7b5927500e 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -24,6 +24,11 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +#define D_NONE DROPEFFECT_NONE +#define D_COPY DROPEFFECT_COPY +#define D_MOVE DROPEFFECT_MOVE +#define D_LINK DROPEFFECT_LINK + static void SHELL_StripIllegalFsNameCharacters(_Inout_ LPWSTR Buf) { for (LPWSTR src = Buf, dst = src;;) @@ -38,6 +43,17 @@ static void SHELL_StripIllegalFsNameCharacters(_Inout_ LPWSTR Buf) } } +static bool PathIsSameDrive(LPCWSTR Path1, LPCWSTR Path2) +{ + int d1 = PathGetDriveNumberW(Path1), d2 = PathGetDriveNumberW(Path2); + return d1 == d2 && d2 >= 0; +} + +static bool PathIsDriveRoot(LPCWSTR Path) +{ + return PathIsRootW(Path) && PathGetDriveNumberW(Path) >= 0; +} + static HRESULT SHELL_LimitDropEffectToItemAttributes(_In_ IDataObject *pDataObject, _Inout_ PDWORD pdwEffect) { @@ -134,7 +150,8 @@ CFSDropTarget::CFSDropTarget(): m_fAcceptFmt(FALSE), m_sPathTarget(NULL), m_hwndSite(NULL), - m_grfKeyState(0) + m_grfKeyState(0), + m_AllowedEffects(0) { } @@ -147,13 +164,7 @@ HRESULT CFSDropTarget::Initialize(LPWSTR PathTarget) if (!m_cfShellIDList) return E_FAIL; - m_sPathTarget = (WCHAR *)SHAlloc((wcslen(PathTarget) + 1) * sizeof(WCHAR)); - if (!m_sPathTarget) - return E_OUTOFMEMORY; - - wcscpy(m_sPathTarget, PathTarget); - - return S_OK; + return SHStrDupW(PathTarget, &m_sPathTarget); } CFSDropTarget::~CFSDropTarget() @@ -202,7 +213,13 @@ BOOL CFSDropTarget::_QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) *pdwEffect = DROPEFFECT_NONE; if (m_fAcceptFmt) { /* Does our interpretation of the keystate ... */ - *pdwEffect = KeyStateToDropEffect (dwKeyState); + *pdwEffect = KeyStateToDropEffect(dwKeyState); + + // Transform disallowed move to a copy + if ((*pdwEffect & D_MOVE) && (m_AllowedEffects & (D_MOVE | D_COPY)) == D_COPY) + *pdwEffect = D_COPY; + + *pdwEffect &= m_AllowedEffects; if (*pdwEffect == DROPEFFECT_NONE) *pdwEffect = dwEffect; @@ -320,6 +337,9 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, { TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); + const BOOL bAnyKeyMod = dwKeyState & (MK_SHIFT | MK_CONTROL); + m_AllowedEffects = *pdwEffect; + if (*pdwEffect == DROPEFFECT_NONE) return S_OK; @@ -337,11 +357,9 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, m_grfKeyState = dwKeyState; -#define D_NONE DROPEFFECT_NONE -#define D_COPY DROPEFFECT_COPY -#define D_MOVE DROPEFFECT_MOVE -#define D_LINK DROPEFFECT_LINK - m_dwDefaultEffect = *pdwEffect; + SHELL_LimitDropEffectToItemAttributes(pDataObject, pdwEffect); + m_AllowedEffects = *pdwEffect; + m_dwDefaultEffect = m_AllowedEffects; switch (*pdwEffect & (D_COPY | D_MOVE | D_LINK)) { case D_COPY | D_MOVE: @@ -378,19 +396,24 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject, WCHAR wstrFirstFile[MAX_PATH]; if (DragQueryFileW((HDROP)medium.hGlobal, 0, wstrFirstFile, _countof(wstrFirstFile))) { - /* Check if the drive letter is different */ - if (wstrFirstFile[0] != m_sPathTarget[0]) + if (!PathIsSameDrive(wstrFirstFile, m_sPathTarget) && m_dwDefaultEffect != D_LINK) { m_dwDefaultEffect = DROPEFFECT_COPY; } + + if (!bAnyKeyMod && PathIsDriveRoot(wstrFirstFile) && (m_AllowedEffects & DROPEFFECT_LINK)) + { + m_dwDefaultEffect = DROPEFFECT_LINK; // Don't copy a drive by default + } } ReleaseStgMedium(&medium); } if (!m_fAcceptFmt) - *pdwEffect = DROPEFFECT_NONE; + m_AllowedEffects = DROPEFFECT_NONE; else *pdwEffect = m_dwDefaultEffect; + *pdwEffect &= m_AllowedEffects; return S_OK; } @@ -471,7 +494,7 @@ HRESULT WINAPI CFSDropTarget::Drop(IDataObject *pDataObject, data->pt = pt; // Need to dereference as pdweffect gets freed. data->pdwEffect = *pdwEffect; - SHCreateThread(CFSDropTarget::_DoDropThreadProc, data, NULL, NULL); + SHCreateThread(CFSDropTarget::_DoDropThreadProc, data, CTF_COINIT | CTF_PROCESS_REF, NULL); return S_OK; } } @@ -726,7 +749,6 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, DWORD WINAPI CFSDropTarget::_DoDropThreadProc(LPVOID lpParameter) { - CoInitialize(NULL); _DoDropData *data = static_cast<_DoDropData*>(lpParameter); CComPtr<IDataObject> pDataObject; HRESULT hr = CoGetInterfaceAndReleaseStream (data->pStream, IID_PPV_ARG(IDataObject, &pDataObject)); @@ -744,7 +766,6 @@ DWORD WINAPI CFSDropTarget::_DoDropThreadProc(LPVOID lpParameter) data->This->Release(); //Release the parameter from the heap. HeapFree(GetProcessHeap(), 0, data); - CoUninitialize(); return 0; } diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.h b/dll/win32/shell32/droptargets/CFSDropTarget.h index 706164d8f6d..bde59979c24 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.h +++ b/dll/win32/shell32/droptargets/CFSDropTarget.h @@ -35,6 +35,7 @@ class CFSDropTarget : HWND m_hwndSite; DWORD m_grfKeyState; DWORD m_dwDefaultEffect; + DWORD m_AllowedEffects; CComPtr<IUnknown> m_site; BOOL _QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 040511f03e9..df2f591b8bc 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -557,7 +557,7 @@ static const DWORD dwControlPanelAttributes = SFGAO_HASSUBFOLDER | SFGAO_FOLDER | SFGAO_CANLINK; static const DWORD dwDriveAttributes = SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | - SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANRENAME | SFGAO_CANLINK; + SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANCOPY; CDrivesFolder::CDrivesFolder() { @@ -611,10 +611,9 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST pdwAttributes); } - if (lpszDisplayName[0] && - ((L'A' <= lpszDisplayName[0] && lpszDisplayName[0] <= L'Z') || + if (((L'A' <= lpszDisplayName[0] && lpszDisplayName[0] <= L'Z') || (L'a' <= lpszDisplayName[0] && lpszDisplayName[0] <= L'z')) && - lpszDisplayName[1] == L':' && lpszDisplayName[2] == L'\\') + lpszDisplayName[1] == L':' && (lpszDisplayName[2] == L'\\' || !lpszDisplayName[2])) { // "C:\..." WCHAR szRoot[8]; @@ -630,7 +629,7 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST if (!pidlTemp) return E_OUTOFMEMORY; - if (lpszDisplayName[3]) + if (lpszDisplayName[2] && lpszDisplayName[3]) { CComPtr<IShellFolder> pChildFolder; hr = BindToObject(pidlTemp, pbc, IID_PPV_ARG(IShellFolder, &pChildFolder)); diff --git a/dll/win32/shell32/shldataobject.cpp b/dll/win32/shell32/shldataobject.cpp index 728cca0dbf3..04126e930b9 100644 --- a/dll/win32/shell32/shldataobject.cpp +++ b/dll/win32/shell32/shldataobject.cpp @@ -77,8 +77,9 @@ HRESULT WINAPI SHGetAttributesFromDataObject(IDataObject* pDataObject, DWORD dwA data.dwAttributes = rgfInOut & dwQueryAttributes; data.cItems = apidl.GetSize(); - hr = DataObject_SetData(pDataObject, g_DataObjectAttributes, &data, sizeof(data)); - FAILED_UNEXPECTEDLY(hr); + HRESULT hr2; + hr2 = DataObject_SetData(pDataObject, g_DataObjectAttributes, &data, sizeof(data)); + FAILED_UNEXPECTEDLY(hr2); // Report cache failure but don't fail the function } } }

5 months, 2 weeks

[reactos] 01/01: [REGEDIT] Add ES_AUTOHSCROLL to address bar window (#7638)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17eff53f35e72e661532a… commit 17eff53f35e72e661532a66da0879d71e2ff4be8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 20 01:01:30 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 20 01:01:30 2025 +0900 [REGEDIT] Add ES_AUTOHSCROLL to address bar window (#7638) Enable horizontal scroll on address bar. JIRA issue: CORE-19743 - Add ES_AUTOHSCROLL style to the address bar window on its creation. --- base/applications/regedit/childwnd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index b08736e5322..1cd0dc787ed 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -388,7 +388,8 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa g_pChildWnd->nSplitPos = 190; g_pChildWnd->hWnd = hWnd; - style = WS_CHILD | WS_VISIBLE | WS_TABSTOP; + /* ES_AUTOHSCROLL style enables horizontal scrolling and shrinking */ + style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL; g_pChildWnd->hAddressBarWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, (HMENU)0, hInst, 0);

5 months, 2 weeks

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