mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-04 11:59:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[ImageResizer]Fix use without initializing warn

Browse Source
This commit is contained in:
Jaime Bernardo 2023-10-16 10:26:40 +01:00
parent e6118e1b76
commit 2015ecae69
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/imageresizer/ImageResizerContextMenu/dllmain.cpp
View File

@ -255,14 +255,20 @@ private:
for (DWORD i = 0; i < fileCount; i++) for (DWORD i = 0; i < fileCount; i++)
{ {
IShellItem* shellItem; IShellItem* shellItem;
psiItemArray->GetItemAt(i, &shellItem); HRESULT getItemAtResult = psiItemArray->GetItemAt(i, &shellItem);
LPWSTR itemName; if (SUCCEEDED(getItemAtResult))
// Retrieves the entire file system path of the file from its shell item {
shellItem->GetDisplayName(SIGDN_FILESYSPATH, &itemName); LPWSTR itemName;
CString fileName(itemName); // Retrieves the entire file system path of the file from its shell item
fileName.Append(_T("\r\n")); HRESULT getDisplayResult = shellItem->GetDisplayName(SIGDN_FILESYSPATH, &itemName);
// Write the file path into the input stream for image resizer if (SUCCEEDED(getDisplayResult))
writePipe.Write(fileName, fileName.GetLength() * sizeof(TCHAR)); {
CString fileName(itemName);
fileName.Append(_T("\r\n"));
// Write the file path into the input stream for image resizer
writePipe.Write(fileName, fileName.GetLength() * sizeof(TCHAR));
}
}
} }
writePipe.Close(); writePipe.Close();
} }

8
src/modules/imageresizer/dll/ContextMenuHandler.cpp
View File

@ -386,8 +386,14 @@ HRESULT __stdcall CContextMenuHandler::GetState(IShellItemArray* psiItemArray, B
PERCEIVED type; PERCEIVED type;
PERCEIVEDFLAG flag; PERCEIVEDFLAG flag;
IShellItem* shellItem; IShellItem* shellItem;
//Check extension of first item in the list (the item which is right-clicked on) //Check extension of first item in the list (the item which is right-clicked on)
psiItemArray->GetItemAt(0, &shellItem); HRESULT getItemAtResult = psiItemArray->GetItemAt(0, &shellItem);
if(!SUCCEEDED(getItemAtResult)) {
// Avoid crashes in the following code.
return E_FAIL;
}
LPTSTR pszPath; LPTSTR pszPath;
// Retrieves the entire file system path of the file from its shell item // Retrieves the entire file system path of the file from its shell item
HRESULT getDisplayResult = shellItem->GetDisplayName(SIGDN_FILESYSPATH, &pszPath); HRESULT getDisplayResult = shellItem->GetDisplayName(SIGDN_FILESYSPATH, &pszPath);