Update StorageNetworkService.cs

Author: 0x5bfa

src/Files.App/Services/Storage/StorageNetworkService.cs

@@ -88,27 +88,21 @@ unsafe IEnumerable<ILocatableFolder> GetComputers()
 						(attribute & SFGAO_FLAGS.SFGAO_FOLDER) is not SFGAO_FLAGS.SFGAO_FOLDER)
 						continue;
 
-					// Get the target path
-					using ComPtr<IShellLinkW> pShellLink = default;
-					var shellLinkIid = typeof(IShellLinkW).GUID;
-					pShellItem.Get()->QueryInterface(&shellLinkIid, (void**)pShellLink.GetAddressOf());
-					string targetPath = string.Empty;
-					fixed (char* pszTargetPath = new char[1024])
-					{
-						hr = pShellLink.Get()->GetPath(pszTargetPath, 1024, null, (uint)SLGP_FLAGS.SLGP_RAWPATH);
-						targetPath = Environment.ExpandEnvironmentVariables(new PWSTR(pszTargetPath).ToString());
-					}
-
 					// Get the display name
 					pShellItem.Get()->GetDisplayName(SIGDN.SIGDN_NORMALDISPLAY, out var szDisplayName);
 					var fileName = szDisplayName.ToString();
 					PInvoke.CoTaskMemFree(szDisplayName.Value);
 
+					// Get the file system path on disk
+					pShellItem.Get()->GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out szDisplayName);
+					var filePath = szDisplayName.ToString();
+					PInvoke.CoTaskMemFree(szDisplayName.Value);
+
 					var item = new DriveItem()
 					{
 						Text = fileName,
-						Path = targetPath,
-						DeviceID = targetPath,
+						Path = filePath,
+						DeviceID = filePath,
 						Type = DriveType.Network,
 						ItemType = NavigationControlItemType.Drive,
 						MenuOptions = new()
@@ -156,10 +150,32 @@ unsafe IEnumerable<ILocatableFolder> GetShortcuts()
 					var shellLinkIid = typeof(IShellLinkW).GUID;
 					pShellItem.Get()->QueryInterface(&shellLinkIid, (void**)pShellLink.GetAddressOf());
 					string targetPath = string.Empty;
-					fixed (char* pszTargetPath = new char[1024])
+					if (pShellLink.IsNull)
 					{
-						hr = pShellLink.Get()->GetPath(pszTargetPath, 1024, null, (uint)SLGP_FLAGS.SLGP_RAWPATH);
-						targetPath = Environment.ExpandEnvironmentVariables(new PWSTR(pszTargetPath).ToString());
+						using ComPtr<IShellItem2> pShellItem2 = default;
+						var shellItem2Iid = typeof(IShellItem2).GUID;
+						pShellItem.Get()->QueryInterface(&shellItem2Iid, (void**)pShellItem2.GetAddressOf());
+						PInvoke.PSGetPropertyKeyFromName("System.Link.TargetParsingPath", out var propertyKey);
+						pShellItem2.Get()->GetString(propertyKey, out var pszTargetPath);
+						targetPath = Environment.ExpandEnvironmentVariables(pszTargetPath.ToString());
+
+						// Test 1
+						pShellItem.Get()->GetDisplayName(SIGDN_DESKTOPABSOLUTEPARSING, out var szDisplayNameTest);
+						var filePathTest = szDisplayNameTest.ToString();
+						PInvoke.CoTaskMemFree(szDisplayNameTest.Value); // break here
+
+						// Test 2
+						pShellItem.Get()->GetDisplayName(SIGDN_PARENTRELATIVEPARSING, out szDisplayNameTest);
+						filePathTest = szDisplayNameTest.ToString();
+						PInvoke.CoTaskMemFree(szDisplayNameTest.Value); // break here
+					}
+					else
+					{
+						fixed (char* pszTargetPath = new char[1024])
+						{
+							hr = pShellLink.Get()->GetPath(pszTargetPath, 1024, null, (uint)SLGP_FLAGS.SLGP_RAWPATH);
+							targetPath = Environment.ExpandEnvironmentVariables(new PWSTR(pszTargetPath).ToString());
+						}
 					}
 
 					// Get the display name