[Openpgpmdrv-commits] r7 - in trunk: OpenPGPminidriver OpenPGPminidriverTest

[scm-commit@wald.intevation.org]

Author: vletoux
Date: 2010-03-04 22:50:46 +0100 (Thu, 04 Mar 2010)
New Revision: 7

Modified:
   trunk/OpenPGPminidriver/OpenPGPminidriver.vcproj
   trunk/OpenPGPminidriver/Tracing.c
   trunk/OpenPGPminidriverTest/OpenPGPminidriverTest.vcproj
   trunk/OpenPGPminidriverTest/main.cpp
Log:
fix project settings

Modified: trunk/OpenPGPminidriver/OpenPGPminidriver.vcproj
===================================================================
--- trunk/OpenPGPminidriver/OpenPGPminidriver.vcproj	2010-03-04 21:17:51 UTC (rev 6)
+++ trunk/OpenPGPminidriver/OpenPGPminidriver.vcproj	2010-03-04 21:50:46 UTC (rev 7)
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			>
@@ -169,7 +169,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
@@ -245,7 +245,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			WholeProgramOptimization="1"

Modified: trunk/OpenPGPminidriver/Tracing.c
===================================================================
--- trunk/OpenPGPminidriver/Tracing.c	2010-03-04 21:17:51 UTC (rev 6)
+++ trunk/OpenPGPminidriver/Tracing.c	2010-03-04 21:50:46 UTC (rev 7)
@@ -38,25 +38,27 @@
 
 REGHANDLE hPub = 0;
 
-void TracingRegister() {
+void TracingRegister() 
+{
 	EventRegister(&TracingGuid,NULL,NULL,&hPub);
 }
 
-void TracingUnRegister() {
+void TracingUnRegister() 
+{
 	EventUnregister(hPub);
 }
 
 
-void TraceEx(LPCSTR szFile, DWORD dwLine, LPCSTR szFunction, UCHAR dwLevel, PCWSTR szFormat,...) {
+void TraceEx(LPCSTR szFile, DWORD dwLine, LPCSTR szFunction, UCHAR dwLevel, PCWSTR szFormat,...) 
+{
+	WCHAR Buffer[256];
+	WCHAR Buffer2[356];
+	int ret;
+	va_list ap;
 #ifndef _DEBUG
 	UNREFERENCED_PARAMETER(dwLine);
 	UNREFERENCED_PARAMETER(szFile);
 #endif
-	WCHAR Buffer[256];
-	WCHAR Buffer2[356];
-	int ret;
-	va_list ap;
-
 	if (!hPub) TracingRegister();
 
 	va_start (ap, szFormat);

Modified: trunk/OpenPGPminidriverTest/OpenPGPminidriverTest.vcproj
===================================================================
--- trunk/OpenPGPminidriverTest/OpenPGPminidriverTest.vcproj	2010-03-04 21:17:51 UTC (rev 6)
+++ trunk/OpenPGPminidriverTest/OpenPGPminidriverTest.vcproj	2010-03-04 21:50:46 UTC (rev 7)
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			>
@@ -167,7 +167,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			WholeProgramOptimization="1"

Modified: trunk/OpenPGPminidriverTest/main.cpp
===================================================================
--- trunk/OpenPGPminidriverTest/main.cpp	2010-03-04 21:17:51 UTC (rev 6)
+++ trunk/OpenPGPminidriverTest/main.cpp	2010-03-04 21:50:46 UTC (rev 7)
@@ -64,7 +64,7 @@
 
 BOOL GetContainerName(PWSTR szContainer, PDWORD pdwKeySpec)
 {
-	DWORD iItem = SendMessage(GetDlgItem(hMainWnd, IDC_LSTCONTAINER),LB_GETCURSEL,0,0);
+	DWORD iItem = (DWORD)SendMessage(GetDlgItem(hMainWnd, IDC_LSTCONTAINER),LB_GETCURSEL,0,0);
 	if (iItem == LB_ERR) return FALSE;
 	SendMessage( GetDlgItem(hMainWnd,IDC_LSTCONTAINER), LB_GETTEXT,iItem,(LPARAM)szContainer);
 	*pdwKeySpec = _tstoi(szContainer + _tcslen(szContainer) - 1);
@@ -142,11 +142,11 @@
 				}
 				break;
 			case IDC_NEWKEY:
-				dwReturn = GenerateNewKey(SendDlgItemMessage(hMainWnd,IDC_CONTAINERINDEX, CB_GETCURSEL, 0, 0));
+				dwReturn = GenerateNewKey((DWORD)SendDlgItemMessage(hMainWnd,IDC_CONTAINERINDEX, CB_GETCURSEL, 0, 0));
 				MessageBoxWin32(dwReturn);
 				break;
 			case IDC_IMPORTKEY:
-				dwReturn = ImportKey(SendDlgItemMessage(hMainWnd,IDC_CONTAINERINDEX, CB_GETCURSEL, 0, 0));
+				dwReturn = ImportKey((DWORD)SendDlgItemMessage(hMainWnd,IDC_CONTAINERINDEX, CB_GETCURSEL, 0, 0));
 				MessageBoxWin32(dwReturn);
 				break;
 			case IDC_SAMEKEY: