diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
| commit | 268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch) | |
| tree | b1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /src/Common/Progress.h | |
| parent | 6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff) | |
| parent | 5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff) | |
| download | VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip | |
Merge pull request #61 from davidfoerster/normalize-line-terminators
Normalize line terminators
Diffstat (limited to 'src/Common/Progress.h')
| -rw-r--r-- | src/Common/Progress.h | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/Common/Progress.h b/src/Common/Progress.h index 9e80a086..0410023d 100644 --- a/src/Common/Progress.h +++ b/src/Common/Progress.h @@ -1,33 +1,33 @@ -/*
- 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
- 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 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
- code distribution packages. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef PBM_SETSTATE
-
-#define PBM_SETSTATE (WM_USER+16) // wParam = PBST_[State] (NORMAL, ERROR, PAUSED)
-#define PBST_NORMAL 0x0001
-#define PBST_ERROR 0x0002
-#define PBST_PAUSED 0x0003
-
-#endif
-
-void InitProgressBar (__int64 totalBytes, __int64 bytesDone, BOOL bReverse, BOOL bIOThroughput, BOOL bDisplayStatus, BOOL bShowPercent);
-BOOL UpdateProgressBar (__int64 byteOffset);
-BOOL UpdateProgressBarProc (__int64 byteOffset);
-
-#ifdef __cplusplus
-}
-#endif
+/* + 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 + 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 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 + code distribution packages. */ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef PBM_SETSTATE + +#define PBM_SETSTATE (WM_USER+16) // wParam = PBST_[State] (NORMAL, ERROR, PAUSED) +#define PBST_NORMAL 0x0001 +#define PBST_ERROR 0x0002 +#define PBST_PAUSED 0x0003 + +#endif + +void InitProgressBar (__int64 totalBytes, __int64 bytesDone, BOOL bReverse, BOOL bIOThroughput, BOOL bDisplayStatus, BOOL bShowPercent); +BOOL UpdateProgressBar (__int64 byteOffset); +BOOL UpdateProgressBarProc (__int64 byteOffset); + +#ifdef __cplusplus +} +#endif |