@@ -2229,21 +2229,21 @@ size_t FormatGeneratedException (DWORD_PTR dataPtr,
2229
2229
__out_ecount_opt (bufferLength) WCHAR *wszBuffer,
2230
2230
size_t bufferLength,
2231
2231
BOOL bAsync,
2232
- BOOL bNestedCase= FALSE,
2233
- BOOL bLineNumbers= FALSE)
2232
+ BOOL bNestedCase = FALSE,
2233
+ BOOL bLineNumbers = FALSE)
2234
2234
{
2235
2235
UINT count = bytes / sizeof (StackTraceElement);
2236
2236
size_t Length = 0 ;
2237
2237
2238
- if (wszBuffer && bufferLength> 0 )
2238
+ if (wszBuffer && bufferLength > 0 )
2239
2239
{
2240
2240
wszBuffer[0 ] = L' \0 ' ;
2241
2241
}
2242
2242
2243
2243
// Buffer is calculated for sprintf below (" %p %p %S\n");
2244
2244
WCHAR wszLineBuffer[mdNameLen + 8 + sizeof (size_t )*2 + MAX_LONGPATH + 8 ];
2245
2245
2246
- if (count== 0 )
2246
+ if (count == 0 )
2247
2247
{
2248
2248
return 0 ;
2249
2249
}
@@ -2307,22 +2307,13 @@ size_t FormatGeneratedException (DWORD_PTR dataPtr,
2307
2307
{
2308
2308
char filename[MAX_LONGPATH+1 ] = " " ;
2309
2309
ULONG linenum = 0 ;
2310
- if (bLineNumbers
2311
- && FAILED (GetLineByOffset (TO_CDADDR (ste.ip ),
2312
- &linenum,
2313
- filename,
2314
- _countof (filename))))
2315
- {
2316
- bLineNumbers = FALSE ;
2317
- }
2318
-
2319
- if (!bLineNumbers)
2310
+ if (bLineNumbers && SUCCEEDED (GetLineByOffset (TO_CDADDR (ste.ip ), &linenum, filename, _countof (filename))))
2320
2311
{
2321
- swprintf_s (wszLineBuffer, _countof (wszLineBuffer), W (" %s\n " ), so.String ());
2312
+ swprintf_s (wszLineBuffer, _countof (wszLineBuffer), W (" %s [%S @ %d] \n " ), so.String (), filename, linenum );
2322
2313
}
2323
2314
else
2324
2315
{
2325
- swprintf_s (wszLineBuffer, _countof (wszLineBuffer), W (" %s [%S @ %d] \n " ), so.String (), filename, linenum );
2316
+ swprintf_s (wszLineBuffer, _countof (wszLineBuffer), W (" %s\n " ), so.String ());
2326
2317
}
2327
2318
2328
2319
Length += _wcslen (wszLineBuffer);
0 commit comments