FileView: Tweaks and fixes

Plugins/PluginFileView/PluginFileView.cpp

@@ -46,7 +46,7 @@ typedef struct	// 22 bytes
 unsigned __stdcall UpdateInfoThreadProc(void* pParam);
 void EscapeRegex(std::wstring& regex);
 void GetFolderInfo(std::queue<std::wstring>& folderQueue, std::wstring& folder, ParentMeasure* parent, RecursiveType rType);
-void GetIcon(std::wstring filePath, std::wstring iconPath, IconSize iconSize);
+void GetIcon(std::wstring filePath, const std::wstring& iconPath, IconSize iconSize);
 HRESULT SaveIcon(HICON hIcon, FILE* fp);
 
 std::vector<ParentMeasure*> g_ParentMeasures;
@@ -706,7 +706,7 @@ void UpdateInfo(ParentMeasure* parent)
 		tmp->folderSize = 0;
 
 		// If no path is specified, get all the drives instead
-		if (tmp->path == L"" || tmp->path.empty())
+		if (tmp->path.empty())
 		{
 			WCHAR drive[4] = L" :\\";
 			DWORD driveMask = GetLogicalDrives();
@@ -755,7 +755,7 @@ void UpdateInfo(ParentMeasure* parent)
 
 		// Sort
 		const int sortAsc = tmp->sortAscending ? 1 : -1;
-		auto begin = ((tmp->path != L"" || !tmp->path.empty()) && 
+		auto begin = (!tmp->path.empty() && 
 			(tmp->showDotDot && tmp->recursiveType != RECURSIVE_FULL)) ? tmp->files.begin() + 1: tmp->files.begin();
 
 		switch (tmp->sortType)
@@ -1071,7 +1071,7 @@ void GetFolderInfo(std::queue<std::wstring>& folderQueue, std::wstring& folder,
 	}
 }
 
-void GetIcon(std::wstring filePath, std::wstring iconPath, IconSize iconSize)
+void GetIcon(std::wstring filePath, const std::wstring& iconPath, IconSize iconSize)
 {
 	SHFILEINFO shFileInfo;
 	HICON icon = nullptr;
@@ -1081,18 +1081,12 @@ void GetIcon(std::wstring filePath, std::wstring iconPath, IconSize iconSize)
 	// Special case for .url files
 	if (filePath.size() > 3 && _wcsicmp(filePath.substr(filePath.size() - 4).c_str(), L".URL") == 0)
 	{
-		WCHAR buffer[MAX_PATH] = L"";
+		const WCHAR* urlFile = filePath.c_str();
-		GetPrivateProfileString(L"InternetShortcut", L"IconFile", L"", buffer, sizeof(buffer), filePath.c_str());
+		WCHAR buffer[MAX_PATH];
-		if (*buffer)
+		if (GetPrivateProfileString(L"InternetShortcut", L"IconFile", L"", buffer, _countof(buffer), urlFile) > 0)
 		{
-			std::wstring file = buffer;
+			int iconIndex = GetPrivateProfileInt(L"InternetShortcut", L"IconIndex", 0, urlFile);
-			int iconIndex = 0;
+			iconIndex = max(0, iconIndex);
-
-			GetPrivateProfileString(L"InternetShortcut", L"IconIndex", L"-1", buffer, sizeof(buffer), filePath.c_str());
-			if (buffer != L"-1")
-			{
-				iconIndex = _wtoi(buffer);
-			}
 
 			int size = 16;
 			switch (iconSize)
@@ -1102,28 +1096,31 @@ void GetIcon(std::wstring filePath, std::wstring iconPath, IconSize iconSize)
 			case IS_MEDIUM: size = 32; break;
 			}
 
-			PrivateExtractIcons(file.c_str(), iconIndex, size, size, &icon, nullptr, 1, LR_LOADTRANSPARENT);
+			PrivateExtractIcons(buffer, iconIndex, size, size, &icon, nullptr, 1, LR_LOADTRANSPARENT);
 		}
 		else
 		{
-			std::wstring browser;
+			DWORD bufferSize = sizeof(buffer);
-			WCHAR buffer[MAX_PATH];
-			DWORD size = MAX_PATH;
 			HKEY hKey;
-
+			if (RegOpenKeyEx(HKEY_CLASSES_ROOT, L"http\\shell\\open\\command", 0, KEY_QUERY_VALUE, &hKey))
-			RegOpenKeyEx(HKEY_CLASSES_ROOT, L"http\\shell\\open\\command", 0, KEY_QUERY_VALUE, &hKey);
-			RegQueryValueEx(hKey, nullptr, nullptr, nullptr, (LPBYTE)buffer, &size);
-			RegCloseKey(hKey);
-
-			//Strip quotes
-			if (buffer[0] == L'"')
 			{
-				browser = buffer; browser = browser.substr(1);
+				RegQueryValueEx(hKey, nullptr, nullptr, nullptr, (LPBYTE)buffer, &bufferSize);
-				size_t pos = browser.find_first_of(L'"');
+				RegCloseKey(hKey);
-				browser = browser.substr(0, pos);
-			}
 
-			filePath = browser;
+				WCHAR* path = buffer;
+				if (path[0] == L'"')
+				{
+					// Strip quotes.
+					++path;
+					WCHAR* pos = wcsrchr(path, L'"');
+					if (pos)
+					{
+						*pos = L'\0';
+					}
+				}
+
+				filePath = path;
+			}
 		}
 	}
 

Plugins/PluginFileView/PluginFileView.h

@@ -119,8 +119,8 @@ struct ParentMeasure
 	ChildMeasure* ownerChild;
 
 	ParentMeasure() :
-		path(L""),
+		path(),
-		wildcardSearch(L""),
+		wildcardSearch(),
 		folderSize(0),
 		sortType(STYPE_NAME),
 		sortDateType(DTYPE_MODIFIED),
@@ -137,7 +137,7 @@ struct ParentMeasure
 		iconChildren(),
 		files(),
 		skin(nullptr),
-		name(L""),
+		name(),
 		ownerChild(nullptr),
 		threadActive(false),
 		fileCount(0),
@@ -164,10 +164,10 @@ struct ChildMeasure
 		type(TYPE_FOLDERPATH),
 		date(DTYPE_MODIFIED),
 		iconSize(IS_LARGE),
-		iconPath(L""),
+		iconPath(),
 		index(1),
 		ignoreCount(false),
-		strValue(L""),
+		strValue(),
 		parent(nullptr) { }
 };