Skip to content

Commit 5d814c8

Browse files
committed
Format code.
1 parent 0fa5cfe commit 5d814c8

File tree

1 file changed

+33
-19
lines changed

1 file changed

+33
-19
lines changed

analytics/src/analytics_windows.cc

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,24 @@ static std::wstring GetExecutablePath() {
5151
pgmptr_val, -1, NULL, 0);
5252
if (wide_char_count == 0) { // Failure if count is 0
5353
DWORD conversion_error = GetLastError();
54-
LogError(LOG_TAG "Invalid executable path. Error: %u", conversion_error);
54+
LogError(LOG_TAG "Invalid executable path. Error: %u",
55+
conversion_error);
5556
return L"";
5657
}
5758

5859
std::vector<wchar_t> wide_path_buffer(wide_char_count);
5960
if (MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, pgmptr_val, -1,
6061
wide_path_buffer.data(), wide_char_count) == 0) {
6162
DWORD conversion_error = GetLastError();
62-
LogError(LOG_TAG "Invalid executable path. Error: %u", conversion_error);
63+
LogError(LOG_TAG "Invalid executable path. Error: %u",
64+
conversion_error);
6365
return L"";
6466
}
6567
executable_path_str = wide_path_buffer.data();
6668
} else {
6769
// Both _get_wpgmptr and _get_pgmptr failed or returned empty/null
68-
LogError(LOG_TAG "Can't determine executable directory. Errors: %d, %d", err_w, err_c);
70+
LogError(LOG_TAG "Can't determine executable directory. Errors: %d, %d",
71+
err_w, err_c);
6972
return L"";
7073
}
7174
}
@@ -80,7 +83,8 @@ static std::vector<BYTE> CalculateFileSha256(HANDLE hFile) {
8083

8184
if (SetFilePointer(hFile, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) {
8285
DWORD dwError = GetLastError();
83-
LogError(LOG_TAG "CalculateFileSha256.SetFilePointer failed. Error: %u", dwError);
86+
LogError(LOG_TAG "CalculateFileSha256.SetFilePointer failed. Error: %u",
87+
dwError);
8488
return result_hash_value;
8589
}
8690

@@ -90,13 +94,16 @@ static std::vector<BYTE> CalculateFileSha256(HANDLE hFile) {
9094
if (!CryptAcquireContextW(&hProv, NULL, NULL, PROV_RSA_AES,
9195
CRYPT_VERIFYCONTEXT)) {
9296
DWORD dwError = GetLastError();
93-
LogError(LOG_TAG "CalculateFileSha256.CryptAcquireContextW failed. Error: %u", dwError);
97+
LogError(LOG_TAG
98+
"CalculateFileSha256.CryptAcquireContextW failed. Error: %u",
99+
dwError);
94100
return result_hash_value;
95101
}
96102

97103
if (!CryptCreateHash(hProv, CALG_SHA_256, 0, 0, &hHash)) {
98104
DWORD dwError = GetLastError();
99-
LogError(LOG_TAG "CalculateFileSha256.CryptCreateHash failed. Error: %u", dwError);
105+
LogError(LOG_TAG "CalculateFileSha256.CryptCreateHash failed. Error: %u",
106+
dwError);
100107
CryptReleaseContext(hProv, 0);
101108
return result_hash_value;
102109
}
@@ -109,7 +116,8 @@ static std::vector<BYTE> CalculateFileSha256(HANDLE hFile) {
109116
bReadSuccessLoop = ReadFile(hFile, rgbFile, sizeof(rgbFile), &cbRead, NULL);
110117
if (!bReadSuccessLoop) {
111118
DWORD dwError = GetLastError();
112-
LogError(LOG_TAG "CalculateFileSha256.ReadFile failed. Error: %u", dwError);
119+
LogError(LOG_TAG "CalculateFileSha256.ReadFile failed. Error: %u",
120+
dwError);
113121
CryptDestroyHash(hHash);
114122
CryptReleaseContext(hProv, 0);
115123
return result_hash_value;
@@ -119,7 +127,8 @@ static std::vector<BYTE> CalculateFileSha256(HANDLE hFile) {
119127
}
120128
if (!CryptHashData(hHash, rgbFile, cbRead, 0)) {
121129
DWORD dwError = GetLastError();
122-
LogError(LOG_TAG "CalculateFileSha256.CryptHashData failed. Error: %u", dwError);
130+
LogError(LOG_TAG "CalculateFileSha256.CryptHashData failed. Error: %u",
131+
dwError);
123132
CryptDestroyHash(hHash);
124133
CryptReleaseContext(hProv, 0);
125134
return result_hash_value;
@@ -131,11 +140,11 @@ static std::vector<BYTE> CalculateFileSha256(HANDLE hFile) {
131140
if (!CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&cbHashValue, &dwCount,
132141
0)) {
133142
DWORD dwError = GetLastError();
134-
LogError(
135-
LOG_TAG "CalculateFileSha256.CryptGetHashParam "
136-
"(HP_HASHSIZE) failed. Error: "
137-
"%u",
138-
dwError);
143+
LogError(LOG_TAG
144+
"CalculateFileSha256.CryptGetHashParam "
145+
"(HP_HASHSIZE) failed. Error: "
146+
"%u",
147+
dwError);
139148
CryptDestroyHash(hHash);
140149
CryptReleaseContext(hProv, 0);
141150
return result_hash_value;
@@ -145,7 +154,10 @@ static std::vector<BYTE> CalculateFileSha256(HANDLE hFile) {
145154
if (!CryptGetHashParam(hHash, HP_HASHVAL, result_hash_value.data(),
146155
&cbHashValue, 0)) {
147156
DWORD dwError = GetLastError();
148-
LogError(LOG_TAG "CalculateFileSha256.CryptGetHashParam (HP_HASHVAL) failed. Error: %u", dwError);
157+
LogError(
158+
LOG_TAG
159+
"CalculateFileSha256.CryptGetHashParam (HP_HASHVAL) failed. Error: %u",
160+
dwError);
149161
result_hash_value.clear();
150162
CryptDestroyHash(hHash);
151163
CryptReleaseContext(hProv, 0);
@@ -227,12 +239,13 @@ HMODULE VerifyAndLoadAnalyticsLibrary(
227239
LogError(LOG_TAG "Hash failed for Analytics DLL.");
228240
} else {
229241
if (calculated_hash.size() != expected_hash_size) {
230-
LogError(
231-
LOG_TAG "Hash size mismatch for Analytics DLL. Expected: %zu, Calculated: %zu.", expected_hash_size, calculated_hash.size());
242+
LogError(LOG_TAG
243+
"Hash size mismatch for Analytics DLL. Expected: %zu, "
244+
"Calculated: %zu.",
245+
expected_hash_size, calculated_hash.size());
232246
} else if (memcmp(calculated_hash.data(), expected_hash,
233247
expected_hash_size) != 0) {
234-
LogError(
235-
LOG_TAG "Hash mismatch for Analytics DLL.");
248+
LogError(LOG_TAG "Hash mismatch for Analytics DLL.");
236249
} else {
237250
// Load the library. LOAD_LIBRARY_SEARCH_APPLICATION_DIR is a security
238251
// measure to help ensure that the DLL is loaded from the application's
@@ -244,7 +257,8 @@ HMODULE VerifyAndLoadAnalyticsLibrary(
244257
LOAD_LIBRARY_SEARCH_APPLICATION_DIR);
245258
if (hModule == NULL) {
246259
DWORD dwError = GetLastError();
247-
LogError(LOG_TAG "Library load failed for Analytics DLL. Error: %u", dwError);
260+
LogError(LOG_TAG "Library load failed for Analytics DLL. Error: %u",
261+
dwError);
248262
}
249263
}
250264
}

0 commit comments

Comments
 (0)