From 4d0a26db58cb6ce8c9d000101f11b1f2eb987ce0 Mon Sep 17 00:00:00 2001
From: Whindmar Saksit <whindsaks@proton.me>
Date: Tue, 19 Nov 2024 23:50:08 +0100
Subject: [PATCH] [SHLWAPI][SHLWAPI_APITEST] Optimize StrRetToStrW WSTR
 handling (#7513)

This avoids Alloc/Free while also matching the Windows behavior.
---
 dll/win32/shlwapi/string.c                 |  6 ++++++
 modules/rostests/apitests/shlwapi/StrDup.c | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/dll/win32/shlwapi/string.c b/dll/win32/shlwapi/string.c
index 0285f6cd58a..dec137a9d67 100644
--- a/dll/win32/shlwapi/string.c
+++ b/dll/win32/shlwapi/string.c
@@ -1635,8 +1635,14 @@ HRESULT WINAPI StrRetToStrW(LPSTRRET lpStrRet, const ITEMIDLIST *pidl, LPWSTR *p
   switch (lpStrRet->uType)
   {
   case STRRET_WSTR:
+#ifdef __REACTOS__
+    hRet = lpStrRet->u.pOleStr ? S_OK : E_FAIL;
+    *ppszName = lpStrRet->u.pOleStr;
+    lpStrRet->u.pOleStr = NULL; /* Windows does this, presumably in case someone calls SHFree */
+#else
     hRet = SHStrDupW(lpStrRet->u.pOleStr, ppszName);
     CoTaskMemFree(lpStrRet->u.pOleStr);
+#endif
     break;
 
   case STRRET_CSTR:
diff --git a/modules/rostests/apitests/shlwapi/StrDup.c b/modules/rostests/apitests/shlwapi/StrDup.c
index 4872b77948d..7d53bddd243 100644
--- a/modules/rostests/apitests/shlwapi/StrDup.c
+++ b/modules/rostests/apitests/shlwapi/StrDup.c
@@ -39,8 +39,25 @@ static void TEST_StrDupW(void)
         LocalFree(ptrW);
 }
 
+static void TEST_StrRet(void)
+{
+    LPWSTR input, output;
+    if (SUCCEEDED(SHStrDupW(L"Test", &input)))
+    {
+        STRRET strret;
+        strret.uType = STRRET_WSTR;
+        U(strret).pOleStr = input;
+        output = NULL;
+        ok_int(StrRetToStrW(&strret, NULL, &output), S_OK);
+        ok_ptr(U(strret).pOleStr, NULL);
+        ok_ptr(input, output);
+        CoTaskMemFree(output);
+    }
+}
+
 START_TEST(StrDup)
 {
     TEST_StrDupA();
     TEST_StrDupW();
+    TEST_StrRet();
 }