From d69a80fad7caa4cd6de255b777641776f81012c7 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Wed, 26 Mar 2025 20:13:36 +0900
Subject: [PATCH] [SHDOCVW] Follow-up of #7804: Improve AddUrlToFavorites
 (#7820)

JIRA issue: CORE-19824
JIRA issue: CORE-19867
JIRA issue: CORE-14172
- Use <strsafe.h>.
- Don't use CSIDL_COMMON_FAVORITES.
---
 dll/win32/shdocvw/utility.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dll/win32/shdocvw/utility.cpp b/dll/win32/shdocvw/utility.cpp
index bd4b522c420..a6dfcb93a58 100644
--- a/dll/win32/shdocvw/utility.cpp
+++ b/dll/win32/shdocvw/utility.cpp
@@ -3,9 +3,11 @@
  * LICENSE:     LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
  * PURPOSE:     Utility routines
  * COPYRIGHT:   Copyright 2024 Whindmar Saksit <whindsaks@proton.me>
+ *              Copyright 2025 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
  */
 
 #include "objects.h"
+#include <strsafe.h>
 
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
@@ -209,7 +211,7 @@ AddUrlToFavorites(
     // Get title
     WCHAR szTitle[MAX_PATH];
     if (pszTitleW)
-        lstrcpynW(szTitle, pszTitleW, _countof(szTitle));
+        StringCchCopyW(szTitle, _countof(szTitle), pszTitleW);
     else
         ILGetDisplayNameEx(NULL, pidl, szTitle, ILGDN_NORMAL);
 
@@ -219,7 +221,7 @@ AddUrlToFavorites(
     // Build shortcut pathname
     WCHAR szPath[MAX_PATH];
     if (!SHGetSpecialFolderPathW(hwnd, szPath, CSIDL_FAVORITES, TRUE))
-        SHGetSpecialFolderPathW(hwnd, szPath, CSIDL_COMMON_FAVORITES, TRUE);
+        return E_FAIL;
     PathAppendW(szPath, szTitle);
     PathAddExtensionW(szPath, L".lnk");