Commit [9ddba1] Maximize Restore History

Define the new directory structure

Add language DLL into the main stream
Move corelibtest into the new directory structure

git-svn-id: svn://svn.code.sf.net/p/passwordsafe/code/trunk/pwsafe/pwsafe@1109 1f79f812-37fb-46fe-a122-30589dd2bf55

minus273c minus273c 2006-11-15

1 2 > >> (Page 1 of 2)
added src/language/languageDLL.cpp
added src/language/languageDLL.vcproj.KELVIN-HOME.David.user
added src/language/stdafx.cpp
removed test
removed test/corelibtest.vcproj
removed test/suite.cpp
removed test/suite.h
removed test/test.cpp
removed test/test.h
changed corelib/corelib.vcproj
copied test/HMAC_SHA256Test.h -> src/test/HMAC_SHA256Test.h
copied test/MyStringTest.h -> src/test/MyStringTest.h
copied test/SHA256Test.h -> src/test/SHA256Test.h
copied test/TwoFishTest.h -> src/test/TwoFishTest.h
copied test/corelibtest.cpp -> src/language/stdafx.h
copied test/corelibtest.dsp -> src/language/languageDLL.vcproj
src/language/languageDLL.cpp Diff Switch to side-by-side view
Loading...
src/language/languageDLL.vcproj.KELVIN-HOME.David.user Diff Switch to side-by-side view
Loading...
src/language/stdafx.cpp Diff Switch to side-by-side view
Loading...
test
File was removed.
test/corelibtest.vcproj
File was removed.
test/suite.cpp
File was removed.
test/suite.h
File was removed.
test/test.cpp
File was removed.
test/test.h
File was removed.
corelib/corelib.vcproj Diff Switch to side-by-side view
Loading...
test/corelibtest.cpp to src/language/stdafx.h
--- a/test/corelibtest.cpp
+++ b/src/language/stdafx.h
@@ -1,55 +1,32 @@
-/*
- * Copyright (c) 2003-2006 Rony Shapiro <ronys@users.sourceforge.net>.
- * All rights reserved. Use of the code is allowed under the
- * Artistic License terms, as specified in the LICENSE file
- * distributed with this code, or available from
- * http://www.opensource.org/licenses/artistic-license.php
- */
-#define TEST_MYSTRING
-#define TEST_TWOFISH
-#define TEST_SHA256
-#define TEST_HMAC_SHA256
-
-#ifdef TEST_MYSTRING
-#include "MyStringTest.h"
-#endif
-#ifdef TEST_TWOFISH
-#include "TwoFishTest.h"
-#endif
-#ifdef TEST_SHA256
-#include "SHA256Test.h"
-#endif
-#ifdef TEST_HMAC_SHA256
-#include "HMAC_SHA256Test.h"
-#endif
-#include <iostream>
-using namespace std;
-
-int main()
-{
-#ifdef TEST_MYSTRING
-   CMyStringTest t1;
-   t1.setStream(&cout);
-   t1.run();
-   t1.report();
-#endif
-#ifdef TEST_TWOFISH
-   CTwoFishTest t2;
-   t2.setStream(&cout);
-   t2.run();
-   t2.report();
-#endif
-#ifdef TEST_SHA256
-   CSHA256Test t3;
-   t3.setStream(&cout);
-   t3.run();
-   t3.report();
-#endif
-#ifdef TEST_HMAC_SHA256
-   CHMAC_SHA256Test t4;
-   t4.setStream(&cout);
-   t4.run();
-   t4.report();
-#endif
-   return 0;
-}
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+// Modify the following defines if you have to target a platform prior to the ones specified below.
+// Refer to MSDN for the latest info on corresponding values for different platforms.
+#ifndef WINVER				// Allow use of features specific to Windows XP or later.
+#define WINVER 0x0501		// Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#ifndef _WIN32_WINNT		// Allow use of features specific to Windows XP or later.                   
+#define _WIN32_WINNT 0x0501	// Change this to the appropriate value to target other versions of Windows.
+#endif						
+
+#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
+#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#endif
+
+#ifndef _WIN32_IE			// Allow use of features specific to IE 6.0 or later.
+#define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.
+#endif
+
+#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+// Windows Header Files:
+#include <windows.h>
+
+
+
+// TODO: reference additional headers your program requires here
test/corelibtest.dsp to src/language/languageDLL.vcproj
--- a/test/corelibtest.dsp
+++ b/src/language/languageDLL.vcproj
@@ -1,121 +1,176 @@
-# Microsoft Developer Studio Project File - Name="corelibtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=corelibtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "corelibtest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "corelibtest.mak" CFG="corelibtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "corelibtest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "corelibtest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "corelibtest - Win32 Release"
-
-# PROP BASE Use_MFC 1
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../corelib" /I "C:\local\msvc\HTMLHelpWorkshop\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS_" /D "_AFXDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "corelibtest - Win32 Debug"
-
-# PROP BASE Use_MFC 1
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../corelib" /I "C:\local\msvc\HTMLHelpWorkshop\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS_" /D "_AFXDLL" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "corelibtest - Win32 Release"
-# Name "corelibtest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\corelibtest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\test\test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\test\MyStringTest.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SHA256Test.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\test\test.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TwoFishTest.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="languageDLL"
+	ProjectGUID="{FC821168-0D64-45EA-881D-4842A3A670CC}"
+	RootNamespace="languageDLL"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\language"
+			IntermediateDirectory="..\..\obj\language"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;languageDLL_EXPORTS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\pwsafe_base.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ResourceOnlyDLL="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\languageDLL.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\stdafx.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\corelib\corelib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\resource2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\resource3.h"
+				>
+			</File>
+			<File
+				RelativePath=".\stdafx.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\version.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\corelib\corelib.rc2"
+				>
+			</File>
+			<File
+				RelativePath="..\..\PasswordSafe.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\res\PasswordSafe2.rc2"
+				>
+			</File>
+			<File
+				RelativePath="..\..\res\PasswordSafe3.rc2"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
1 2 > >> (Page 1 of 2)