This commit is contained in:
Juan Carlos Luciani
2007-04-02 22:16:07 +00:00
parent 2e19101343
commit 4da676ac00
26 changed files with 795 additions and 625 deletions

View File

@@ -45,8 +45,8 @@
Name="VCCLCompilerTool"
AdditionalOptions="/D "XML_STATIC" /D "_CRT_SECURE_NO_DEPRECATE""
Optimization="0"
AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;"\Program Files\Microsoft Platform SDK\include";"\Program Files\novell\casa\include";"..\..\..\..\..\Expat-2.0.0\Source\lib";..\..\..\..\CASA\include;"$(CASA)\include";"$(EXPAT)\source\lib""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;"\Program Files\Microsoft Platform SDK\include";"C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include";"\Program Files\novell\casa\include";"..\..\..\..\..\Expat-2.0.0\Source\lib";..\..\..\..\CASA\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_MSC_VER"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -69,10 +69,10 @@
Name="VCLinkerTool"
IgnoreImportLibrary="false"
AdditionalOptions="/EXPORT:ObtainAuthToken /EXPORT:ObtainAuthTokenEx"
AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib"
AdditionalDependencies="ws2_32.lib winhttp.lib libexpatmt.lib micasa.lib shlwapi.lib"
OutputFile="$(OutDir)/casa_authtoken.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""\Program Files\Microsoft Platform SDK\lib";"\Program Files\Novell\CASA\lib";"..\..\..\..\..\Expat-2.0.0\StaticLibs";..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release;"$(CASA)\lib";"$(CASA)\lib\Release";"$(CASA)\micasadk\Release";"$(EXPAT)\StaticLibs""
AdditionalLibraryDirectories=""\Program Files\Microsoft Platform SDK\lib";"C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib";"\Program Files\Novell\CASA\lib";"..\..\..\..\..\Expat-2.0.0\StaticLibs";..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release;"$(CASA)\lib";"$(CASA)\lib\Release";"$(CASA)\micasadk\Release";"$(EXPAT)\StaticLibs""
IgnoreAllDefaultLibraries="false"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="true"
@@ -107,6 +107,96 @@
CommandLine="mkdir \"Program Files"\novell\
mkdir \"Program Files"\novell\casa
mkdir \"Program Files"\novell\casa\lib\
copy $(OutDir)\casa_authtoken.dll \"Program Files"\novell\casa\lib\casa_authtoken.dll
copy $(SolutionDir)\lib\windows\casa_authtoken.lib \"Program Files"\novell\casa\lib\casa_authtoken.lib
"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;XML_STATIC&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;$(MS_SDK_DIR)\include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include;&quot;$(CASA)\include&quot;;&quot;$(EXPAT)\source\lib&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="false"
AdditionalOptions="/EXPORT:ObtainAuthToken /EXPORT:ObtainAuthTokenEx"
AdditionalDependencies="ws2_32.lib &quot;$(MS_SDK_DIR)\lib\amd64\winhttp.lib&quot; libexpatmt.lib micasa.lib shlwapi.lib"
OutputFile="$(OutDir)/casa_authtoken.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs\x64&quot;;..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release;&quot;$(CASA)\lib&quot;;&quot;$(CASA)\lib\Release&quot;;&quot;$(CASA)\micasadk\Release&quot;;&quot;$(EXPAT)\StaticLibs&quot;"
IgnoreAllDefaultLibraries="false"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="0"
ImportLibrary="$(SolutionDir)lib\windows/$(TargetName).lib"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="..\windows\$(ConfigurationName)"
@@ -133,8 +223,8 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;XML_STATIC&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;\Program Files\Microsoft Platform SDK\include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;\Program Files\Microsoft Platform SDK\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MSC_VER"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -153,7 +243,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/EXPORT:ObtainAuthToken /EXPORT:ObtainAuthTokenEx"
AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib"
AdditionalDependencies="ws2_32.lib winhttp.lib libexpatmt.lib micasa.lib shlwapi.lib"
OutputFile="$(OutDir)/casa_authtoken.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs&quot;;..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release"
@@ -191,96 +281,6 @@
CommandLine=""
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;XML_STATIC&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;\Program Files\Microsoft Platform SDK\include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include;&quot;$(CASA)\include&quot;;&quot;$(EXPAT)\source\lib&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="false"
AdditionalOptions="/EXPORT:ObtainAuthToken /EXPORT:ObtainAuthTokenEx"
AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib"
OutputFile="$(OutDir)/casa_authtoken.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs&quot;;..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release;&quot;$(CASA)\lib&quot;;&quot;$(CASA)\lib\Release&quot;;&quot;$(CASA)\micasadk\Release&quot;;&quot;$(EXPAT)\StaticLibs&quot;"
IgnoreAllDefaultLibraries="false"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="0"
ImportLibrary="$(SolutionDir)lib\windows/$(TargetName).lib"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="mkdir \&quot;Program Files&quot;\novell\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\lib\&#x0D;&#x0A;copy $(OutDir)\casa_authtoken.dll \&quot;Program Files&quot;\novell\casa\lib\casa_authtoken.dll&#x0D;&#x0A;copy $(SolutionDir)\lib\windows\casa_authtoken.lib \&quot;Program Files&quot;\novell\casa\lib\casa_authtoken.lib&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
@@ -308,8 +308,8 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;XML_STATIC&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;\Program Files\Microsoft Platform SDK\include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;$(MS_SDK_DIR)\include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -328,10 +328,10 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/EXPORT:ObtainAuthToken /EXPORT:ObtainAuthTokenEx"
AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib"
AdditionalDependencies="ws2_32.lib &quot;$(MS_SDK_DIR)\lib\amd64\winhttp.lib&quot; libexpatmt.lib micasa.lib shlwapi.lib"
OutputFile="$(OutDir)/casa_authtoken.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs&quot;;..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release"
AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs\x64&quot;;..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="true"
SubSystem="0"

View File

@@ -112,9 +112,9 @@ ObtainAuthTokenEx(
// Call our internal worker
retStatus = ObtainAuthTokenInt(pServiceName,
pHostName,
pCredStoreScope,
pAuthTokenBuf,
pAuthTokenBufLen,
pCredStoreScope);
pAuthTokenBufLen);
DbgTrace(1, "-ObtainAuthTokenEx- End, retStatus = %0X\n", retStatus);

View File

@@ -55,7 +55,7 @@
#define DbgTrace(LEVEL, X, Y) { \
char formatBuff[128]; \
char printBuff[256]; \
FILE *pDebugFile; \
FILE *pDebugFile; \
if (LEVEL == 0 || DebugLevel >= LEVEL) \
{ \
strcpy(formatBuff, "CASA_AuthToken "); \
@@ -63,7 +63,7 @@ FILE *pDebugFile; \
_snprintf(printBuff, sizeof(printBuff), formatBuff, Y); \
if (g_pDebugLogFilePath) \
{ \
pDebugFile = fopen(g_pDebugLogFilePath, "a+"); \
pDebugFile = fopen(g_pDebugLogFilePath, "a+"); \
if (pDebugFile) \
{ \
fwrite(printBuff, strlen(printBuff), 1, pDebugFile); \

View File

@@ -153,8 +153,8 @@ CopyWideToMultiAlloc(
//++=======================================================================
RpcSession*
OpenRpcSession(
IN char *pHostName,
IN uint16_t hostPort)
IN const char *pHostName,
IN const uint16_t hostPort)
//
// Arguments:
//
@@ -307,7 +307,7 @@ static
void CALLBACK
SecureFailureStatusCallback(
IN HINTERNET hRequest,
IN DWORD *pContext,
IN DWORD_PTR *pContext,
IN DWORD internetStatus,
IN LPVOID pStatusInformation,
IN DWORD statusInformationLength)