diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-12-29 19:55:04 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-12-29 19:55:04 +0000 |
| commit | 7e0c7c426f9c8a453deef09c3d6679824af5f3d5 (patch) | |
| tree | 6e247cf898b38c430cf1924242177e91a02226a5 /plugins | |
| parent | 5dbf04acc4094bdf762bbadb71b7ab6024e09dd5 (diff) | |
preparing mmap_sa, that it finally compatible with new mmap
git-svn-id: http://svn.miranda-ng.org/main/trunk@7415 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
45 files changed, 246 insertions, 1779 deletions
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/UAthena.pas b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/UAthena.pas deleted file mode 100644 index 15a9674e0c..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/UAthena.pas +++ /dev/null @@ -1,176 +0,0 @@ -unit UAthena;
-{
- Athena: cryptor module for Miranda SecuredMMAP Database driver
- Copyright 2007-2008 Klyde
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-}
-
-
-interface
-uses
- md5_unit, windows;
-Type
- Arr = array of byte;
- PArr = ^Arr;
-
- Function MD5_Mod(const s: AnsiString; block_count: byte): AnsiString;
- Procedure MakeKey(key: PArr; len: word; const pwd: AnsiString);
- Procedure EncryptData(key: PArr; data: PByte; size: LongWord);
- Procedure DecryptData(key: PArr; data: PByte; size: LongWord);
-
-implementation
-//==============================================================================
-Function str_back(const s: AnsiString): AnsiString;
-Var
- i: integer;
-Begin
- result := '';
- for i := Length(s) downto 1 do result := result + s[i];
-end;
-//==============================================================================
-Function MD5_Mod(const s: AnsiString; block_count: byte): AnsiString;
-Var
- s1, s2, sb : AnsiString;
- k : word;
-Begin
- sb := str_back(s);
- s2 := '';
- For k := 1 to block_count do
- Begin
- s1 := md5(s + sb);
- s2 := str_back(s2 + md5(s1+sb+s2));
- End;
- result := s2;
-end;
-//==============================================================================
-Procedure MakeKey(key: PArr; len: word; const pwd: AnsiString);
-Var
- s : AnsiString;
- i : word;
- dummy: integer;
-Begin
- if len > 64 then Len := ((Len div 16) + 1)*16 else Len := 64;
- SetLength(key^, Len);
- s := MD5_mod(pwd, len div 16);
- for i := 1 to length(s) div 2 do
- begin
- val('$' + copy(s, i*2 - 1, 2),key^[i-1],dummy);
- end;
-end;
-//==============================================================================
-Procedure GetNENum(key: arr; var n1, n2: LongWord);
-Var
- i: LongWord;
-Begin
- n1 := 0;
- n2 := 0;
- for i := 0 to Length(key) - 1 do
- Begin
- n1 := n1 + key[i] + (i + 1)*(n1+1);
- n2 := n2 + key[i] - (i + 1)*(n2+1);
- end;
- n1 := n1*2 + 1;
- n2 := n2*2 + 3;
-end;
-
-//==============================================================================
-Procedure SimGamm(key: PArr; data: PByte; size: LongWord);
-Var
- kg : Arr;
- i, n1, n2 : LongWord;
- lk, k1, k2 : word;
-Begin
- lk := Length(key^);
- SetLength(kg, lk);
- for i := 0 to lk - 1 do kg[i] := key^[i];
- GetNENum(kg, n1, n2);
- For i := 1 to size - 1 do
- Begin
- if (i mod lk) = 0 then GetNENum(kg, n1, n2);
- k1 := (i+n1+7)*n2 mod lk;
- k2 := (i+n2+3)*n1 mod lk;
-
- PByte(uint_ptr(data)+i)^ := PByte(uint_ptr(data)+i)^ xor kg[k1] xor kg[k2];
-
- kg[k1] := kg[k1]*k1 + kg[k2] + i*k2;
- kg[k2] := kg[k2]*k2 + kg[k1] + i*k1;
- end;
-end;
-//==============================================================================
-Procedure Left(key: PArr; data: PByte; size: LongWord);
-Var
- k : Arr;
- i, n1, n2 : LongWord;
- lk, k1, k2 : word;
-
-Begin
- lk := Length(key^);
-
- SetLength(k, lk);
- for i := 0 to lk - 1 do k[i] := key^[i];
- GetNENum(k, n1, n2);
- //---------------------------------------------------------------------------
- k1 := (n2 + lk)*n1 mod lk;
- k2 := (n1 + lk)*n2 mod lk;
- data^ := data^ xor k[k1] xor k[k2];
-
- //---------------------------------------------------------------------------
- For i := 1 to size - 1 do
- Begin
- k1 := (i+n1)*n2 mod lk;
- k2 := (i+n2)*n1 mod lk;
-
- PByte(uint_ptr(data)+i)^ := PByte(uint_ptr(data)+i)^ xor ((PByte(uint_ptr(data)+i-1)^ xor k[k1]) xor k[k2]);
- end;
-end;
-//==============================================================================
-Procedure Right(key: PArr; data: PByte; size: LongWord);
-Var
- k : Arr;
- i, n1, n2 : LongWord;
- lk, k1, k2 : word;
-Begin
- lk := Length(key^);
- SetLength(k, lk);
- for i := 0 to lk - 1 do k[i] := key^[i];
- GetNENum(k, n1, n2);
- //---------------------------------------------------------------------------
- For i := size - 1 downto 1 do
- Begin
- k1 := (i+n1)*n2 mod lk;
- k2 := (i+n2)*n1 mod lk;
- PByte(uint_ptr(data) + i)^ := PByte(uint_ptr(data)+i)^ xor ((PByte(uint_ptr(data) + i - 1)^ xor k[k1]) xor k[k2]);
- end;
- //---------------------------------------------------------------------------
- k1 := (n2 + lk)*n1 mod lk;
- k2 := (n1 + lk)*n2 mod lk;
- data^ := data^ xor k[k1] xor k[k2];
-end;
-//==============================================================================
-Procedure EncryptData(key: PArr; data: PByte; size: LongWord);
-Begin
- Left(key, data, size);
- SimGamm(key, data, size);
-end;
-//==============================================================================
-Procedure DecryptData(key: PArr; data: PByte; size: LongWord);
-Begin
- SimGamm(key, data, size);
- Right(key, data, size);
-end;
-//==============================================================================
-end.
-
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.cfg b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.cfg deleted file mode 100644 index 273efb4bc2..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.cfg +++ /dev/null @@ -1,38 +0,0 @@ --$A8
--$B-
--$C+
--$D+
--$E-
--$F-
--$G+
--$H+
--$I+
--$J-
--$K-
--$L+
--$M-
--$N+
--$O+
--$P+
--$Q-
--$R-
--$S-
--$T-
--$U-
--$V+
--$W-
--$X+
--$YD
--$Z1
--cg
--AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
--H+
--W+
--M
--$M16384,1048576
--K$00400000
--LE"d:\program files\borland\delphi7\Projects\Bpl"
--LN"d:\program files\borland\delphi7\Projects\Bpl"
--w-UNSAFE_TYPE
--w-UNSAFE_CODE
--w-UNSAFE_CAST
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.dof b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.dof deleted file mode 100644 index d43219d29e..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.dof +++ /dev/null @@ -1,136 +0,0 @@ -[FileVersion]
-Version=7.0
-[Compiler]
-A=8
-B=0
-C=1
-D=1
-E=0
-F=0
-G=1
-H=1
-I=1
-J=0
-K=0
-L=1
-M=0
-N=1
-O=1
-P=1
-Q=0
-R=0
-S=0
-T=0
-U=0
-V=1
-W=0
-X=1
-Y=1
-Z=1
-ShowHints=1
-ShowWarnings=1
-UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-NamespacePrefix=
-SymbolDeprecated=1
-SymbolLibrary=1
-SymbolPlatform=1
-UnitLibrary=1
-UnitPlatform=1
-UnitDeprecated=1
-HResultCompat=1
-HidingMember=1
-HiddenVirtual=1
-Garbage=1
-BoundsError=1
-ZeroNilCompat=1
-StringConstTruncated=1
-ForLoopVarVarPar=1
-TypedConstVarPar=1
-AsgToTypedConst=1
-CaseLabelRange=1
-ForVariable=1
-ConstructingAbstract=1
-ComparisonFalse=1
-ComparisonTrue=1
-ComparingSignedUnsigned=1
-CombiningSignedUnsigned=1
-UnsupportedConstruct=1
-FileOpen=1
-FileOpenUnitSrc=1
-BadGlobalSymbol=1
-DuplicateConstructorDestructor=1
-InvalidDirective=1
-PackageNoLink=1
-PackageThreadVar=1
-ImplicitImport=1
-HPPEMITIgnored=1
-NoRetVal=1
-UseBeforeDef=1
-ForLoopVarUndef=1
-UnitNameMismatch=1
-NoCFGFileFound=1
-MessageDirective=1
-ImplicitVariants=1
-UnicodeToLocale=1
-LocaleToUnicode=1
-ImagebaseMultiple=1
-SuspiciousTypecast=1
-PrivatePropAccessor=1
-UnsafeType=0
-UnsafeCode=0
-UnsafeCast=0
-[Linker]
-MapFile=0
-OutputObjs=0
-ConsoleApp=1
-DebugInfo=0
-RemoteSymbols=0
-MinStackSize=16384
-MaxStackSize=1048576
-ImageBase=4194304
-ExeDescription=
-[Directories]
-OutputDir=
-UnitOutputDir=
-PackageDLLOutputDir=
-PackageDCPOutputDir=
-SearchPath=
-Packages=
-Conditionals=
-DebugSourceDirs=
-UsePackages=0
-[Parameters]
-RunParams=
-HostApplication=
-Launcher=
-UseLauncher=0
-DebugCWD=
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=1049
-CodePage=1251
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.dpr b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.dpr deleted file mode 100644 index 4824b9b01f..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.dpr +++ /dev/null @@ -1,112 +0,0 @@ -library athena;
-
-{
- Athena: cryptor module for Miranda SecuredMMAP Database driver
- Copyright 2007-2008 Klyde
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-}
-
-uses
- UAthena,
- WIndows;
-
-{$R *.res}
-
-type
- TGenerateKey = function(key: PAnsiChar): PArr; stdcall;
- TFreeKey = procedure(key: PArr); stdcall;
- TEncryptMem = procedure(data: PByte; size: LongWord; key: PArr); stdcall;
-
- PCryptorInfo = ^TCryptorInfo;
- TCryptorInfo = record
- GenerateKey: TGenerateKey;
- FreeKey: TFreeKey;
-
- EncryptMem: TEncryptMem;
- DecryptMem: TEncryptMem;
-
- Name: PAnsiChar;
- Info: PAnsiChar;
- Author: PAnsiChar;
- Site: PAnsiChar;
- Email: PAnsiChar;
-
- version: dword;
-
- uid: word;
- end;
-
-var
- Info: TCryptorInfo;
-
-
-function PLUGIN_MAKE_VERSION(a,b,c,d: Cardinal): integer;
-begin
- Result := (a shl 24) or (b shl 16) or (c shl 8) or d;
-end;
-
-function GenerateKey(pwd: PAnsiChar): PArr; stdcall;
-var
- a: PArr;
-begin
-
- new(a);
- MakeKey(a, 512, pwd);
- result := a;
-
-end;
-
-procedure FreeKey(key: PArr); stdcall;
-begin
- FreeMem(key);
-end;
-
-procedure EncryptMem(data: PByte; size: LongWord; key: PArr); stdcall;
-begin
- if size <= 0 then exit;
- EncryptData(key, data, size);
-end;
-
-procedure DecryptMem(data: PByte; size: LongWord; key: PArr); stdcall;
-begin
- if size <= 0 then exit;
- DecryptData(key, data, size);
-end;
-
-function GetCryptor: PCryptorInfo; stdcall;
-begin
- Info.Name := 'Athena';
- Info.Author := 'Klyde';
- Info.Site := 'http://cityopen.ru/forum/journal.php?user=151';
- Info.Email := 'xxxmara@mail.ru';
- Info.Info := 'Secure alghoritm developed in russian universities';
-
- Info.version := PLUGIN_MAKE_VERSION(0,0,3,0);
-
- Info.UID := $FEA8;
-
- Info.GenerateKey := GenerateKey;
- Info.FreeKey := FreeKey;
- Info.EncryptMem := EncryptMem;
- Info.DecryptMem := DecryptMem;
-
- result := @Info;
-end;
-
-exports GetCryptor;
-
-begin
-end.
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.rc b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.rc deleted file mode 100644 index bc035ab02a..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.rc +++ /dev/null @@ -1,28 +0,0 @@ -VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,3,0
- PRODUCTVERSION 0,0,3,0
- FILEFLAGSMASK $3F
- FILEOS 4
- FILETYPE 2
- FILESUBTYPE 0
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "000004b0"
- BEGIN
- VALUE "CompanyName",""
- VALUE "Comments", "Secure alghoritm developed in russian universities"0
- VALUE "FileDescription", "Secure alghoritm developed in russian universities"0
- VALUE "FileVersion", "0, 0, 3, 0 "0
- VALUE "InternalName", "Athena"0
- VALUE "OriginalFilename", "Athena.dll"0
- VALUE "ProductName", "Athena"0
- VALUE "ProductVersion", "0, 0, 3, 0 "0
- VALUE "SpecialBuild", ".04.2010 "0
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation",0,1200
- END
-END
\ No newline at end of file diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.res b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.res Binary files differdeleted file mode 100644 index 908733f3de..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/athena.res +++ /dev/null diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/make.bat b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/make.bat deleted file mode 100644 index 438629ae85..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/make.bat +++ /dev/null @@ -1,27 +0,0 @@ -@echo off
-set p1=%1
-set p2=%2
-if "%p1%" == "" (echo "please specify target platform by adding 'fpc' or 'fpc64 parameter to command line!'"&&pause&&goto :EOF)
-if "%p2%" == "" (echo "please specify target output directory by adding 10 for bin10 or 11 for bin11 or 12 for bin12 to command line!'"&&pause&&goto :EOF)
-if /i '%1' == 'fpc' (
- set OUTDIR="..\..\..\..\bin%2\Release\Plugins\Cryptors"
- set FPCBIN=fpc.exe
-) else if /i '%1' == 'fpc64' (
- set OUTDIR="..\..\..\..\bin%2\Release64\Plugins\Cryptors"
- set FPCBIN=ppcrossx64.exe
-)
-set PROJECT=Athena
-
-if not exist %OUTDIR% mkdir %OUTDIR%
-md tmp
-
-rem brcc32.exe %myopts% athena.rc -fooathena.res
-
-%FPCBIN% @..\..\..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9
-if errorlevel 1 exit /b 1
-
-move .\tmp\%PROJECT%.dll %OUTDIR%
-move .\tmp\%PROJECT%.map .
-del /Q tmp\*
-rd tmp
-exit /b 0
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/md5_mod256_unit.pas b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/md5_mod256_unit.pas deleted file mode 100644 index 53b2d996da..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/md5_mod256_unit.pas +++ /dev/null @@ -1,64 +0,0 @@ -unit md5_mod256_unit;
-interface
-
-Uses
- MD5_Unit, sysutils, classes, windows;
-Const
- MSize = 256;
-Type
- tiAr = array [0..255] of integer;
-
-Function MD5_Mod(s: String): String;
-Function MD5_Matrix(s: string): tArr;
-Function str_back(s: String): String;
-
-implementation
-//==============================================================================
-Function str_back(s: String): String;
-Var
- i: integer;
-Begin
- result := '';
- for i := Length(s) downto 1 do result := result + s[i];
-end;
-//==============================================================================
-Function MD5_Mod_back(s: String): String;
-Var
- s1, s2 : String;
- k : word;
-Begin
- s1 := str_back(s)+s;
- s2 := md5(str_back(s)+str_back(md5(s))+
- str_back(md5(s+s))+
- str_back(md5(s+s+s))+
- str_back(md5(s+s+s+s))+
- str_back(md5(s+s+s+'asddsa'+s)));
- For k:=1 to trunc(sqrt(MSize))-1 do
- Begin
- s1 := md5(s1 + s2 + md5(s1+s1+s2+s) + md5(s2+s2+s1+s) + s);
- s2 := str_back(s2 + str_back(md5(s1+s2+md5(s))));
- End;
- result:=s2;
-end;
-//==============================================================================
-Function MD5_Mod(s: String): String;
-Var
- s1, s2 : String;
- k : word;
-Begin
- s1 := s + AnsiUpperCase(s) + AnsiLowerCase(s);
- s2 := md5(s+md5(s)+md5(s+s)+md5(s+AnsiUpperCase(s)+s)+md5(s+AnsiLowerCase(s+s)+s)+md5(s+s+str_back(s+s+'qweewq')));
- For k:=1 to trunc(sqrt(MSize))-1 do
- Begin
- s1 := md5(s1 + str_back(s2) + md5(s1+s1+s2+s) + str_back(md5(s2+s2+s1+s)) + s);
- s2 := str_back(s2 + md5(s1+AnsiUpperCase(s2+md5(s))));
- End;
- result:=s2;
-end;
-//==============================================================================
-
-//==============================================================================
-end.
-
-
-
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/md5_unit.pas b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/md5_unit.pas deleted file mode 100644 index f9a130b729..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/Athena/md5_unit.pas +++ /dev/null @@ -1,212 +0,0 @@ -unit md5_unit;
-
-interface
-
-uses Windows;
-Type
- TMD5 = Array [0..15] of byte;
-
-function MD5(const s: AnsiString): AnsiString;
-function MD5_arr(const s: AnsiString): TMD5;
-
-implementation
-//==============================================================================
-const
- HexDigitChr : array [0..15] of AnsiChar = ('0','1','2','3','4','5','6','7',
- '8','9','A','B','C','D','E','F');
-
-function Int2Hex(Value:dword;Digits:integer=0):AnsiString;
-var
- i:cardinal;
- buf:array [0..31] of AnsiChar;
-begin
- if Digits<=0 then
- begin
- Digits:=0;
- i:=Value;
- repeat
- i:=i shr 4;
- inc(Digits);
- until i=0;
- end;
-
- buf[Digits]:=#0;
- repeat
- Dec(Digits);
- buf[Digits]:=AnsiChar(HexDigitChr[Value and $F]);
- Value:=Value shr 4;
- until Digits=0;
- result:=buf;
-end;
-//==============================================================================
-function MD5_arr(const s: AnsiString): TMD5;
-var
- a : TMD5;
- LenHi, LenLo: longword;
- Index: DWord;
- HashBuffer : array[0..63] of byte;
- CurrentHash : array[0..3] of DWord;
-
- procedure Burn;
- begin
- LenHi:= 0; LenLo:= 0;
- Index:= 0;
- FillChar(HashBuffer,Sizeof(HashBuffer),0);
- FillChar(CurrentHash,Sizeof(CurrentHash),0);
- end;
-
- procedure Init;
- begin
- Burn;
- CurrentHash[0]:= $67452301;
- CurrentHash[1]:= $efcdab89;
- CurrentHash[2]:= $98badcfe;
- CurrentHash[3]:= $10325476;
- end;
-
- function LRot32(a, b: longword): longword;
- begin
- Result:= (a shl b) or (a shr (32-b));
- end;
-
- procedure Compress;
- var
- Data : array[0..15] of dword;
- A, B, C, D: dword;
- begin
- Move(HashBuffer,Data,Sizeof(Data));
- A:= CurrentHash[0];
- B:= CurrentHash[1];
- C:= CurrentHash[2];
- D:= CurrentHash[3];
-
- A:= B + LRot32(A + (D xor (B and (C xor D))) + Data[ 0] + $d76aa478,7);
- D:= A + LRot32(D + (C xor (A and (B xor C))) + Data[ 1] + $e8c7b756,12);
- C:= D + LRot32(C + (B xor (D and (A xor B))) + Data[ 2] + $242070db,17);
- B:= C + LRot32(B + (A xor (C and (D xor A))) + Data[ 3] + $c1bdceee,22);
- A:= B + LRot32(A + (D xor (B and (C xor D))) + Data[ 4] + $f57c0faf,7);
- D:= A + LRot32(D + (C xor (A and (B xor C))) + Data[ 5] + $4787c62a,12);
- C:= D + LRot32(C + (B xor (D and (A xor B))) + Data[ 6] + $a8304613,17);
- B:= C + LRot32(B + (A xor (C and (D xor A))) + Data[ 7] + $fd469501,22);
- A:= B + LRot32(A + (D xor (B and (C xor D))) + Data[ 8] + $698098d8,7);
- D:= A + LRot32(D + (C xor (A and (B xor C))) + Data[ 9] + $8b44f7af,12);
- C:= D + LRot32(C + (B xor (D and (A xor B))) + Data[10] + $ffff5bb1,17);
- B:= C + LRot32(B + (A xor (C and (D xor A))) + Data[11] + $895cd7be,22);
- A:= B + LRot32(A + (D xor (B and (C xor D))) + Data[12] + $6b901122,7);
- D:= A + LRot32(D + (C xor (A and (B xor C))) + Data[13] + $fd987193,12);
- C:= D + LRot32(C + (B xor (D and (A xor B))) + Data[14] + $a679438e,17);
- B:= C + LRot32(B + (A xor (C and (D xor A))) + Data[15] + $49b40821,22);
-
- A:= B + LRot32(A + (C xor (D and (B xor C))) + Data[ 1] + $f61e2562,5);
- D:= A + LRot32(D + (B xor (C and (A xor B))) + Data[ 6] + $c040b340,9);
- C:= D + LRot32(C + (A xor (B and (D xor A))) + Data[11] + $265e5a51,14);
- B:= C + LRot32(B + (D xor (A and (C xor D))) + Data[ 0] + $e9b6c7aa,20);
- A:= B + LRot32(A + (C xor (D and (B xor C))) + Data[ 5] + $d62f105d,5);
- D:= A + LRot32(D + (B xor (C and (A xor B))) + Data[10] + $02441453,9);
- C:= D + LRot32(C + (A xor (B and (D xor A))) + Data[15] + $d8a1e681,14);
- B:= C + LRot32(B + (D xor (A and (C xor D))) + Data[ 4] + $e7d3fbc8,20);
- A:= B + LRot32(A + (C xor (D and (B xor C))) + Data[ 9] + $21e1cde6,5);
- D:= A + LRot32(D + (B xor (C and (A xor B))) + Data[14] + $c33707d6,9);
- C:= D + LRot32(C + (A xor (B and (D xor A))) + Data[ 3] + $f4d50d87,14);
- B:= C + LRot32(B + (D xor (A and (C xor D))) + Data[ 8] + $455a14ed,20);
- A:= B + LRot32(A + (C xor (D and (B xor C))) + Data[13] + $a9e3e905,5);
- D:= A + LRot32(D + (B xor (C and (A xor B))) + Data[ 2] + $fcefa3f8,9);
- C:= D + LRot32(C + (A xor (B and (D xor A))) + Data[ 7] + $676f02d9,14);
- B:= C + LRot32(B + (D xor (A and (C xor D))) + Data[12] + $8d2a4c8a,20);
-
- A:= B + LRot32(A + (B xor C xor D) + Data[ 5] + $fffa3942,4);
- D:= A + LRot32(D + (A xor B xor C) + Data[ 8] + $8771f681,11);
- C:= D + LRot32(C + (D xor A xor B) + Data[11] + $6d9d6122,16);
- B:= C + LRot32(B + (C xor D xor A) + Data[14] + $fde5380c,23);
- A:= B + LRot32(A + (B xor C xor D) + Data[ 1] + $a4beea44,4);
- D:= A + LRot32(D + (A xor B xor C) + Data[ 4] + $4bdecfa9,11);
- C:= D + LRot32(C + (D xor A xor B) + Data[ 7] + $f6bb4b60,16);
- B:= C + LRot32(B + (C xor D xor A) + Data[10] + $bebfbc70,23);
- A:= B + LRot32(A + (B xor C xor D) + Data[13] + $289b7ec6,4);
- D:= A + LRot32(D + (A xor B xor C) + Data[ 0] + $eaa127fa,11);
- C:= D + LRot32(C + (D xor A xor B) + Data[ 3] + $d4ef3085,16);
- B:= C + LRot32(B + (C xor D xor A) + Data[ 6] + $04881d05,23);
- A:= B + LRot32(A + (B xor C xor D) + Data[ 9] + $d9d4d039,4);
- D:= A + LRot32(D + (A xor B xor C) + Data[12] + $e6db99e5,11);
- C:= D + LRot32(C + (D xor A xor B) + Data[15] + $1fa27cf8,16);
- B:= C + LRot32(B + (C xor D xor A) + Data[ 2] + $c4ac5665,23);
-
- A:= B + LRot32(A + (C xor (B or (not D))) + Data[ 0] + $f4292244,6);
- D:= A + LRot32(D + (B xor (A or (not C))) + Data[ 7] + $432aff97,10);
- C:= D + LRot32(C + (A xor (D or (not B))) + Data[14] + $ab9423a7,15);
- B:= C + LRot32(B + (D xor (C or (not A))) + Data[ 5] + $fc93a039,21);
- A:= B + LRot32(A + (C xor (B or (not D))) + Data[12] + $655b59c3,6);
- D:= A + LRot32(D + (B xor (A or (not C))) + Data[ 3] + $8f0ccc92,10);
- C:= D + LRot32(C + (A xor (D or (not B))) + Data[10] + $ffeff47d,15);
- B:= C + LRot32(B + (D xor (C or (not A))) + Data[ 1] + $85845dd1,21);
- A:= B + LRot32(A + (C xor (B or (not D))) + Data[ 8] + $6fa87e4f,6);
- D:= A + LRot32(D + (B xor (A or (not C))) + Data[15] + $fe2ce6e0,10);
- C:= D + LRot32(C + (A xor (D or (not B))) + Data[ 6] + $a3014314,15);
- B:= C + LRot32(B + (D xor (C or (not A))) + Data[13] + $4e0811a1,21);
- A:= B + LRot32(A + (C xor (B or (not D))) + Data[ 4] + $f7537e82,6);
- D:= A + LRot32(D + (B xor (A or (not C))) + Data[11] + $bd3af235,10);
- C:= D + LRot32(C + (A xor (D or (not B))) + Data[ 2] + $2ad7d2bb,15);
- B:= C + LRot32(B + (D xor (C or (not A))) + Data[ 9] + $eb86d391,21);
-
- Inc(CurrentHash[0],A);
- Inc(CurrentHash[1],B);
- Inc(CurrentHash[2],C);
- Inc(CurrentHash[3],D);
- Index:= 0;
- FillChar(HashBuffer,Sizeof(HashBuffer),0);
- end;
-
-procedure Update(const Buffer; Size: longword);
-var
- PBuf: ^byte;
-begin
- Inc(LenHi,Size shr 29);
- Inc(LenLo,Size*8);
- if LenLo < (Size*8) then Inc(LenHi);
- PBuf:= @Buffer;
- while Size> 0 do
- begin
- if (Sizeof(HashBuffer)-Index)<= DWord(Size) then
- begin
- Move(PBuf^,HashBuffer[Index],Sizeof(HashBuffer)-Index);
- Dec(Size,Sizeof(HashBuffer)-Index);
- Inc(PBuf,Sizeof(HashBuffer)-Index);
- Compress;
- end else
- begin
- Move(PBuf^,HashBuffer[Index],Size);
- Inc(Index,Size);
- Size:= 0;
- end;
- end;
-end;
-
-procedure Final(var Digest);
-begin
- HashBuffer[Index] := $80;
- if Index >= 56 then Compress;
- PDWord(@HashBuffer[56])^ := LenLo;
- PDWord(@HashBuffer[60])^ := LenHi;
- Compress;
- Move(CurrentHash, Digest, Sizeof(CurrentHash));
- Burn;
-end;
-
-begin
- Init;
- Update(s[1], Length(s));
- Final(a);
- result := a;
-end;
-//==============================================================================
-function MD5(const s: AnsiString): AnsiString;
-var
- a : TMD5;
- i : integer;
-begin
- a := MD5_arr(s);
- result := '';
- for i := 0 to 15 do result := result + Int2Hex(a[i], 2);
-end;
-
-end.
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj deleted file mode 100644 index b4485696b0..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj +++ /dev/null @@ -1,159 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E38B4212-53BC-49A7-B821-9A99DB4774C6}</ProjectGuid>
- <ProjectName>RC4</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\Cryptors\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\Cryptors\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\Cryptors\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\Cryptors\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IgnoreImportLibrary>true</IgnoreImportLibrary>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin10\lib</AdditionalLibraryDirectories>
- <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin10\lib</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin10\lib</AdditionalLibraryDirectories>
- <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin10\lib</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\cryptor.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\Version.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\Version.rc" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj.filters b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj.filters deleted file mode 100644 index 5842bc8c63..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_10.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{d9ef4bec-040d-4cca-8faa-698d1448fb23}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{27e27fc6-b7a7-4c5c-a051-e9cad5b16d52}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\cryptor.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\Version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\Version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_11.vcxproj b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_11.vcxproj deleted file mode 100644 index 5cdc8d3a47..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_11.vcxproj +++ /dev/null @@ -1,162 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E38B4212-53BC-49A7-B821-9A99DB4774C6}</ProjectGuid>
- <ProjectName>RC4</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110_xp</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\Cryptors\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\Cryptors\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\Cryptors\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\Cryptors\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IgnoreImportLibrary>true</IgnoreImportLibrary>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin11\lib</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin11\lib</AdditionalLibraryDirectories>
- <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin11\lib</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin11\lib</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\cryptor.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\Version.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\Version.rc" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_11.vcxproj.filters b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_11.vcxproj.filters deleted file mode 100644 index 5842bc8c63..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_11.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{d9ef4bec-040d-4cca-8faa-698d1448fb23}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{27e27fc6-b7a7-4c5c-a051-e9cad5b16d52}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\cryptor.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\Version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\Version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_12.vcxproj b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_12.vcxproj deleted file mode 100644 index 8b9f9cf7ce..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_12.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E38B4212-53BC-49A7-B821-9A99DB4774C6}</ProjectGuid>
- <ProjectName>RC4</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120_xp</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\Cryptors\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\Cryptors\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\Cryptors\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\Cryptors\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
- <IgnoreImportLibrary>true</IgnoreImportLibrary>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin12\lib</AdditionalLibraryDirectories>
- </Link>
- <ResourceCompile>
- <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin12\lib</AdditionalLibraryDirectories>
- <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
- </Link>
- <ResourceCompile>
- <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>Full</Optimization>
- <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin12\lib</AdditionalLibraryDirectories>
- </Link>
- <ResourceCompile>
- <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <ExceptionHandling>false</ExceptionHandling>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalLibraryDirectories>$(ProfileDir)..\..\..\..\bin12\lib</AdditionalLibraryDirectories>
- </Link>
- <ResourceCompile>
- <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ResourceCompile>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\cryptor.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\Version.h" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\Version.rc" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_12.vcxproj.filters b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_12.vcxproj.filters deleted file mode 100644 index 5842bc8c63..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/rc4_12.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{d9ef4bec-040d-4cca-8faa-698d1448fb23}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{27e27fc6-b7a7-4c5c-a051-e9cad5b16d52}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\cryptor.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\Version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="res\Version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/res/Version.rc b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/res/Version.rc deleted file mode 100644 index 5bfbab4754..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/res/Version.rc +++ /dev/null @@ -1,38 +0,0 @@ -// Microsoft Visual C++ generated resource script.
-//
-#ifdef APSTUDIO_INVOKED
-#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-#include "afxres.h"
-#include "..\src\version.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __FILEVERSION_STRING
- PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x0L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "000004b0"
- BEGIN
- VALUE "FileDescription", __DESCRIPTION
- VALUE "InternalName", __PLUGIN_NAME
- VALUE "LegalCopyright", __COPYRIGHT
- VALUE "OriginalFilename", __FILENAME
- VALUE "ProductName", __PLUGIN_NAME
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0, 1200
- END
-END
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/src/Version.h b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/src/Version.h deleted file mode 100644 index b3cf9b4129..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/src/Version.h +++ /dev/null @@ -1,11 +0,0 @@ -#define __MAJOR_VERSION 0
-#define __MINOR_VERSION 0
-#define __RELEASE_NUM 0
-#define __BUILD_NUM 1
-
-#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-
-#define __PLUGIN_NAME "RC4"
-#define __FILENAME "RC4.dll"
-#define __DESCRIPTION "Old, very easy to crack stream cipher"
-#define __COPYRIGHT "© 2012-13 Miranda NG Team"
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/src/cryptor.cpp b/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/src/cryptor.cpp deleted file mode 100644 index a673c11fe7..0000000000 --- a/plugins/!Deprecated/Dbx_mmap_SA/Cryptors/RC4/src/cryptor.cpp +++ /dev/null @@ -1,133 +0,0 @@ -#include <windows.h>
-
-#define buf_size 1024
-
-typedef struct{
- void* (__stdcall *GenerateKey)(char* key);
- void (__stdcall *FreeKey)(void* key);
- void (__stdcall *EncryptMem)(BYTE* data, int size, void* key);
- void (__stdcall *DecryptMem)(BYTE* data, int size, void* key);
-
- char* Name;
- char* Info;
- char* Author;
- char* Site;
- char* Email;
-
- DWORD Version;
-
- WORD uid;
-} Cryptor;
-
-typedef struct rc4_key
-{
- BYTE state[256];
- BYTE x;
- BYTE y;
-} rc4_key;
-
-#define swap_byte(x,y) t = *(x); *(x) = *(y); *(y) = t
-
-void prepare_key(BYTE *key_data_ptr, size_t key_data_len, rc4_key *key)
-{
- int i = 0;
- BYTE t = 0;
- BYTE index1 = 0;
- BYTE index2 = 0;
- BYTE* state = 0;
- unsigned long counter = 0;
-
- state = &key->state[0];
- for(counter = 0; counter < 256; counter++)
- state[counter] = (BYTE)counter;
- key->x = 0;
- key->y = 0;
- index1 = 0;
- index2 = 0;
- for(counter = 0; counter < 256; counter++)
- {
- index2 = (key_data_ptr[index1] + state[counter] + index2) % 256;
- swap_byte(&state[counter], &state[index2]);
- index1 = (index1 + 1) % key_data_len;
- }
-}
-
-void rc4(BYTE *buffer_ptr, int buffer_len, rc4_key *key)
-{
- BYTE t = 0;
- BYTE x = 0;
- BYTE y = 0;
- BYTE* state = 0;
- BYTE xorIndex = 0;
- DWORD counter = 0;
- BYTE old_state[256];
-
- x = key->x;
- y = key->y;
- state = &key->state[0];
- memcpy(old_state, key->state, 256);
- for(counter = 0; counter < (DWORD)buffer_len; counter++)
- {
- x = (x + 1) % 256;
- y = (state[x] + y) % 256;
- swap_byte(&state[x], &state[y]);
- xorIndex = (state[x] + state[y]) % 256;
- buffer_ptr[counter] ^= state[xorIndex];
- }
- memcpy(key->state, old_state, 256);
- //key->x = x;
- //key->y = y;
-}
-
-
-void zero_fill(BYTE * pBuf, size_t bufSize)
-{
- size_t i;
- for(i = 0; i < bufSize; i++)
- pBuf[i] = 0;
-}
-
-void* __stdcall GenerateKey(char* pwd)
-{
- rc4_key* key;
- key = (rc4_key*)malloc(sizeof(rc4_key));
- zero_fill((BYTE*)key, sizeof(key));
- prepare_key((BYTE*)pwd, strlen(pwd), key);
- return key;
-}
-
-void __stdcall FreeKey(void* key)
-{
- free(key);
-}
-
-void __stdcall EncryptMem(BYTE* data, int size, void* key)
-{
- rc4(data, size, (rc4_key*)key);
-}
-
-void __stdcall DecryptMem(BYTE* data, int size, void* key)
-{
- rc4(data, size, (rc4_key*)key);
-}
-
-Cryptor cryptor =
- {
- GenerateKey,
- FreeKey,
- EncryptMem,
- DecryptMem,
- "RC4",
- "Old, very easy to crack stream cipher.",
- "Unknown",
- "http://ru.wikipedia.org/wiki/RC4",
- "nomail",
- 0x00000100,
- 0xDEAD
- };
-
-
-extern "C" __declspec(dllexport) Cryptor* GetCryptor()
-{
- return &cryptor;
-}
diff --git a/plugins/Db3x_mmap/src/dbcache.cpp b/plugins/Db3x_mmap/src/dbcache.cpp index 7f07540b56..d5700d2db7 100644 --- a/plugins/Db3x_mmap/src/dbcache.cpp +++ b/plugins/Db3x_mmap/src/dbcache.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "commonheaders.h"
-void CDb3Mmap::Map()
+void CDb3Base::Map()
{
m_hMap = CreateFileMapping(m_hDbFile, NULL, PAGE_READWRITE, 0, m_dwFileSize, NULL);
if (m_hMap) {
@@ -34,7 +34,7 @@ void CDb3Mmap::Map() else DatabaseCorruption( _T("%s (CreateFileMapping failed. Code: %d)"));
}
-void CDb3Mmap::ReMap(DWORD needed)
+void CDb3Base::ReMap(DWORD needed)
{
KillTimer(NULL,m_flushBuffersTimerId);
@@ -58,7 +58,7 @@ void CDb3Mmap::ReMap(DWORD needed) Map();
}
-void CDb3Mmap::DBMoveChunk(DWORD ofsDest,DWORD ofsSource,int bytes)
+void CDb3Base::DBMoveChunk(DWORD ofsDest, DWORD ofsSource, int bytes)
{
int x = 0;
//log3("move %d %08x->%08x",bytes,ofsSource,ofsDest);
@@ -76,7 +76,7 @@ void CDb3Mmap::DBMoveChunk(DWORD ofsDest,DWORD ofsSource,int bytes) }
//we are assumed to be in a mutex here
-PBYTE CDb3Mmap::DBRead(DWORD ofs,int bytesRequired,int *bytesAvail)
+PBYTE CDb3Base::DBRead(DWORD ofs, int bytesRequired, int *bytesAvail)
{
// buggy read
if (ofs >= m_dwFileSize) {
@@ -90,7 +90,7 @@ PBYTE CDb3Mmap::DBRead(DWORD ofs,int bytesRequired,int *bytesAvail) }
//we are assumed to be in a mutex here
-void CDb3Mmap::DBWrite(DWORD ofs,PVOID pData,int bytes)
+void CDb3Base::DBWrite(DWORD ofs, PVOID pData, int bytes)
{
//log2("write %d@%08x",bytes,ofs);
if (ofs+bytes > m_dwFileSize) ReMap(ofs+bytes-m_dwFileSize);
@@ -99,7 +99,7 @@ void CDb3Mmap::DBWrite(DWORD ofs,PVOID pData,int bytes) }
//we are assumed to be in a mutex here
-void CDb3Mmap::DBFill(DWORD ofs,int bytes)
+void CDb3Base::DBFill(DWORD ofs, int bytes)
{
//log2("zerofill %d@%08x",bytes,ofs);
if (ofs+bytes <= m_dwFileSize)
@@ -110,7 +110,7 @@ void CDb3Mmap::DBFill(DWORD ofs,int bytes) static VOID CALLBACK DoBufferFlushTimerProc(HWND hwnd, UINT message, UINT_PTR idEvent, DWORD dwTime)
{
for (int i=0; i < g_Dbs.getCount(); i++) {
- CDb3Mmap* db = g_Dbs[i];
+ CDb3Base *db = g_Dbs[i];
if (db->m_flushBuffersTimerId != idEvent)
continue;
@@ -130,7 +130,7 @@ static VOID CALLBACK DoBufferFlushTimerProc(HWND hwnd, UINT message, UINT_PTR id }
}
-void CDb3Mmap::DBFlush(int setting)
+void CDb3Base::DBFlush(int setting)
{
if (!setting) {
log0("nflush1");
@@ -151,7 +151,7 @@ void CDb3Mmap::DBFlush(int setting) m_flushBuffersTimerId = SetTimer(NULL, m_flushBuffersTimerId, 50, DoBufferFlushTimerProc);
}
-int CDb3Mmap::InitCache(void)
+int CDb3Base::InitCache(void)
{
m_dwFileSize = GetFileSize(m_hDbFile, NULL);
@@ -166,3 +166,17 @@ int CDb3Mmap::InitCache(void) m_pNull = (PBYTE)calloc(m_ChunkSize, 1);
return 0;
}
+
+DWORD CDb3Base::GetSettingsGroupOfsByModuleNameOfs(DBContact *dbc, DWORD ofsContact, DWORD ofsModuleName)
+{
+ DWORD ofsThis = dbc->ofsFirstSettings;
+ while (ofsThis) {
+ DBContactSettings *dbcs = (DBContactSettings*)DBRead(ofsThis, sizeof(DBContactSettings), NULL);
+ if (dbcs->signature != DBCONTACTSETTINGS_SIGNATURE) DatabaseCorruption(NULL);
+ if (dbcs->ofsModuleName == ofsModuleName)
+ return ofsThis;
+
+ ofsThis = dbcs->ofsNext;
+ }
+ return 0;
+}
diff --git a/plugins/Db3x_mmap/src/dbevents.cpp b/plugins/Db3x_mmap/src/dbevents.cpp index 7f9e55cdae..3399459539 100644 --- a/plugins/Db3x_mmap/src/dbevents.cpp +++ b/plugins/Db3x_mmap/src/dbevents.cpp @@ -123,7 +123,7 @@ STDMETHODIMP_(HANDLE) CDb3Base::AddEvent(HANDLE hContact, DBEVENTINFO *dbei) DBWrite(ofsContact,&dbc,sizeof(DBContact));
DBWrite(ofsNew,&dbe,offsetof(DBEvent,blob));
- DBWrite(ofsNew+offsetof(DBEvent,blob),dbei->pBlob,dbei->cbBlob); // encode
+ EncodeDBWrite(ofsNew + offsetof(DBEvent, blob), dbei->pBlob, dbei->cbBlob); // encode
DBFlush(0);
lck.unlock();
@@ -243,10 +243,10 @@ STDMETHODIMP_(BOOL) CDb3Base::GetEvent(HANDLE hDbEvent, DBEVENTINFO *dbei) if (bytesToCopy && dbei->pBlob) {
for (int i = 0;;i += MAXCACHEDREADSIZE) {
if (bytesToCopy-i <= MAXCACHEDREADSIZE) {
- MoveMemory(dbei->pBlob + i, DBRead(DWORD(hDbEvent) + offsetof(DBEvent, blob) + i, bytesToCopy - i, NULL), bytesToCopy - i); // decode
+ DecodeCopyMemory(dbei->pBlob + i, DBRead(DWORD(hDbEvent) + offsetof(DBEvent, blob) + i, bytesToCopy - i, NULL), bytesToCopy - i); // decode
break;
}
- MoveMemory(dbei->pBlob + i, DBRead(DWORD(hDbEvent) + offsetof(DBEvent, blob) + i, MAXCACHEDREADSIZE, NULL), MAXCACHEDREADSIZE); // decode
+ DecodeCopyMemory(dbei->pBlob + i, DBRead(DWORD(hDbEvent) + offsetof(DBEvent, blob) + i, MAXCACHEDREADSIZE, NULL), MAXCACHEDREADSIZE); // decode
}
}
return 0;
diff --git a/plugins/Db3x_mmap/src/dbintf.cpp b/plugins/Db3x_mmap/src/dbintf.cpp index 5ca465d5ee..f5f1b3738b 100644 --- a/plugins/Db3x_mmap/src/dbintf.cpp +++ b/plugins/Db3x_mmap/src/dbintf.cpp @@ -128,7 +128,6 @@ int CDb3Base::Load(bool bSkipInit) if (!bSkipInit) {
if (InitCache()) return 1;
if (InitModuleNames()) return 1;
- if (InitCrypt()) return 1;
m_bReadOnly = false;
@@ -157,9 +156,31 @@ STDMETHODIMP_(void) CDb3Base::SetCacheSafetyMode(BOOL bIsSet) DBFlush(1);
}
+void CDb3Base::EncodeCopyMemory(void *dst, void *src, size_t size)
+{
+ MoveMemory(dst, src, size);
+}
+
+void CDb3Base::DecodeCopyMemory(void *dst, void *src, size_t size)
+{
+ MoveMemory(dst, src, size);
+}
+
+void CDb3Base::EncodeDBWrite(DWORD ofs, void *src, int size)
+{
+ DBWrite(ofs, src, size);
+}
+
+void CDb3Base::DecodeDBWrite(DWORD ofs, void *src, int size)
+{
+ DBWrite(ofs, src, size);
+}
+
///////////////////////////////////////////////////////////////////////////////
// MIDatabaseChecker
+typedef int (CDb3Base::*CheckWorker)(int);
+
static CheckWorker Workers[6] =
{
&CDb3Base::WorkInitialChecks,
diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h index c512b27ecb..0724f14cd5 100644 --- a/plugins/Db3x_mmap/src/dbintf.h +++ b/plugins/Db3x_mmap/src/dbintf.h @@ -196,17 +196,27 @@ protected: STDMETHODIMP_(VOID) Destroy();
protected:
- virtual DWORD GetSettingsGroupOfsByModuleNameOfs(DBContact *dbc,DWORD ofsContact,DWORD ofsModuleName) = 0;
- virtual void InvalidateSettingsGroupOfsCacheEntry(DWORD ofsSettingsGroup) {}
- virtual int WorkInitialCheckHeaders(void);
-
- virtual void DBMoveChunk(DWORD ofsDest, DWORD ofsSource, int bytes) = 0;
- virtual PBYTE DBRead(DWORD ofs, int bytesRequired, int *bytesAvail) = 0;
- virtual void DBWrite(DWORD ofs, PVOID pData, int bytes) = 0;
- virtual void DBFill(DWORD ofs, int bytes) = 0;
- virtual void DBFlush(int setting) = 0;
- virtual int InitCache(void) = 0;
- virtual int InitCrypt(void) { return 0; }
+ virtual void EncodeCopyMemory(void *dst, void *src, size_t size);
+ virtual void DecodeCopyMemory(void *dst, void *src, size_t size);
+ virtual void EncodeDBWrite(DWORD ofs, void *src, int size);
+ virtual void DecodeDBWrite(DWORD ofs, void *src, int size);
+
+protected:
+ DWORD GetSettingsGroupOfsByModuleNameOfs(DBContact *dbc, DWORD ofsContact, DWORD ofsModuleName);
+ void InvalidateSettingsGroupOfsCacheEntry(DWORD ofsSettingsGroup) {}
+ int WorkInitialCheckHeaders(void);
+
+ void DBMoveChunk(DWORD ofsDest, DWORD ofsSource, int bytes);
+ PBYTE DBRead(DWORD ofs, int bytesRequired, int *bytesAvail);
+ void DBWrite(DWORD ofs, PVOID pData, int bytes);
+ void DBFill(DWORD ofs, int bytes);
+ void DBFlush(int setting);
+ int InitCache(void);
+
+ PBYTE m_pNull;
+
+ void Map();
+ void ReMap(DWORD needed);
public: // Check functions
int WorkInitialChecks(int);
@@ -299,30 +309,19 @@ struct CDb3Mmap : public CDb3Base CDb3Mmap(const TCHAR* ptszFileName);
~CDb3Mmap();
- void StoreKey(void);
- void SetPassword(const TCHAR *ptszPassword);
- void UpdateMenuItem(void);
+ int Load(bool bSkipInit);
+
+ void StoreKey(void);
+ void SetPassword(const TCHAR *ptszPassword);
+ void UpdateMenuItem(void);
__forceinline LPSTR GetMenuTitle() const { return m_bUsesPassword ? LPGEN("Change/remove password") : LPGEN("Set password"); }
protected:
- virtual DWORD GetSettingsGroupOfsByModuleNameOfs(DBContact *dbc,DWORD ofsContact,DWORD ofsModuleName);
- virtual void DBMoveChunk(DWORD ofsDest, DWORD ofsSource, int bytes);
- virtual PBYTE DBRead(DWORD ofs, int bytesRequired, int *bytesAvail);
- virtual void DBWrite(DWORD ofs, PVOID pData, int bytes);
- virtual void DBFill(DWORD ofs, int bytes);
- virtual void DBFlush(int setting);
- virtual int InitCache(void);
- virtual int InitCrypt(void);
+ int InitCrypt(void);
protected:
- PBYTE m_pNull;
-
- void Map();
- void ReMap(DWORD needed);
-
void InitDialogs();
bool EnterPassword(const BYTE *pKey, const size_t keyLen);
};
-typedef int (CDb3Base::*CheckWorker)(int);
diff --git a/plugins/Db3x_mmap/src/dbintfm.cpp b/plugins/Db3x_mmap/src/dbintfm.cpp index 352728299f..3dc1e91294 100644 --- a/plugins/Db3x_mmap/src/dbintfm.cpp +++ b/plugins/Db3x_mmap/src/dbintfm.cpp @@ -36,16 +36,13 @@ CDb3Mmap::~CDb3Mmap() free(m_pNull);
}
-DWORD CDb3Mmap::GetSettingsGroupOfsByModuleNameOfs(DBContact *dbc,DWORD ofsContact,DWORD ofsModuleName)
+int CDb3Mmap::Load(bool bSkipInit)
{
- DWORD ofsThis = dbc->ofsFirstSettings;
- while (ofsThis) {
- DBContactSettings *dbcs = (DBContactSettings*)DBRead(ofsThis,sizeof(DBContactSettings),NULL);
- if (dbcs->signature != DBCONTACTSETTINGS_SIGNATURE) DatabaseCorruption(NULL);
- if (dbcs->ofsModuleName == ofsModuleName)
- return ofsThis;
-
- ofsThis = dbcs->ofsNext;
+ int res = CDb3Base::Load(bSkipInit);
+ if (!res) {
+ if (!bSkipInit)
+ if (InitCrypt()) return 1;
}
- return 0;
+
+ return res;
}
diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp index bd5915cbb1..77affa8b2c 100644 --- a/plugins/Db3x_mmap/src/dbsettings.cpp +++ b/plugins/Db3x_mmap/src/dbsettings.cpp @@ -142,9 +142,9 @@ int CDb3Base::GetContactSettingWorker(HANDLE hContact, DBCONTACTGETSETTING *dbcg dbcgs->pValue->type = DBVT_DELETED;
return 2;
- case DBVT_BYTE: dbcgs->pValue->bVal = pBlob[1]; break;
- case DBVT_WORD: MoveMemory(&(dbcgs->pValue->wVal), (PWORD)(pBlob + 1), 2); break;
- case DBVT_DWORD: MoveMemory(&(dbcgs->pValue->dVal), (PDWORD)(pBlob + 1), 4); break;
+ case DBVT_BYTE: dbcgs->pValue->bVal = pBlob[1]; break;
+ case DBVT_WORD: DecodeCopyMemory(&(dbcgs->pValue->wVal), (PWORD)(pBlob + 1), 2); break;
+ case DBVT_DWORD: DecodeCopyMemory(&(dbcgs->pValue->dVal), (PDWORD)(pBlob + 1), 4); break;
case DBVT_UTF8:
case DBVT_ASCIIZ:
@@ -154,13 +154,13 @@ int CDb3Base::GetContactSettingWorker(HANDLE hContact, DBCONTACTGETSETTING *dbcg dbcgs->pValue->cchVal--;
if (varLen < dbcgs->pValue->cchVal)
dbcgs->pValue->cchVal = varLen;
- MoveMemory(dbcgs->pValue->pszVal, pBlob + 3, dbcgs->pValue->cchVal); // decode
+ DecodeCopyMemory(dbcgs->pValue->pszVal, pBlob + 3, dbcgs->pValue->cchVal); // decode
dbcgs->pValue->pszVal[dbcgs->pValue->cchVal] = 0;
dbcgs->pValue->cchVal = varLen;
}
else {
dbcgs->pValue->pszVal = (char*)mir_alloc(1 + varLen);
- MoveMemory(dbcgs->pValue->pszVal, pBlob + 3, varLen);
+ DecodeCopyMemory(dbcgs->pValue->pszVal, pBlob + 3, varLen);
dbcgs->pValue->pszVal[varLen] = 0;
}
break;
@@ -171,11 +171,11 @@ int CDb3Base::GetContactSettingWorker(HANDLE hContact, DBCONTACTGETSETTING *dbcg if (isStatic) {
if (varLen < dbcgs->pValue->cpbVal)
dbcgs->pValue->cpbVal = varLen;
- MoveMemory(dbcgs->pValue->pbVal, pBlob + 3, dbcgs->pValue->cpbVal);
+ DecodeCopyMemory(dbcgs->pValue->pbVal, pBlob + 3, dbcgs->pValue->cpbVal);
}
else {
dbcgs->pValue->pbVal = (BYTE *)mir_alloc(varLen);
- MoveMemory(dbcgs->pValue->pbVal, pBlob + 3, varLen);
+ DecodeCopyMemory(dbcgs->pValue->pbVal, pBlob + 3, varLen);
}
dbcgs->pValue->cpbVal = varLen;
break;
@@ -544,15 +544,17 @@ STDMETHODIMP_(BOOL) CDb3Base::WriteContactSetting(HANDLE hContact, DBCONTACTWRIT MoveAlong(1); //skip data type
switch (tmp.value.type) {
case DBVT_BYTE: DBWrite(ofsBlobPtr, &tmp.value.bVal, 1); break;
- case DBVT_WORD: DBWrite(ofsBlobPtr, &tmp.value.wVal, 2); break;
- case DBVT_DWORD: DBWrite(ofsBlobPtr, &tmp.value.dVal, 4); break;
+ case DBVT_WORD: EncodeDBWrite(ofsBlobPtr, &tmp.value.wVal, 2); break;
+ case DBVT_DWORD: EncodeDBWrite(ofsBlobPtr, &tmp.value.dVal, 4); break;
case DBVT_BLOB:
+ EncodeDBWrite(ofsBlobPtr + 2, tmp.value.pbVal, tmp.value.cpbVal);
+ break;
case DBVT_ENCRYPTED:
DBWrite(ofsBlobPtr + 2, tmp.value.pbVal, tmp.value.cpbVal);
break;
case DBVT_UTF8:
case DBVT_ASCIIZ:
- DBWrite(ofsBlobPtr + 2, tmp.value.pszVal, tmp.value.cchVal);
+ EncodeDBWrite(ofsBlobPtr + 2, tmp.value.pszVal, tmp.value.cchVal);
break;
}
//quit
@@ -627,18 +629,24 @@ STDMETHODIMP_(BOOL) CDb3Base::WriteContactSetting(HANDLE hContact, DBCONTACTWRIT MoveAlong(1);
switch (tmp.value.type) {
case DBVT_BYTE: DBWrite(ofsBlobPtr, &tmp.value.bVal, 1); MoveAlong(1); break;
- case DBVT_WORD: DBWrite(ofsBlobPtr, &tmp.value.wVal, 2); MoveAlong(2); break;
- case DBVT_DWORD: DBWrite(ofsBlobPtr, &tmp.value.dVal, 4); MoveAlong(4); break;
+ case DBVT_WORD: EncodeDBWrite(ofsBlobPtr, &tmp.value.wVal, 2); MoveAlong(2); break;
+ case DBVT_DWORD: EncodeDBWrite(ofsBlobPtr, &tmp.value.dVal, 4); MoveAlong(4); break;
- case DBVT_BLOB: case DBVT_ENCRYPTED:
+ case DBVT_BLOB:
+ DBWrite(ofsBlobPtr, &tmp.value.cpbVal, 2);
+ EncodeDBWrite(ofsBlobPtr + 2, tmp.value.pbVal, tmp.value.cpbVal);
+ MoveAlong(2 + tmp.value.cpbVal);
+ break;
+
+ case DBVT_ENCRYPTED:
DBWrite(ofsBlobPtr, &tmp.value.cpbVal, 2);
DBWrite(ofsBlobPtr + 2, tmp.value.pbVal, tmp.value.cpbVal);
MoveAlong(2 + tmp.value.cpbVal);
break;
-
+
case DBVT_UTF8: case DBVT_ASCIIZ:
DBWrite(ofsBlobPtr, &tmp.value.cchVal, 2);
- DBWrite(ofsBlobPtr + 2, tmp.value.pszVal, tmp.value.cchVal);
+ EncodeDBWrite(ofsBlobPtr + 2, tmp.value.pszVal, tmp.value.cchVal);
MoveAlong(2 + tmp.value.cchVal);
break;
}
diff --git a/plugins/Db3x_mmap/src/dbtool/eventchain.cpp b/plugins/Db3x_mmap/src/dbtool/eventchain.cpp index ee35fec362..a5a03cbecd 100644 --- a/plugins/Db3x_mmap/src/dbtool/eventchain.cpp +++ b/plugins/Db3x_mmap/src/dbtool/eventchain.cpp @@ -232,12 +232,12 @@ int CDb3Base::WorkEventChain(DWORD ofsContact,DBContact *dbc,int firstTime) DWORD oldSize = dbeNew->cbBlob;
BYTE* pOldMemo = (BYTE*)_alloca(dbeNew->cbBlob);
memcpy(pOldMemo, dbeNew->blob, dbeNew->cbBlob);
- CopyMemory(dbeNew->blob, pOldMemo, dbeNew->cbBlob); // decode
+ DecodeCopyMemory(dbeNew->blob, pOldMemo, dbeNew->cbBlob); // decode
ConvertOldEvent(dbeNew);
if (dbeNew->cbBlob > oldSize)
pOldMemo = (BYTE*)_alloca(dbeNew->cbBlob);
memcpy(pOldMemo, dbeNew->blob, dbeNew->cbBlob);
- MoveMemory(dbeNew->blob, pOldMemo, dbeNew->cbBlob); // encode
+ EncodeCopyMemory(dbeNew->blob, pOldMemo, dbeNew->cbBlob); // encode
}
if (dbePrev) {
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj b/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj index 7a548ce305..7a548ce305 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj +++ b/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj diff --git a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj.filters b/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj.filters index ab9907fdb9..ab9907fdb9 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj.filters +++ b/plugins/Dbx_mmap_SA/db3x_mmap_sa_10.vcxproj.filters diff --git a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_11.vcxproj b/plugins/Dbx_mmap_SA/db3x_mmap_sa_11.vcxproj index 6f1fd99934..6f1fd99934 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_11.vcxproj +++ b/plugins/Dbx_mmap_SA/db3x_mmap_sa_11.vcxproj diff --git a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_11.vcxproj.filters b/plugins/Dbx_mmap_SA/db3x_mmap_sa_11.vcxproj.filters index ab9907fdb9..ab9907fdb9 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_11.vcxproj.filters +++ b/plugins/Dbx_mmap_SA/db3x_mmap_sa_11.vcxproj.filters diff --git a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_12.vcxproj b/plugins/Dbx_mmap_SA/db3x_mmap_sa_12.vcxproj index 8168d59428..50b25b0dd7 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_12.vcxproj +++ b/plugins/Dbx_mmap_SA/db3x_mmap_sa_12.vcxproj @@ -197,11 +197,9 @@ <ClCompile Include="..\Db3x_mmap\src\database.cpp" />
<ClCompile Include="..\Db3x_mmap\src\dbcache.cpp" />
<ClCompile Include="..\Db3x_mmap\src\dbcontacts.cpp" />
- <ClCompile Include="..\Db3x_mmap\src\dbcrypt.cpp" />
<ClCompile Include="..\Db3x_mmap\src\dbevents.cpp" />
<ClCompile Include="..\Db3x_mmap\src\dbheaders.cpp" />
<ClCompile Include="..\Db3x_mmap\src\dbintf.cpp" />
- <ClCompile Include="..\Db3x_mmap\src\dbintfm.cpp" />
<ClCompile Include="..\Db3x_mmap\src\dbmodulechain.cpp" />
<ClCompile Include="..\Db3x_mmap\src\dbsettings.cpp" />
<ClCompile Include="..\db3x_mmap\src\dbtool\aggressive.cpp">
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_12.vcxproj.filters b/plugins/Dbx_mmap_SA/db3x_mmap_sa_12.vcxproj.filters index ab9907fdb9..ef588dd760 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/db3x_mmap_sa_12.vcxproj.filters +++ b/plugins/Dbx_mmap_SA/db3x_mmap_sa_12.vcxproj.filters @@ -57,9 +57,6 @@ <ClCompile Include="..\Db3x_mmap\src\dbevents.cpp">
<Filter>Mmap files</Filter>
</ClCompile>
- <ClCompile Include="..\Db3x_mmap\src\dbintfm.cpp">
- <Filter>Mmap files</Filter>
- </ClCompile>
<ClCompile Include="..\db3x_mmap\src\dbtool\aggressive.cpp">
<Filter>Mmap files\Checker</Filter>
</ClCompile>
@@ -90,9 +87,6 @@ <ClCompile Include="src\stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\Db3x_mmap\src\dbcrypt.cpp">
- <Filter>Mmap files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\commonheaders.h">
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/res/db3x_mmap.rc b/plugins/Dbx_mmap_SA/res/db3x_mmap.rc index ddd13c7b17..ddd13c7b17 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/res/db3x_mmap.rc +++ b/plugins/Dbx_mmap_SA/res/db3x_mmap.rc diff --git a/plugins/!Deprecated/Dbx_mmap_SA/res/logo.ico b/plugins/Dbx_mmap_SA/res/logo.ico Binary files differindex 7602e30cbe..7602e30cbe 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/res/logo.ico +++ b/plugins/Dbx_mmap_SA/res/logo.ico diff --git a/plugins/!Deprecated/Dbx_mmap_SA/res/pass.ico b/plugins/Dbx_mmap_SA/res/pass.ico Binary files differindex 2e51427986..2e51427986 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/res/pass.ico +++ b/plugins/Dbx_mmap_SA/res/pass.ico diff --git a/plugins/!Deprecated/Dbx_mmap_SA/res/version.rc b/plugins/Dbx_mmap_SA/res/version.rc index 5bfbab4754..5bfbab4754 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/res/version.rc +++ b/plugins/Dbx_mmap_SA/res/version.rc diff --git a/plugins/!Deprecated/Dbx_mmap_SA/src/commonheaders.h b/plugins/Dbx_mmap_SA/src/commonheaders.h index 877f0ff65d..f95ac242d8 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/src/commonheaders.h +++ b/plugins/Dbx_mmap_SA/src/commonheaders.h @@ -79,7 +79,8 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP void xModifyMenu(HGENMENU hMenu,long flags,const TCHAR* name, HICON hIcon);
-extern DBSignature dbSignature, dbSignatureSecured, dbSignatureNonSecured;
+extern DBSignature dbSignatureSecured, dbSignatureNonSecured;
+extern DBSignature dbSignatureU, dbSignatureE, dbSignatureIM, dbSignatureSA;
extern LIST<CDbxMmapSA> g_Dbs;
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/src/dbintf_sa.cpp b/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp index 22921bcf40..a06af08da7 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/src/dbintf_sa.cpp +++ b/plugins/Dbx_mmap_SA/src/dbintf_sa.cpp @@ -27,11 +27,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MoveAlong(n) {int x=n; pBlob+=(x); ofsBlobPtr+=(x); bytesRemaining-=(x);}
#define VLT(n) ((n==DBVT_UTF8)?DBVT_ASCIIZ:n)
-DBSignature dbSignatureSecured = {"Miranda ICQ SD",0x1A};
-DBSignature dbSignatureNonSecured = {"Miranda ICQ SA",0x1A};
+DBSignature dbSignatureSecured = { "Miranda ICQ SD", 0x1A };
+DBSignature dbSignatureNonSecured = { "Miranda ICQ SA", 0x1A };
CDbxMmapSA::CDbxMmapSA(const TCHAR* tszFileName) :
- CDb3Mmap(tszFileName)
+ CDb3Base(tszFileName)
{
}
@@ -40,7 +40,7 @@ int CDbxMmapSA::Load(bool bSkipInit) if (CDb3Base::Load(bSkipInit) != ERROR_SUCCESS)
return 1;
- if ( CheckDbHeaders())
+ if (CheckDbHeaders())
return 1;
if (!bSkipInit) {
@@ -48,7 +48,7 @@ int CDbxMmapSA::Load(bool bSkipInit) if (!p)
return 1;
- if (m_bEncoding && !CheckPassword( LOWORD(m_dbHeader.version), p+1))
+ if (m_bEncoding && !CheckPassword(LOWORD(m_dbHeader.version), p + 1))
return 1;
InitDialogs();
@@ -59,15 +59,15 @@ int CDbxMmapSA::Load(bool bSkipInit) int CDbxMmapSA::CheckDbHeaders()
{
- if ( memcmp(m_dbHeader.signature, &dbSignatureSecured, sizeof(m_dbHeader.signature)) == 0)
+ if (memcmp(m_dbHeader.signature, &dbSignatureSecured, sizeof(m_dbHeader.signature)) == 0)
m_bEncoding = true;
- else if ( memcmp(m_dbHeader.signature, &dbSignatureNonSecured, sizeof(m_dbHeader.signature)) == 0)
+ else if (memcmp(m_dbHeader.signature, &dbSignatureNonSecured, sizeof(m_dbHeader.signature)) == 0)
m_bEncoding = false;
else {
m_bEncoding = false;
- if ( memcmp(m_dbHeader.signature,&dbSignature,sizeof(m_dbHeader.signature)))
+ if (memcmp(m_dbHeader.signature, &dbSignatureIM, sizeof(m_dbHeader.signature)))
return EGROKPRF_UNKHEADER;
- if ( LOWORD(m_dbHeader.version) != 0x0700)
+ if (LOWORD(m_dbHeader.version) != 0x0700)
return EGROKPRF_VERNEWER;
}
if (m_dbHeader.ofsUser == 0)
@@ -79,7 +79,7 @@ int CDbxMmapSA::CheckDbHeaders() static DWORD __inline GetSettingValueLength(PBYTE pSetting)
{
- if(pSetting[0]&DBVTF_VARIABLELENGTH) return 2+*(PWORD)(pSetting+1);
+ if (pSetting[0] & DBVTF_VARIABLELENGTH) return 2 + *(PWORD)(pSetting + 1);
return pSetting[0];
}
@@ -92,43 +92,43 @@ void CDbxMmapSA::EncodeContactSettings(HANDLE hContact) if (contact->ofsFirstSettings) {
DBContactSettings *setting = (struct DBContactSettings *)DBRead(contact->ofsFirstSettings, sizeof(struct DBContactSettings), NULL);
DWORD offset = contact->ofsFirstSettings;
- while( true ) {
+ while (true) {
DWORD ofsBlobPtr;
PBYTE pBlob;
int bytesRemaining;
DWORD len;
- ofsBlobPtr = offset + offsetof(struct DBContactSettings,blob);
- pBlob = (PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);
- while(pBlob[0]) {
+ ofsBlobPtr = offset + offsetof(struct DBContactSettings, blob);
+ pBlob = (PBYTE)DBRead(ofsBlobPtr, 1, &bytesRemaining);
+ while (pBlob[0]) {
NeedBytes(1);
- NeedBytes(1+pBlob[0]);
- MoveAlong(1+pBlob[0]);
+ NeedBytes(1 + pBlob[0]);
+ MoveAlong(1 + pBlob[0]);
NeedBytes(5);
- switch(pBlob[0]) {
+ switch (pBlob[0]) {
case DBVT_DELETED: break;
case DBVT_BYTE: break;
case DBVT_WORD:
- CryptoEngine->EncryptMem(pBlob+1, 2, key);
+ CryptoEngine->EncryptMem(pBlob + 1, 2, key);
break;
case DBVT_DWORD:
- CryptoEngine->EncryptMem(pBlob+1, 4, key);
+ CryptoEngine->EncryptMem(pBlob + 1, 4, key);
break;
case DBVT_UTF8:
case DBVT_ASCIIZ:
case DBVT_BLOB:
- NeedBytes(3+*(PWORD)(pBlob+1));
- len = *(PWORD)(pBlob+1);
+ NeedBytes(3 + *(PWORD)(pBlob + 1));
+ len = *(PWORD)(pBlob + 1);
- CryptoEngine->EncryptMem(pBlob+3, len, key);
+ CryptoEngine->EncryptMem(pBlob + 3, len, key);
break;
}
NeedBytes(3);
- MoveAlong(1+GetSettingValueLength(pBlob));
+ MoveAlong(1 + GetSettingValueLength(pBlob));
NeedBytes(1);
}
@@ -147,7 +147,7 @@ void CDbxMmapSA::DecodeContactSettings(HANDLE hContact) hContact = (HANDLE)m_dbHeader.ofsUser;
DBContact *contact = (DBContact *)DBRead((DWORD)hContact, sizeof(DBContact), NULL);
- if (contact->ofsFirstSettings){
+ if (contact->ofsFirstSettings) {
DBContactSettings *setting = (struct DBContactSettings *)DBRead(contact->ofsFirstSettings, sizeof(struct DBContactSettings), NULL);
DWORD offset = contact->ofsFirstSettings;
while (true) {
@@ -155,44 +155,43 @@ void CDbxMmapSA::DecodeContactSettings(HANDLE hContact) PBYTE pBlob;
int bytesRemaining;
DWORD len;
- ofsBlobPtr = offset + offsetof(struct DBContactSettings,blob);
- pBlob = (PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);
- while(pBlob[0]) {
+ ofsBlobPtr = offset + offsetof(struct DBContactSettings, blob);
+ pBlob = (PBYTE)DBRead(ofsBlobPtr, 1, &bytesRemaining);
+ while (pBlob[0]) {
NeedBytes(1);
- NeedBytes(1+pBlob[0]);
- //CopyMemory(szSetting,pBlob+1,pBlob[0]); szSetting[pBlob[0]] = 0;
- MoveAlong(1+pBlob[0]);
+ NeedBytes(1 + pBlob[0]);
+ MoveAlong(1 + pBlob[0]);
NeedBytes(5);
- switch(pBlob[0]) {
+ switch (pBlob[0]) {
case DBVT_DELETED: break;
case DBVT_BYTE: break;
case DBVT_WORD:
- CryptoEngine->DecryptMem(pBlob+1, 2, key);
+ CryptoEngine->DecryptMem(pBlob + 1, 2, key);
break;
case DBVT_DWORD:
- CryptoEngine->DecryptMem(pBlob+1, 4, key);
+ CryptoEngine->DecryptMem(pBlob + 1, 4, key);
break;
case DBVT_UTF8:
case DBVT_ASCIIZ:
case DBVT_BLOB:
- NeedBytes(3+*(PWORD)(pBlob+1));
- len = *(PWORD)(pBlob+1);
+ NeedBytes(3 + *(PWORD)(pBlob + 1));
+ len = *(PWORD)(pBlob + 1);
- CryptoEngine->DecryptMem(pBlob+3, len, key);
+ CryptoEngine->DecryptMem(pBlob + 3, len, key);
break;
}
NeedBytes(3);
- MoveAlong(1+GetSettingValueLength(pBlob));
+ MoveAlong(1 + GetSettingValueLength(pBlob));
NeedBytes(1);
}
if (!setting->ofsNext)
break;
-
+
offset = setting->ofsNext;
setting = (struct DBContactSettings *)DBRead(setting->ofsNext, sizeof(struct DBContactSettings), NULL);
}
@@ -201,16 +200,16 @@ void CDbxMmapSA::DecodeContactSettings(HANDLE hContact) void CDbxMmapSA::EncodeEvent(HANDLE hEvent)
{
- DBEvent *dbe = (DBEvent*)DBRead((DWORD)hEvent,sizeof(DBEvent),NULL);
+ DBEvent *dbe = (DBEvent*)DBRead((DWORD)hEvent, sizeof(DBEvent), NULL);
if (dbe->signature = DBEVENT_SIGNATURE)
- CryptoEngine->EncryptMem(DBRead((DWORD)hEvent + offsetof(DBEvent,blob), dbe->cbBlob, NULL), dbe->cbBlob, key);
+ CryptoEngine->EncryptMem(DBRead((DWORD)hEvent + offsetof(DBEvent, blob), dbe->cbBlob, NULL), dbe->cbBlob, key);
}
void CDbxMmapSA::DecodeEvent(HANDLE hEvent)
{
- DBEvent *dbe = (DBEvent*)DBRead((DWORD)hEvent,sizeof(DBEvent),NULL);
+ DBEvent *dbe = (DBEvent*)DBRead((DWORD)hEvent, sizeof(DBEvent), NULL);
if (dbe->signature = DBEVENT_SIGNATURE)
- CryptoEngine->DecryptMem(DBRead((DWORD)hEvent + offsetof(DBEvent,blob), dbe->cbBlob, NULL), dbe->cbBlob, key);
+ CryptoEngine->DecryptMem(DBRead((DWORD)hEvent + offsetof(DBEvent, blob), dbe->cbBlob, NULL), dbe->cbBlob, key);
}
void CDbxMmapSA::EncodeContactEvents(HANDLE hContact)
@@ -234,22 +233,22 @@ void CDbxMmapSA::DecodeContactEvents(HANDLE hContact) int CDbxMmapSA::WorkInitialCheckHeaders(void)
{
if (m_bEncoding) {
- cb->pfnAddLogMessage(STATUS_SUCCESS,TranslateT("Database is Secured MMAP database"));
+ cb->pfnAddLogMessage(STATUS_SUCCESS, TranslateT("Database is Secured MMAP database"));
TCHAR* p = _tcsrchr(m_tszProfileName, '\\');
if (!p)
return ERROR_BAD_FORMAT;
- if (!CheckPassword( LOWORD(m_dbHeader.version), p+1)) {
- cb->pfnAddLogMessage(STATUS_FATAL,TranslateT("You are not authorized for access to Database"));
+ if (!CheckPassword(LOWORD(m_dbHeader.version), p + 1)) {
+ cb->pfnAddLogMessage(STATUS_FATAL, TranslateT("You are not authorized for access to Database"));
return ERROR_BAD_FORMAT;
}
- cb->pfnAddLogMessage(STATUS_SUCCESS,TranslateT("Secured MMAP: authorization successful"));
+ cb->pfnAddLogMessage(STATUS_SUCCESS, TranslateT("Secured MMAP: authorization successful"));
}
- if ( LOWORD(m_dbHeader.version) != 0x0700 && !m_bEncoding) {
- cb->pfnAddLogMessage(STATUS_FATAL,TranslateT("Database is marked as belonging to an unknown version of Miranda"));
+ if (LOWORD(m_dbHeader.version) != 0x0700 && !m_bEncoding) {
+ cb->pfnAddLogMessage(STATUS_FATAL, TranslateT("Database is marked as belonging to an unknown version of Miranda"));
return ERROR_BAD_FORMAT;
}
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/src/dbintf_sa.h b/plugins/Dbx_mmap_SA/src/dbintf_sa.h index 2358d55d69..519e5c50bb 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/src/dbintf_sa.h +++ b/plugins/Dbx_mmap_SA/src/dbintf_sa.h @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "..\Db3x_mmap\src\dbintf.h"
-struct CDbxMmapSA : public CDb3Mmap
+struct CDbxMmapSA : public CDb3Base
{
CDbxMmapSA(const TCHAR* tszFileName);
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/src/dialogs.cpp b/plugins/Dbx_mmap_SA/src/dialogs.cpp index 1b395658a2..b210f30628 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/src/dialogs.cpp +++ b/plugins/Dbx_mmap_SA/src/dialogs.cpp @@ -68,7 +68,7 @@ INT_PTR ChangePassword(void* obj, LPARAM wParam, LPARAM lParam) return 0;
}
-void xModifyMenu(HGENMENU hMenu,long flags,const TCHAR* name, HICON hIcon)
+void xModifyMenu(HGENMENU hMenu, long flags, const TCHAR *name, HICON hIcon)
{
CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_FLAGS | CMIF_TCHAR;
@@ -80,7 +80,7 @@ void xModifyMenu(HGENMENU hMenu,long flags,const TCHAR* name, HICON hIcon) Menu_ModifyItem(hMenu, &mi);
}
-static IconItem iconList[] =
+static IconItem iconList[] =
{
{ LPGEN("Database"), "database", IDI_ICON2 },
{ LPGEN("Change Password"), "password", IDI_ICON3 }
@@ -118,19 +118,19 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP CDbxMmapSA *p_Db = (CDbxMmapSA*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
LVITEM item;
int i, iRow, iIndex;
- NMLISTVIEW * hdr = (NMLISTVIEW *) lParam;
+ NMLISTVIEW * hdr = (NMLISTVIEW *)lParam;
WORD uid;
- switch ( msg ) {
+ switch (msg) {
case WM_INITDIALOG:
- TranslateDialogDefault( hwndDlg );
+ TranslateDialogDefault(hwndDlg);
SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
p_Db = (CDbxMmapSA*)lParam;
{
HIMAGELIST hIml = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, 2, 0);
ImageList_AddIcon(hIml, LoadSkinnedIcon(SKINICON_OTHER_LOADED));
ImageList_AddIcon(hIml, LoadSkinnedIcon(SKINICON_OTHER_NOTLOADED));
- ListView_SetImageList( hwndList, hIml, LVSIL_SMALL );
+ ListView_SetImageList(hwndList, hIml, LVSIL_SMALL);
LVCOLUMN col;
col.pszText = NULL;
@@ -170,7 +170,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP ListView_SetItemText(hwndList, iRow, 1, arCryptors[i]->dllname);
_tcsncpy(buf, _A2T(arCryptors[i]->cryptor->Name), SIZEOF(buf));
ListView_SetItemText(hwndList, iRow, 2, buf);
- mir_sntprintf(buf,SIZEOF(buf),_T("%d.%d.%d.%d"), HIBYTE(HIWORD(arCryptors[i]->cryptor->Version)), LOBYTE(HIWORD(arCryptors[i]->cryptor->Version)), HIBYTE(LOWORD(arCryptors[i]->cryptor->Version)), LOBYTE(LOWORD(arCryptors[i]->cryptor->Version)));
+ mir_sntprintf(buf, SIZEOF(buf), _T("%d.%d.%d.%d"), HIBYTE(HIWORD(arCryptors[i]->cryptor->Version)), LOBYTE(HIWORD(arCryptors[i]->cryptor->Version)), HIBYTE(LOWORD(arCryptors[i]->cryptor->Version)), LOBYTE(LOWORD(arCryptors[i]->cryptor->Version)));
ListView_SetItemText(hwndList, iRow, 3, buf);
if (uid == arCryptors[i]->cryptor->uid && p_Db->m_bEncoding)
@@ -179,8 +179,8 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP item.mask = LVIF_IMAGE;
item.iItem = iRow;
item.iSubItem = 0;
- item.iImage = ( CryptoEngine == arCryptors[i]->cryptor && p_Db->m_bEncoding ) ? 0 : 1;
- ListView_SetItem( hwndList, &item );
+ item.iImage = (CryptoEngine == arCryptors[i]->cryptor && p_Db->m_bEncoding) ? 0 : 1;
+ ListView_SetItem(hwndList, &item);
}
ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);
@@ -190,39 +190,39 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP return TRUE;
case WM_COMMAND:
- if ( HIWORD(wParam) == STN_CLICKED ) {
+ if (HIWORD(wParam) == STN_CLICKED) {
switch (LOWORD(wParam)) {
- case IDC_EMAIL:
- case IDC_SITE:
- {
- char buf[512];
- char * p = &buf[7];
- lstrcpyA(buf,"mailto:");
- if ( GetWindowTextA(GetDlgItem(hwndDlg, LOWORD(wParam)), p, SIZEOF(buf) - 7)) {
- CallService(MS_UTILS_OPENURL,0,(LPARAM) (LOWORD(wParam) == IDC_EMAIL ? buf : p));
- }
- break;
- } } }
+ case IDC_EMAIL:
+ case IDC_SITE:
+ char buf[512];
+ char *p = &buf[7];
+ lstrcpyA(buf, "mailto:");
+ if (GetWindowTextA(GetDlgItem(hwndDlg, LOWORD(wParam)), p, SIZEOF(buf) - 7))
+ CallService(MS_UTILS_OPENURL, 0, (LPARAM)(LOWORD(wParam) == IDC_EMAIL ? buf : p));
+ break;
+ }
+ }
break;
case WM_NOTIFY:
- if ( hdr && hdr->hdr.code == LVN_ITEMCHANGED && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1)) {
+ if (hdr && hdr->hdr.code == LVN_ITEMCHANGED && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1)) {
iIndex = hdr->iItem;
- if (hdr->uNewState & 0x2000){
- for (i = 0; i < arCryptors.getCount(); i++) {
- if (i != iIndex) ListView_SetCheckState(hwndList, i, 0);
- }
+ if (hdr->uNewState & 0x2000) {
+ for (i = 0; i < arCryptors.getCount(); i++)
+ if (i != iIndex)
+ ListView_SetCheckState(hwndList, i, 0);
+
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
break;
}
- if (hdr->uNewState & 0x1000){
+ if (hdr->uNewState & 0x1000) {
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
break;
}
- if (hdr->uNewState & LVIS_SELECTED){
+ if (hdr->uNewState & LVIS_SELECTED) {
SetDlgItemTextA(hwndDlg, IDC_AUTHOR, arCryptors[iIndex]->cryptor->Author);
{
- TCHAR* info_t = mir_a2t((char*)(arCryptors[iIndex]->cryptor->Info));
+ TCHAR *info_t = mir_a2t((char*)(arCryptors[iIndex]->cryptor->Info));
SetDlgItemText(hwndDlg, IDC_INFO, TranslateTS(info_t));
mir_free(info_t);
}
@@ -230,7 +230,8 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SetDlgItemTextA(hwndDlg, IDC_EMAIL, arCryptors[iIndex]->cryptor->Email);
SetDlgItemTextA(hwndDlg, IDC_ENC, arCryptors[iIndex]->cryptor->Name);
SetDlgItemInt(hwndDlg, IDC_UID, arCryptors[iIndex]->cryptor->uid, 0);
- } else {
+ }
+ else {
SetDlgItemTextA(hwndDlg, IDC_AUTHOR, "");
SetDlgItemTextA(hwndDlg, IDC_INFO, "");
SetDlgItemTextA(hwndDlg, IDC_SITE, "");
@@ -241,7 +242,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP break;
}
- if (((LPNMHDR)lParam)->code == PSN_APPLY ) {
+ if (((LPNMHDR)lParam)->code == PSN_APPLY) {
int alg = -1;
for (i = 0; i < arCryptors.getCount(); i++) {
if (ListView_GetCheckState(hwndList, i)) {
@@ -250,8 +251,8 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP }
}
- if (alg > -1){
- if (!p_Db->m_bEncoding){
+ if (alg > -1) {
+ if (!p_Db->m_bEncoding) {
db_set_w(NULL, "SecureMMAP", "CryptoModule", arCryptors[alg]->cryptor->uid);
p_Db->EncryptDB();
}
@@ -274,9 +275,9 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP item.mask = LVIF_IMAGE;
item.iItem = i;
item.iSubItem = 0;
- item.iImage = ( CryptoEngine == arCryptors[i]->cryptor && p_Db->m_bEncoding ) ? 0 : 1;
+ item.iImage = (CryptoEngine == arCryptors[i]->cryptor && p_Db->m_bEncoding) ? 0 : 1;
- ListView_SetItem( hwndList, &item );
+ ListView_SetItem(hwndList, &item);
}
return TRUE;
@@ -292,11 +293,10 @@ UINT oldLangID = 0; void LanguageChanged(HWND hDlg)
{
UINT LangID = (UINT)GetKeyboardLayout(0);
- char Lang[3] = {0};
- if (LangID != oldLangID)
- {
+ char Lang[3] = { 0 };
+ if (LangID != oldLangID) {
oldLangID = LangID;
- GetLocaleInfoA(MAKELCID((LangID & 0xffffffff), SORT_DEFAULT), LOCALE_SABBREVLANGNAME, Lang, 2);
+ GetLocaleInfoA(MAKELCID((LangID & 0xffffffff), SORT_DEFAULT), LOCALE_SABBREVLANGNAME, Lang, 2);
Lang[0] = toupper(Lang[0]);
Lang[1] = tolower(Lang[1]);
SetDlgItemTextA(hDlg, IDC_LANG, Lang);
@@ -305,11 +305,11 @@ void LanguageChanged(HWND hDlg) extern BOOL wrongPass;
-INT_PTR CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
+INT_PTR CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TCHAR tszHeaderTxt[256];
- switch(uMsg) {
+ switch (uMsg) {
case WM_INITDIALOG:
TranslateDialogDefault(hDlg);
{
@@ -335,7 +335,7 @@ INT_PTR CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) }
}
oldLangID = 0;
- SetTimer(hDlg,1,200,NULL);
+ SetTimer(hDlg, 1, 200, NULL);
LanguageChanged(hDlg);
return TRUE;
@@ -348,15 +348,15 @@ INT_PTR CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) return FALSE;
case WM_COMMAND:
- switch( LOWORD(wParam)) {
+ switch (LOWORD(wParam)) {
case IDCANCEL:
- EndDialog(hDlg,IDCANCEL);
+ EndDialog(hDlg, IDCANCEL);
break;
case IDOK:
CDbxMmapSA *p_Db = (CDbxMmapSA*)GetWindowLongPtr(hDlg, GWLP_USERDATA);
p_Db->encryptKeyLength = GetDlgItemTextA(hDlg, IDC_USERPASS, p_Db->encryptKey, 254);
- EndDialog(hDlg,IDOK);
+ EndDialog(hDlg, IDOK);
}
break;
@@ -372,9 +372,9 @@ INT_PTR CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) return FALSE;
}
-INT_PTR CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
+INT_PTR CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- switch(uMsg) {
+ switch (uMsg) {
case WM_INITDIALOG:
TranslateDialogDefault(hDlg);
SetWindowLongPtr(hDlg, GWLP_USERDATA, (LPARAM)lParam);
@@ -384,7 +384,7 @@ INT_PTR CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Please enter your new password"));
oldLangID = 0;
- SetTimer(hDlg,1,200,NULL);
+ SetTimer(hDlg, 1, 200, NULL);
LanguageChanged(hDlg);
return TRUE;
@@ -397,32 +397,32 @@ INT_PTR CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) return FALSE;
case WM_COMMAND:
- switch( LOWORD(wParam)) {
+ switch (LOWORD(wParam)) {
case IDCANCEL:
- EndDialog(hDlg,IDCANCEL);
+ EndDialog(hDlg, IDCANCEL);
break;
case IDOK:
CDbxMmapSA *p_Db = (CDbxMmapSA*)GetWindowLongPtr(hDlg, GWLP_USERDATA);
char pass1[255], pass2[255];
- if (GetDlgItemTextA(hDlg, IDC_USERPASS1, pass1, 254) < 3){
+ if (GetDlgItemTextA(hDlg, IDC_USERPASS1, pass1, 254) < 3) {
SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Password is too short!"));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0);
- SetDlgItemTextA(hDlg,IDC_USERPASS1,"");
- SetDlgItemTextA(hDlg,IDC_USERPASS2,"");
+ SetDlgItemTextA(hDlg, IDC_USERPASS1, "");
+ SetDlgItemTextA(hDlg, IDC_USERPASS2, "");
}
else {
GetDlgItemTextA(hDlg, IDC_USERPASS2, pass2, 254);
if (!strcmp(pass1, pass2)) {
p_Db->encryptKeyLength = strlen(pass1);
strcpy(p_Db->encryptKey, pass1);
- EndDialog(hDlg,IDOK);
+ EndDialog(hDlg, IDOK);
}
else {
SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Passwords do not match!"));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0);
- SetDlgItemTextA(hDlg,IDC_USERPASS1,"");
- SetDlgItemTextA(hDlg,IDC_USERPASS2,"");
+ SetDlgItemTextA(hDlg, IDC_USERPASS1, "");
+ SetDlgItemTextA(hDlg, IDC_USERPASS2, "");
}
}
}
@@ -440,12 +440,12 @@ INT_PTR CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) return FALSE;
}
-INT_PTR CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
+INT_PTR CALLBACK DlgChangePass(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
static char* newPass;
CDbxMmapSA *p_Db = (CDbxMmapSA*)GetWindowLongPtr(hDlg, GWLP_USERDATA);
- switch(uMsg) {
+ switch (uMsg) {
case WM_INITDIALOG:
TranslateDialogDefault(hDlg);
@@ -457,7 +457,7 @@ INT_PTR CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) SetWindowLongPtr(hDlg, GWLP_USERDATA, (LPARAM)param->p_Db);
}
oldLangID = 0;
- SetTimer(hDlg,1,200,NULL);
+ SetTimer(hDlg, 1, 200, NULL);
LanguageChanged(hDlg);
return TRUE;
@@ -471,8 +471,8 @@ INT_PTR CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) return FALSE;
case WM_COMMAND:
- switch( LOWORD(wParam)) {
- char pass1[255], pass2[255], oldpass[255];
+ switch (LOWORD(wParam)) {
+ char pass1[255], pass2[255], oldpass[255];
case IDOK:
GetDlgItemTextA(hDlg, IDC_OLDPASS, oldpass, 254);
if (strcmp(oldpass, p_Db->encryptKey)) {
@@ -481,7 +481,7 @@ INT_PTR CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) break;
}
- if (GetDlgItemTextA(hDlg, IDC_NEWPASS1, pass1, 254) < 3){
+ if (GetDlgItemTextA(hDlg, IDC_NEWPASS1, pass1, 254) < 3) {
SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Password is too short!"));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0);
}
@@ -489,7 +489,7 @@ INT_PTR CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) GetDlgItemTextA(hDlg, IDC_NEWPASS2, pass2, 254);
if (!strcmp(pass1, pass2)) {
strcpy(newPass, pass1);
- EndDialog(hDlg,IDOK);
+ EndDialog(hDlg, IDOK);
}
else {
SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Passwords do not match!"));
@@ -499,7 +499,7 @@ INT_PTR CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) break;
case IDCANCEL:
- EndDialog(hDlg,IDCANCEL);
+ EndDialog(hDlg, IDCANCEL);
break;
case IDREMOVE:
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/src/init.cpp b/plugins/Dbx_mmap_SA/src/init.cpp index 6b673fde1f..fffb7dd314 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/src/init.cpp +++ b/plugins/Dbx_mmap_SA/src/init.cpp @@ -51,7 +51,7 @@ LIST<CDbxMmapSA> g_Dbs(1, HandleKeySortT); // returns 0 if the profile is created, EMKPRF*
static int makeDatabase(const TCHAR *profile)
{
- std::auto_ptr<CDbxMmapSA> db( new CDbxMmapSA(profile));
+ std::auto_ptr<CDbxMmapSA> db(new CDbxMmapSA(profile));
if (db->Create() == ERROR_SUCCESS) {
db->CreateDbHeaders(dbSignatureNonSecured);
return 0;
@@ -63,7 +63,7 @@ static int makeDatabase(const TCHAR *profile) // returns 0 if the given profile has a valid header
static int grokHeader(const TCHAR *profile)
{
- std::auto_ptr<CDbxMmapSA> db( new CDbxMmapSA(profile));
+ std::auto_ptr<CDbxMmapSA> db(new CDbxMmapSA(profile));
if (db->Load(true) != ERROR_SUCCESS)
return EGROKPRF_CANTREAD;
@@ -74,9 +74,9 @@ static int grokHeader(const TCHAR *profile) static MIDatabase* LoadDatabase(const TCHAR *profile)
{
// set the memory, lists & UTF8 manager
- mir_getLP( &pluginInfo );
+ mir_getLP(&pluginInfo);
- std::auto_ptr<CDbxMmapSA> db( new CDbxMmapSA(profile));
+ std::auto_ptr<CDbxMmapSA> db(new CDbxMmapSA(profile));
if (db->Load(false) != ERROR_SUCCESS)
return NULL;
@@ -93,7 +93,7 @@ static int UnloadDatabase(MIDatabase* db) MIDatabaseChecker* CheckDb(const TCHAR* profile, int *error)
{
- std::auto_ptr<CDbxMmapSA> db( new CDbxMmapSA(profile));
+ std::auto_ptr<CDbxMmapSA> db(new CDbxMmapSA(profile));
if (db->Load(true) != ERROR_SUCCESS) {
*error = EGROKPRF_CANTREAD;
return NULL;
@@ -128,7 +128,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD mirand return &pluginInfo;
}
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_DATABASE, MIID_LAST};
+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_DATABASE, MIID_LAST };
extern "C" __declspec(dllexport) int Load(void)
{
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/src/options.h b/plugins/Dbx_mmap_SA/src/options.h index efabf3eba5..efabf3eba5 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/src/options.h +++ b/plugins/Dbx_mmap_SA/src/options.h diff --git a/plugins/!Deprecated/Dbx_mmap_SA/src/resource.h b/plugins/Dbx_mmap_SA/src/resource.h index 7b13f6957d..7b13f6957d 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/src/resource.h +++ b/plugins/Dbx_mmap_SA/src/resource.h diff --git a/plugins/!Deprecated/Dbx_mmap_SA/src/security.cpp b/plugins/Dbx_mmap_SA/src/security.cpp index 6d41787d24..eb997e1eb8 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/src/security.cpp +++ b/plugins/Dbx_mmap_SA/src/security.cpp @@ -29,9 +29,9 @@ void InitSecurity() while (hFile != INVALID_HANDLE_VALUE) {
mir_sntprintf(p, MAX_PATH - (p-tszPath), _T("cryptors\\%s"), fd.cFileName);
HMODULE hLib = LoadLibrary(tszPath);
- if (hLib){
+ if (hLib) {
GetCryptor = (Cryptor* (__stdcall *)()) GetProcAddress(hLib, "GetCryptor");
- if (GetCryptor){
+ if (GetCryptor) {
CryptoModule* newItem = (CryptoModule*) malloc(sizeof(CryptoModule));
newItem->cryptor = GetCryptor();
_tcsncpy(newItem->dllname, fd.cFileName, MAX_PATH);
@@ -65,7 +65,7 @@ void CDbxMmapSA::EncoderInit() key = CryptoEngine->GenerateKey(encryptKey);
}
-void CDbxMmapSA::EncodeCopyMemory(void * dst, void * src, size_t size )
+void CDbxMmapSA::EncodeCopyMemory(void * dst, void * src, size_t size)
{
memcpy(dst, src, size);
@@ -73,7 +73,7 @@ void CDbxMmapSA::EncodeCopyMemory(void * dst, void * src, size_t size ) CryptoEngine->EncryptMem((BYTE *)dst, (int)size, key);
}
-void CDbxMmapSA::DecodeCopyMemory(void * dst, void * src, size_t size )
+void CDbxMmapSA::DecodeCopyMemory(void * dst, void * src, size_t size)
{
memcpy(dst, src, size);
@@ -114,19 +114,19 @@ int CDbxMmapSA::CheckPassword(WORD checkWord, TCHAR *szDBName) int Found = 0;
for (int i = 0; i < arCryptors.getCount(); i++) {
- if ( HIWORD(m_dbHeader.version) == arCryptors[i]->cryptor->uid){
+ if (HIWORD(m_dbHeader.version) == arCryptors[i]->cryptor->uid) {
CryptoEngine = arCryptors[i]->cryptor;
Found = 1;
break;
}
}
- if (!Found){
+ if (!Found) {
MessageBox(0, TranslateT("Sorry, but your database encrypted with unknown module"), TranslateT("Error"), MB_OK | MB_ICONERROR);
bCheckingPass = 0;
return 0;
}
- while(1) {
+ while (1) {
DlgStdInProcParam param = { this, szDBName };
int res = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_LOGIN), NULL, DlgStdInProc, (LPARAM)¶m);
if (res == IDCANCEL) {
@@ -154,7 +154,7 @@ int CDbxMmapSA::CheckPassword(WORD checkWord, TCHAR *szDBName) int SelectEncoder()
{
- if (arCryptors.getCount() == 0){
+ if (arCryptors.getCount() == 0) {
MessageBox(0, TranslateT("Crypto modules not found"), TranslateT("Error"), MB_OK | MB_ICONERROR);
return 1;
}
@@ -200,11 +200,11 @@ void CDbxMmapSA::WritePlainHeader() DWORD bytesWritten;
memcpy(m_dbHeader.signature, &dbSignatureNonSecured, sizeof(m_dbHeader.signature));
- SetFilePointer(m_hDbFile,0,NULL,FILE_BEGIN);
- WriteFile(m_hDbFile,m_dbHeader.signature,sizeof(m_dbHeader.signature),&bytesWritten,NULL);
+ SetFilePointer(m_hDbFile, 0, NULL, FILE_BEGIN);
+ WriteFile(m_hDbFile, m_dbHeader.signature, sizeof(m_dbHeader.signature), &bytesWritten, NULL);
m_dbHeader.version = MAKELONG(0x0700, 0x0000); //no encryption
- WriteFile(m_hDbFile,&m_dbHeader.version, sizeof(m_dbHeader.version),&bytesWritten,NULL);
+ WriteFile(m_hDbFile, &m_dbHeader.version, sizeof(m_dbHeader.version), &bytesWritten, NULL);
}
void CDbxMmapSA::WriteCryptHeader()
@@ -212,13 +212,13 @@ void CDbxMmapSA::WriteCryptHeader() DWORD bytesWritten;
memcpy(m_dbHeader.signature, &dbSignatureSecured, sizeof(m_dbHeader.signature));
- SetFilePointer(m_hDbFile,0,NULL,FILE_BEGIN);
- WriteFile(m_hDbFile,m_dbHeader.signature,sizeof(m_dbHeader.signature),&bytesWritten,NULL);
+ SetFilePointer(m_hDbFile, 0, NULL, FILE_BEGIN);
+ WriteFile(m_hDbFile, m_dbHeader.signature, sizeof(m_dbHeader.signature), &bytesWritten, NULL);
WORD checkWord = 0x5195, cryptWord;
EncodeCopyMemory(&cryptWord, &checkWord, sizeof(checkWord));
m_dbHeader.version = MAKELONG(cryptWord, CryptoEngine->uid);
- WriteFile(m_hDbFile,&m_dbHeader.version, sizeof(m_dbHeader.version),&bytesWritten,NULL);
+ WriteFile(m_hDbFile, &m_dbHeader.version, sizeof(m_dbHeader.version), &bytesWritten, NULL);
}
void CDbxMmapSA::EncryptDB()
@@ -227,7 +227,7 @@ void CDbxMmapSA::EncryptDB() if (bEncProcess)
return;
- if (memcmp(m_dbHeader.signature, &dbSignatureSecured, sizeof(m_dbHeader.signature)) == 0){
+ if (memcmp(m_dbHeader.signature, &dbSignatureSecured, sizeof(m_dbHeader.signature)) == 0) {
MessageBox(0, TranslateT("DB is already secured!"), TranslateT("Error"), MB_OK | MB_ICONERROR);
return;
}
@@ -265,7 +265,7 @@ void CDbxMmapSA::DecryptDB() char oldKey[255];
strcpy(oldKey, encryptKey);
- if ( !CheckPassword( LOWORD(m_dbHeader.version), TranslateT("current database"))) {
+ if (!CheckPassword(LOWORD(m_dbHeader.version), TranslateT("current database"))) {
strcpy(encryptKey, oldKey);
encryptKeyLength = strlen(oldKey);
return;
@@ -313,7 +313,7 @@ void CDbxMmapSA::RecryptDB() void CDbxMmapSA::ChangePwd()
{
- char newpass[255] = {0};
+ char newpass[255] = { 0 };
DlgChangePassParam param = { this, newpass };
int action = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_CHANGEPASS), NULL, DlgChangePass, (LPARAM)¶m);
@@ -327,7 +327,7 @@ void CDbxMmapSA::ChangePwd() CryptoEngine->FreeKey(key);
- if (action == IDREMOVE){
+ if (action == IDREMOVE) {
WritePlainHeader();
m_bEncoding = 0;
@@ -339,7 +339,7 @@ void CDbxMmapSA::ChangePwd() xModifyMenu(hSetPwdMenu, 0, LPGENT("Set Password"), 0);
}
- if (action == IDOK){
+ if (action == IDOK) {
strcpy(encryptKey, newpass);
encryptKeyLength = strlen(newpass);
diff --git a/plugins/!Deprecated/Dbx_mmap_SA/src/stdafx.cpp b/plugins/Dbx_mmap_SA/src/stdafx.cpp index e7e41dae3c..e7e41dae3c 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/src/stdafx.cpp +++ b/plugins/Dbx_mmap_SA/src/stdafx.cpp diff --git a/plugins/!Deprecated/Dbx_mmap_SA/src/version.h b/plugins/Dbx_mmap_SA/src/version.h index c77ad2d7ed..c77ad2d7ed 100644 --- a/plugins/!Deprecated/Dbx_mmap_SA/src/version.h +++ b/plugins/Dbx_mmap_SA/src/version.h |