mir/PowerToys
2
0
Fork 0
mirror of https://github.com/microsoft/PowerToys synced 2025-09-03 16:05:12 +00:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Fixed telemetry calls in Image Resizer (#1983)

Browse Source
This commit is contained in:
Arjun Balgovind
2020-04-07 15:19:22 -07:00
committed by GitHub
parent c241d48df3
commit 4f29f998c5
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,6 +147,7 @@ HRESULT CContextMenuHandler::QueryContextMenu(_In_ HMENU hmenu, UINT indexMenu,
if (!InsertMenuItem(hmenu, indexMenu, TRUE, &mii)) if (!InsertMenuItem(hmenu, indexMenu, TRUE, &mii))
{ {
hr = HRESULT_FROM_WIN32(GetLastError()); hr = HRESULT_FROM_WIN32(GetLastError());
Trace::QueryContextMenuError(hr);
} }
else else
{ {
@@ -220,12 +221,12 @@ HRESULT CContextMenuHandler::ResizePictures(CMINVOKECOMMANDINFO* pici, IShellIte
HRESULT hr = E_FAIL; HRESULT hr = E_FAIL;
if (!CreatePipe(&hReadPipe, &hWritePipe, &sa, 0)) if (!CreatePipe(&hReadPipe, &hWritePipe, &sa, 0))
{ {
Trace::InvokedRet(hr); hr = HRESULT_FROM_WIN32(GetLastError());
return hr; return hr;
} }
if (!SetHandleInformation(hWritePipe, HANDLE_FLAG_INHERIT, 0)) if (!SetHandleInformation(hWritePipe, HANDLE_FLAG_INHERIT, 0))
{ {
Trace::InvokedRet(hr); hr = HRESULT_FROM_WIN32(GetLastError());
return hr; return hr;
} }
CAtlFile writePipe(hWritePipe); CAtlFile writePipe(hWritePipe);
@@ -277,12 +278,12 @@ HRESULT CContextMenuHandler::ResizePictures(CMINVOKECOMMANDINFO* pici, IShellIte
delete[] lpszCommandLine; delete[] lpszCommandLine;
if (!CloseHandle(processInformation.hProcess)) if (!CloseHandle(processInformation.hProcess))
{ {
Trace::InvokedRet(hr); hr = HRESULT_FROM_WIN32(GetLastError());
return hr; return hr;
} }
if (!CloseHandle(processInformation.hThread)) if (!CloseHandle(processInformation.hThread))
{ {
Trace::InvokedRet(hr); hr = HRESULT_FROM_WIN32(GetLastError());
return hr; return hr;
} }
@@ -322,7 +323,6 @@ HRESULT CContextMenuHandler::ResizePictures(CMINVOKECOMMANDINFO* pici, IShellIte
writePipe.Close(); writePipe.Close();
hr = S_OK; hr = S_OK;
Trace::InvokedRet(hr);
return hr; return hr;
} }

10
src/modules/imageresizer/dll/trace.cpp
View File

@@ -47,3 +47,13 @@ void Trace::InvokedRet(_In_ HRESULT hr) noexcept
TraceLoggingHResult(hr), TraceLoggingHResult(hr),
TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE)); TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
} }
void Trace::QueryContextMenuError(_In_ HRESULT hr) noexcept
{
TraceLoggingWrite(
g_hProvider,
"ImageResizer_QueryContextMenuError",
ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
TraceLoggingHResult(hr),
TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
}

1
src/modules/imageresizer/dll/trace.h
View File

@@ -8,4 +8,5 @@ public:
static void EnableImageResizer(_In_ bool enabled) noexcept; static void EnableImageResizer(_In_ bool enabled) noexcept;
static void Invoked() noexcept; static void Invoked() noexcept;
static void InvokedRet(_In_ HRESULT hr) noexcept; static void InvokedRet(_In_ HRESULT hr) noexcept;
static void QueryContextMenuError(_In_ HRESULT hr) noexcept;
}; };