diff options
| -rw-r--r-- | src/Common/Dlgcode.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index d8ed1bc2..de400e7a 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c | |||
| @@ -1617,7 +1617,7 @@ LRESULT CALLBACK CustomDlgProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar | |||
| 1617 | return DefDlgProc (hwnd, uMsg, wParam, lParam); | 1617 | return DefDlgProc (hwnd, uMsg, wParam, lParam); |
| 1618 | } | 1618 | } |
| 1619 | 1619 | ||
| 1620 | 1620 | /* | |
| 1621 | static BOOL IsReturnAddress (DWORD64 address) | 1621 | static BOOL IsReturnAddress (DWORD64 address) |
| 1622 | { | 1622 | { |
| 1623 | static size_t codeEnd = 0; | 1623 | static size_t codeEnd = 0; |
| @@ -1637,7 +1637,7 @@ static BOOL IsReturnAddress (DWORD64 address) | |||
| 1637 | || (sp[-6] == 0xff && sp[-5] == 0x15) // call [ADDR] | 1637 | || (sp[-6] == 0xff && sp[-5] == 0x15) // call [ADDR] |
| 1638 | || (sp[-2] == 0xff && (sp[-1] & 0xf0) == 0xd0); // call REG | 1638 | || (sp[-2] == 0xff && (sp[-1] & 0xf0) == 0xd0); // call REG |
| 1639 | } | 1639 | } |
| 1640 | 1640 | */ | |
| 1641 | 1641 | ||
| 1642 | typedef struct | 1642 | typedef struct |
| 1643 | { | 1643 | { |
| @@ -1652,24 +1652,24 @@ void ExceptionHandlerThread (void *threadArg) | |||
| 1652 | ExceptionHandlerThreadArgs *args = (ExceptionHandlerThreadArgs *) threadArg; | 1652 | ExceptionHandlerThreadArgs *args = (ExceptionHandlerThreadArgs *) threadArg; |
| 1653 | 1653 | ||
| 1654 | EXCEPTION_POINTERS *ep = args->ExceptionPointers; | 1654 | EXCEPTION_POINTERS *ep = args->ExceptionPointers; |
| 1655 | DWORD addr; | 1655 | //DWORD addr; |
| 1656 | DWORD exCode = ep->ExceptionRecord->ExceptionCode; | 1656 | DWORD exCode = ep->ExceptionRecord->ExceptionCode; |
| 1657 | SYSTEM_INFO si; | 1657 | // SYSTEM_INFO si; |
| 1658 | // wchar_t msg[8192]; | 1658 | // wchar_t msg[8192]; |
| 1659 | char modPath[MAX_PATH]; | 1659 | // char modPath[MAX_PATH]; |
| 1660 | int crc = 0; | 1660 | // int crc = 0; |
| 1661 | // char url[MAX_URL_LENGTH]; | 1661 | // char url[MAX_URL_LENGTH]; |
| 1662 | char lpack[128]; | 1662 | // char lpack[128]; |
| 1663 | stringstream callStack; | 1663 | // stringstream callStack; |
| 1664 | addr = (DWORD) ep->ExceptionRecord->ExceptionAddress; | 1664 | // addr = (DWORD) ep->ExceptionRecord->ExceptionAddress; |
| 1665 | PDWORD sp = (PDWORD) ep->ContextRecord->Esp; | 1665 | // PDWORD sp = (PDWORD) ep->ContextRecord->Esp; |
| 1666 | int frameNumber = 0; | 1666 | // int frameNumber = 0; |
| 1667 | 1667 | ||
| 1668 | switch (exCode) | 1668 | switch (exCode) |
| 1669 | { | 1669 | { |
| 1670 | case STATUS_IN_PAGE_ERROR: | 1670 | case STATUS_IN_PAGE_ERROR: |
| 1671 | case 0xeedfade: | 1671 | case 0xeedfade: |
| 1672 | // Exception not caused by TrueCrypt | 1672 | // Exception not caused by VeraCrypt |
| 1673 | MessageBoxW (0, GetString ("EXCEPTION_REPORT_EXT"), | 1673 | MessageBoxW (0, GetString ("EXCEPTION_REPORT_EXT"), |
| 1674 | GetString ("EXCEPTION_REPORT_TITLE"), | 1674 | GetString ("EXCEPTION_REPORT_TITLE"), |
| 1675 | MB_ICONERROR | MB_OK | MB_SETFOREGROUND | MB_TOPMOST); | 1675 | MB_ICONERROR | MB_OK | MB_SETFOREGROUND | MB_TOPMOST); |
| @@ -1677,7 +1677,7 @@ void ExceptionHandlerThread (void *threadArg) | |||
| 1677 | } | 1677 | } |
| 1678 | 1678 | ||
| 1679 | // Call stack | 1679 | // Call stack |
| 1680 | HMODULE dbgDll = LoadLibrary ("dbghelp.dll"); | 1680 | /* HMODULE dbgDll = LoadLibrary ("dbghelp.dll"); |
| 1681 | if (dbgDll) | 1681 | if (dbgDll) |
| 1682 | { | 1682 | { |
| 1683 | typedef DWORD (__stdcall *SymGetOptions_t) (); | 1683 | typedef DWORD (__stdcall *SymGetOptions_t) (); |
| @@ -1815,7 +1815,7 @@ void ExceptionHandlerThread (void *threadArg) | |||
| 1815 | else | 1815 | else |
| 1816 | lpack[0] = 0; | 1816 | lpack[0] = 0; |
| 1817 | 1817 | ||
| 1818 | /* | 1818 | |
| 1819 | sprintf (url, TC_APPLINK_SECURE "&dest=err-report%s&os=%s&osver=%d.%d.%d&arch=%s&cpus=%d&app=%s&cksum=%x&dlg=%s&err=%x&addr=%x" | 1819 | sprintf (url, TC_APPLINK_SECURE "&dest=err-report%s&os=%s&osver=%d.%d.%d&arch=%s&cpus=%d&app=%s&cksum=%x&dlg=%s&err=%x&addr=%x" |
| 1820 | , lpack | 1820 | , lpack |
| 1821 | , GetWindowsEdition().c_str() | 1821 | , GetWindowsEdition().c_str() |