diff options
| author | David Foerster <david.foerster@informatik.hu-berlin.de> | 2016-05-10 22:16:32 +0200 |
|---|---|---|
| committer | David Foerster <david.foerster@informatik.hu-berlin.de> | 2016-05-10 22:18:34 +0200 |
| commit | 11716ed2dacbb104f8f59867fe66f2c0a6984291 (patch) | |
| tree | 28aa448de2e790d0f40dc57799a55a9df12ee6fb /src/Setup/Wizard.c | |
| parent | 191075155835172e5596e191cf0679ff9022f0fd (diff) | |
| download | VeraCrypt-11716ed2dacbb104f8f59867fe66f2c0a6984291.tar.gz VeraCrypt-11716ed2dacbb104f8f59867fe66f2c0a6984291.zip | |
Remove trailing whitespace
Diffstat (limited to 'src/Setup/Wizard.c')
| -rw-r--r-- | src/Setup/Wizard.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/Setup/Wizard.c b/src/Setup/Wizard.c index 42ea42c9..8c0f058c 100644 --- a/src/Setup/Wizard.c +++ b/src/Setup/Wizard.c @@ -1,11 +1,11 @@ /* Legal Notice: Some portions of the source code contained in this file were - derived from the source code of TrueCrypt 7.1a, which is - Copyright (c) 2003-2012 TrueCrypt Developers Association and which is + derived from the source code of TrueCrypt 7.1a, which is + Copyright (c) 2003-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0, also from the source code of Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux - and which is governed by the 'License Agreement for Encryption for the Masses' - Modifications and additions to the original source code (contained in this file) + and which is governed by the 'License Agreement for Encryption for the Masses' + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source @@ -192,7 +192,7 @@ static int GetDonVal (int minVal, int maxVal) prngInitialized = TRUE; } - if (OsPrngAvailable && CryptGenRandom (hCryptProv, sizeof (buffer), buffer) != 0) + if (OsPrngAvailable && CryptGenRandom (hCryptProv, sizeof (buffer), buffer) != 0) { return ((int) ((double) *((uint16 *) buffer) / (0xFFFF+1) * (maxVal + 1 - minVal)) + minVal); } @@ -310,7 +310,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa case EXTRACTION_OPTIONS_PAGE: if (wcslen(WizardDestExtractPath) < 2) - { + { StringCbCopyW (WizardDestExtractPath, sizeof(WizardDestExtractPath), SetupFilesDir); StringCbCatNW (WizardDestExtractPath, sizeof(WizardDestExtractPath), L"VeraCrypt\\", ARRAYSIZE (WizardDestExtractPath) - wcslen (WizardDestExtractPath) - 1); } @@ -704,7 +704,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa if (nCurPageNo == DONATIONS_PAGE) { PAINTSTRUCT tmpPaintStruct; - HDC hdc = BeginPaint (hCurPage, &tmpPaintStruct); + HDC hdc = BeginPaint (hCurPage, &tmpPaintStruct); if (hdc == NULL) AbortProcessSilent (); @@ -736,13 +736,13 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa TextOutW (hdc, CompensateXDPI (258), CompensateYDPI (70), - DonText.c_str(), - DonText.length()); - - EndPaint (hCurPage, &tmpPaintStruct); + DonText.c_str(), + DonText.length()); + + EndPaint (hCurPage, &tmpPaintStruct); ReleaseDC (hCurPage, hdc); } - return 0; + return 0; } @@ -813,8 +813,8 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa InitDialog (hwndDlg); LocalizeDialog (hwndDlg, "IDD_INSTL_DLG"); - - // Resize the bitmap if the user has a non-default DPI + + // Resize the bitmap if the user has a non-default DPI if (ScreenDPI != USER_DEFAULT_SCREEN_DPI) { hbmWizardBitmapRescaled = RenderBitmap (MAKEINTRESOURCE (IDB_SETUP_WIZARD), @@ -916,7 +916,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa { Info ("TRAVELER_LIMITATIONS_NOTE", hwndDlg); - if (IsUacSupported() + if (IsUacSupported() && AskWarnYesNo ("TRAVELER_UAC_NOTE", hwndDlg) == IDNO) { return 1; @@ -1001,12 +1001,12 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa HWND hwndItem = GetDlgItem (MainDlg, IDC_MAIN_CONTENT_CANVAS); PAINTSTRUCT tmpPaintStruct; - HDC hdc = BeginPaint (hwndItem, &tmpPaintStruct); + HDC hdc = BeginPaint (hwndItem, &tmpPaintStruct); if (DonColorSchemeId != 2) { HBRUSH tmpBrush = CreateSolidBrush (DonBkgColor); - + RECT trect; trect.left = CompensateXDPI (1); @@ -1016,11 +1016,11 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa FillRect (hdc, &trect, tmpBrush); } - - EndPaint(hwndItem, &tmpPaintStruct); + + EndPaint(hwndItem, &tmpPaintStruct); ReleaseDC (hwndItem, hdc); } - return 0; + return 0; @@ -1043,9 +1043,9 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa case TC_APPMSG_INSTALL_SUCCESS: - + /* Installation completed successfully */ - + bInProgress = FALSE; nCurPageNo = DONATIONS_PAGE; @@ -1065,7 +1065,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa return 1; case TC_APPMSG_INSTALL_FAILURE: - + /* Installation failed */ bInProgress = FALSE; @@ -1086,7 +1086,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa return 1; case TC_APPMSG_EXTRACTION_SUCCESS: - + /* Extraction completed successfully */ UpdateProgressBarProc(100); @@ -1115,7 +1115,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa return 1; case TC_APPMSG_EXTRACTION_FAILURE: - + /* Extraction failed */ bInProgress = FALSE; |