OSDN Git Service

Merge X64 Build
authorFrank Li <lznuaa@gmail.com>
Tue, 20 Jan 2009 04:54:59 +0000 (12:54 +0800)
committerFrank Li <lznuaa@gmail.com>
Tue, 20 Jan 2009 04:54:59 +0000 (12:54 +0800)
17 files changed:
ext/scintilla/vcbuild/SciLexer.vcproj
src/IBugTraqProvider/IBugTraqProvider.vcproj.FSL.B20596.user
src/IBugTraqProvider/IBugTraqProvider_h.h
src/IBugTraqProvider/IBugTraqProvider_i.c
src/IBugTraqProvider/IBugTraqProvider_p.c
src/TortoiseBlame/TortoiseBlame.vcproj.FSL.B20596.user
src/TortoiseGit.sln
src/TortoiseGitBlame/TortoiseGitBlame.vcproj
src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
src/TortoiseGitSetup/CustomActions/CustomActions.vcproj.FSL.B20596.user
src/TortoiseGitSetup/Includes.wxi
src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj.FSL.B20596.user
src/TortoiseProc/TortoiseProc.vcproj
src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
src/TortoiseShell/TortoiseShell.vcproj
src/Utils/Utils.vcproj
src/crashrpt/CrashRpt.vcproj.FSL.B20596.user

index c1824e0..5dfa715 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\..\obj\SciLexer\$(ConfigurationName)\"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\..\bin\debug64\bin"\r
+                       IntermediateDirectory="..\..\..\obj\SciLexer\debug64\"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
-                               TargetEnvironment="1"\r
+                               TargetEnvironment="3"\r
                                TypeLibraryName=".\../bin/SciLexer.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="1"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\include,..\src"\r
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="0"\r
-                               EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\Release/SciLexer.pch"\r
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\Debug/SciLexer.pch"\r
+                               BrowseInformation="1"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1033"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="imm32.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName).dll"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               GenerateMapFile="true"\r
-                               MapFileName=".\Release/SciLexer.map"\r
-                               OptimizeForWindows98="1"\r
+                               GenerateDebugInformation="true"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\..\obj\SciLexer\$(ConfigurationName)\"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
-                               TargetEnvironment="3"\r
+                               TargetEnvironment="1"\r
                                TypeLibraryName=".\../bin/SciLexer.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="1"\r
+                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\include,..\src"\r
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               PrecompiledHeaderFile=".\Debug/SciLexer.pch"\r
-                               BrowseInformation="1"\r
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
+                               PrecompiledHeaderFile=".\Release/SciLexer.pch"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="imm32.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName).dll"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateMapFile="true"\r
+                               MapFileName=".\Release/SciLexer.map"\r
+                               OptimizeForWindows98="1"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\..\bin\release64\bin"\r
+                       IntermediateDirectory="..\..\..\obj\SciLexer\release64\"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCResourceCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCResourceCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
+                       RelativePath="ReadMe.txt"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath="ReadMe.txt"\r
+                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
                        >\r
                </File>\r
        </Files>\r
index e077687..f1fabbf 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
+                       Name="Debug|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command=""\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
                        Name="Release|Win32"\r
                        >\r
                        <DebugSettings\r
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command=""\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index 99b63ee..10e18e4 100644 (file)
@@ -4,10 +4,10 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0500 */\r
-/* at Fri Jan 09 16:36:36 2009\r
+/* at Mon Jan 19 17:49:26 2009\r
  */\r
 /* Compiler settings for .\IBugTraqProvider.idl:\r
-    Oicf, W4, Zp8, env=Win32 (32b run)\r
+    Oicf, W1, Zp8, env=Win64 (32b run)\r
     protocol : dce , ms_ext, c_ext, robust\r
     error checks: allocation ref bounds_check enum stub_data \r
     VC __declspec() decoration level: \r
index a7511ee..ac03235 100644 (file)
@@ -6,10 +6,10 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0500 */\r
-/* at Fri Jan 09 16:36:36 2009\r
+/* at Mon Jan 19 17:49:26 2009\r
  */\r
 /* Compiler settings for .\IBugTraqProvider.idl:\r
-    Oicf, W4, Zp8, env=Win32 (32b run)\r
+    Oicf, W1, Zp8, env=Win64 (32b run)\r
     protocol : dce , ms_ext, c_ext, robust\r
     error checks: allocation ref bounds_check enum stub_data \r
     VC __declspec() decoration level: \r
index 5ce4a8c..7a6d743 100644 (file)
@@ -4,10 +4,10 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0500 */\r
-/* at Fri Jan 09 16:36:36 2009\r
+/* at Mon Jan 19 17:49:26 2009\r
  */\r
 /* Compiler settings for .\IBugTraqProvider.idl:\r
-    Oicf, W4, Zp8, env=Win32 (32b run)\r
+    Oicf, W1, Zp8, env=Win64 (32b run)\r
     protocol : dce , ms_ext, c_ext, robust\r
     error checks: allocation ref bounds_check enum stub_data \r
     VC __declspec() decoration level: \r
@@ -16,7 +16,7 @@
 */\r
 //@@MIDL_FILE_HEADING(  )\r
 \r
-#if !defined(_M_IA64) && !defined(_M_AMD64)\r
+#if defined(_M_AMD64)\r
 \r
 \r
 #pragma warning( disable: 4049 )  /* more than 64k source lines */\r
@@ -28,9 +28,6 @@
 #pragma warning( disable: 4232 )  /* dllimport identity*/\r
 #pragma warning( disable: 4024 )  /* array to pointer mapping*/\r
 #pragma warning( disable: 4152 )  /* function/data pointer conversion in expression */\r
-#pragma warning( disable: 4100 ) /* unreferenced arguments in x86 call */\r
-\r
-#pragma optimize("", off ) \r
 \r
 #define USE_STUBLESS_PROXY\r
 \r
@@ -49,8 +46,8 @@
 \r
 #include "IBugTraqProvider_h.h"\r
 \r
-#define TYPE_FORMAT_STRING_SIZE   1113                              \r
-#define PROC_FORMAT_STRING_SIZE   385                               \r
+#define TYPE_FORMAT_STRING_SIZE   1063                              \r
+#define PROC_FORMAT_STRING_SIZE   399                               \r
 #define EXPR_FORMAT_STRING_SIZE   1                                 \r
 #define TRANSMIT_AS_TABLE_SIZE    0            \r
 #define WIRE_MARSHAL_TABLE_SIZE   3            \r
@@ -99,18 +96,10 @@ extern const MIDL_STUBLESS_PROXY_INFO IBugTraqProvider2_ProxyInfo;
 \r
 extern const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[ WIRE_MARSHAL_TABLE_SIZE ];\r
 \r
-#if !defined(__RPC_WIN32__)\r
+#if !defined(__RPC_WIN64__)\r
 #error  Invalid build platform for this stub.\r
 #endif\r
 \r
-#if !(TARGET_IS_NT50_OR_LATER)\r
-#error You need a Windows 2000 or later to run this stub because it uses these features:\r
-#error   /robust command line switch.\r
-#error However, your C/C++ compilation flags indicate you intend to run this app on earlier systems.\r
-#error This app will fail with the RPC_X_WRONG_STUB_VERSION error.\r
-#endif\r
-\r
-\r
 static const IBugTraqProvider_MIDL_PROC_FORMAT_STRING IBugTraqProvider__MIDL_ProcFormatString =\r
     {\r
         0,\r
@@ -122,343 +111,350 @@ static const IBugTraqProvider_MIDL_PROC_FORMAT_STRING IBugTraqProvider__MIDL_Pro
                        0x6c,           /* Old Flags:  object, Oi2 */\r
 /*  2 */       NdrFcLong( 0x0 ),       /* 0 */\r
 /*  6 */       NdrFcShort( 0x3 ),      /* 3 */\r
-/*  8 */       NdrFcShort( 0x14 ),     /* x86 Stack size/offset = 20 */\r
+/*  8 */       NdrFcShort( 0x28 ),     /* X64 Stack size/offset = 40 */\r
 /* 10 */       NdrFcShort( 0x0 ),      /* 0 */\r
 /* 12 */       NdrFcShort( 0x22 ),     /* 34 */\r
 /* 14 */       0x46,           /* Oi2 Flags:  clt must size, has return, has ext, */\r
                        0x4,            /* 4 */\r
-/* 16 */       0x8,            /* 8 */\r
+/* 16 */       0xa,            /* 10 */\r
                        0x5,            /* Ext Flags:  new corr desc, srv corr check, */\r
 /* 18 */       NdrFcShort( 0x0 ),      /* 0 */\r
 /* 20 */       NdrFcShort( 0x2 ),      /* 2 */\r
 /* 22 */       NdrFcShort( 0x0 ),      /* 0 */\r
+/* 24 */       NdrFcShort( 0x0 ),      /* 0 */\r
 \r
        /* Parameter hParentWnd */\r
 \r
-/* 24 */       NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 26 */       NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 28 */       NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
+/* 26 */       NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 28 */       NdrFcShort( 0x8 ),      /* X64 Stack size/offset = 8 */\r
+/* 30 */       NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
 \r
        /* Parameter parameters */\r
 \r
-/* 30 */       NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 32 */       NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 34 */       NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 32 */       NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 34 */       NdrFcShort( 0x10 ),     /* X64 Stack size/offset = 16 */\r
+/* 36 */       NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter valid */\r
 \r
-/* 36 */       NdrFcShort( 0x2150 ),   /* Flags:  out, base type, simple ref, srv alloc size=8 */\r
-/* 38 */       NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 40 */       0x6,            /* FC_SHORT */\r
+/* 38 */       NdrFcShort( 0x2150 ),   /* Flags:  out, base type, simple ref, srv alloc size=8 */\r
+/* 40 */       NdrFcShort( 0x18 ),     /* X64 Stack size/offset = 24 */\r
+/* 42 */       0x6,            /* FC_SHORT */\r
                        0x0,            /* 0 */\r
 \r
        /* Return value */\r
 \r
-/* 42 */       NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 44 */       NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 46 */       0x8,            /* FC_LONG */\r
+/* 44 */       NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
+/* 46 */       NdrFcShort( 0x20 ),     /* X64 Stack size/offset = 32 */\r
+/* 48 */       0x8,            /* FC_LONG */\r
                        0x0,            /* 0 */\r
 \r
        /* Procedure GetLinkText */\r
 \r
-/* 48 */       0x33,           /* FC_AUTO_HANDLE */\r
+/* 50 */       0x33,           /* FC_AUTO_HANDLE */\r
                        0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 50 */       NdrFcLong( 0x0 ),       /* 0 */\r
-/* 54 */       NdrFcShort( 0x4 ),      /* 4 */\r
-/* 56 */       NdrFcShort( 0x14 ),     /* x86 Stack size/offset = 20 */\r
-/* 58 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 60 */       NdrFcShort( 0x8 ),      /* 8 */\r
-/* 62 */       0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
+/* 52 */       NdrFcLong( 0x0 ),       /* 0 */\r
+/* 56 */       NdrFcShort( 0x4 ),      /* 4 */\r
+/* 58 */       NdrFcShort( 0x28 ),     /* X64 Stack size/offset = 40 */\r
+/* 60 */       NdrFcShort( 0x0 ),      /* 0 */\r
+/* 62 */       NdrFcShort( 0x8 ),      /* 8 */\r
+/* 64 */       0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
                        0x4,            /* 4 */\r
-/* 64 */       0x8,            /* 8 */\r
+/* 66 */       0xa,            /* 10 */\r
                        0x7,            /* Ext Flags:  new corr desc, clt corr check, srv corr check, */\r
-/* 66 */       NdrFcShort( 0x1 ),      /* 1 */\r
-/* 68 */       NdrFcShort( 0x4 ),      /* 4 */\r
-/* 70 */       NdrFcShort( 0x0 ),      /* 0 */\r
+/* 68 */       NdrFcShort( 0x1 ),      /* 1 */\r
+/* 70 */       NdrFcShort( 0x4 ),      /* 4 */\r
+/* 72 */       NdrFcShort( 0x0 ),      /* 0 */\r
+/* 74 */       NdrFcShort( 0x0 ),      /* 0 */\r
 \r
        /* Parameter hParentWnd */\r
 \r
-/* 72 */       NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 74 */       NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 76 */       NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
+/* 76 */       NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 78 */       NdrFcShort( 0x8 ),      /* X64 Stack size/offset = 8 */\r
+/* 80 */       NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
 \r
        /* Parameter parameters */\r
 \r
-/* 78 */       NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 80 */       NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 82 */       NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 82 */       NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 84 */       NdrFcShort( 0x10 ),     /* X64 Stack size/offset = 16 */\r
+/* 86 */       NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter linkText */\r
 \r
-/* 84 */       NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
-/* 86 */       NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 88 */       NdrFcShort( 0x54 ),     /* Type Offset=84 */\r
+/* 88 */       NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
+/* 90 */       NdrFcShort( 0x18 ),     /* X64 Stack size/offset = 24 */\r
+/* 92 */       NdrFcShort( 0x54 ),     /* Type Offset=84 */\r
 \r
        /* Return value */\r
 \r
-/* 90 */       NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 92 */       NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 94 */       0x8,            /* FC_LONG */\r
+/* 94 */       NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
+/* 96 */       NdrFcShort( 0x20 ),     /* X64 Stack size/offset = 32 */\r
+/* 98 */       0x8,            /* FC_LONG */\r
                        0x0,            /* 0 */\r
 \r
        /* Procedure GetCommitMessage */\r
 \r
-/* 96 */       0x33,           /* FC_AUTO_HANDLE */\r
+/* 100 */      0x33,           /* FC_AUTO_HANDLE */\r
                        0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 98 */       NdrFcLong( 0x0 ),       /* 0 */\r
-/* 102 */      NdrFcShort( 0x5 ),      /* 5 */\r
-/* 104 */      NdrFcShort( 0x20 ),     /* x86 Stack size/offset = 32 */\r
-/* 106 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 108 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 110 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
+/* 102 */      NdrFcLong( 0x0 ),       /* 0 */\r
+/* 106 */      NdrFcShort( 0x5 ),      /* 5 */\r
+/* 108 */      NdrFcShort( 0x40 ),     /* X64 Stack size/offset = 64 */\r
+/* 110 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 112 */      NdrFcShort( 0x8 ),      /* 8 */\r
+/* 114 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
                        0x7,            /* 7 */\r
-/* 112 */      0x8,            /* 8 */\r
+/* 116 */      0xa,            /* 10 */\r
                        0x7,            /* Ext Flags:  new corr desc, clt corr check, srv corr check, */\r
-/* 114 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 116 */      NdrFcShort( 0x2b ),     /* 43 */\r
-/* 118 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 118 */      NdrFcShort( 0x1 ),      /* 1 */\r
+/* 120 */      NdrFcShort( 0x2b ),     /* 43 */\r
+/* 122 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 124 */      NdrFcShort( 0x0 ),      /* 0 */\r
 \r
        /* Parameter hParentWnd */\r
 \r
-/* 120 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 122 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 124 */      NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
+/* 126 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 128 */      NdrFcShort( 0x8 ),      /* X64 Stack size/offset = 8 */\r
+/* 130 */      NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
 \r
        /* Parameter parameters */\r
 \r
-/* 126 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 128 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 130 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 132 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 134 */      NdrFcShort( 0x10 ),     /* X64 Stack size/offset = 16 */\r
+/* 136 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter commonRoot */\r
 \r
-/* 132 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 134 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 136 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 138 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 140 */      NdrFcShort( 0x18 ),     /* X64 Stack size/offset = 24 */\r
+/* 142 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter pathList */\r
 \r
-/* 138 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 140 */      NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 142 */      NdrFcShort( 0x44e ),    /* Type Offset=1102 */\r
+/* 144 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 146 */      NdrFcShort( 0x20 ),     /* X64 Stack size/offset = 32 */\r
+/* 148 */      NdrFcShort( 0x41c ),    /* Type Offset=1052 */\r
 \r
        /* Parameter originalMessage */\r
 \r
-/* 144 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 146 */      NdrFcShort( 0x14 ),     /* x86 Stack size/offset = 20 */\r
-/* 148 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 150 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 152 */      NdrFcShort( 0x28 ),     /* X64 Stack size/offset = 40 */\r
+/* 154 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter newMessage */\r
 \r
-/* 150 */      NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
-/* 152 */      NdrFcShort( 0x18 ),     /* x86 Stack size/offset = 24 */\r
-/* 154 */      NdrFcShort( 0x54 ),     /* Type Offset=84 */\r
+/* 156 */      NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
+/* 158 */      NdrFcShort( 0x30 ),     /* X64 Stack size/offset = 48 */\r
+/* 160 */      NdrFcShort( 0x54 ),     /* Type Offset=84 */\r
 \r
        /* Return value */\r
 \r
-/* 156 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 158 */      NdrFcShort( 0x1c ),     /* x86 Stack size/offset = 28 */\r
-/* 160 */      0x8,            /* FC_LONG */\r
+/* 162 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
+/* 164 */      NdrFcShort( 0x38 ),     /* X64 Stack size/offset = 56 */\r
+/* 166 */      0x8,            /* FC_LONG */\r
                        0x0,            /* 0 */\r
 \r
        /* Procedure GetCommitMessage2 */\r
 \r
-/* 162 */      0x33,           /* FC_AUTO_HANDLE */\r
+/* 168 */      0x33,           /* FC_AUTO_HANDLE */\r
                        0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 164 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 168 */      NdrFcShort( 0x6 ),      /* 6 */\r
-/* 170 */      NdrFcShort( 0x24 ),     /* x86 Stack size/offset = 36 */\r
-/* 172 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 174 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 176 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
+/* 170 */      NdrFcLong( 0x0 ),       /* 0 */\r
+/* 174 */      NdrFcShort( 0x6 ),      /* 6 */\r
+/* 176 */      NdrFcShort( 0x48 ),     /* X64 Stack size/offset = 72 */\r
+/* 178 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 180 */      NdrFcShort( 0x8 ),      /* 8 */\r
+/* 182 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
                        0x8,            /* 8 */\r
-/* 178 */      0x8,            /* 8 */\r
+/* 184 */      0xa,            /* 10 */\r
                        0x7,            /* Ext Flags:  new corr desc, clt corr check, srv corr check, */\r
-/* 180 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 182 */      NdrFcShort( 0xb3 ),     /* 179 */\r
-/* 184 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 186 */      NdrFcShort( 0x1 ),      /* 1 */\r
+/* 188 */      NdrFcShort( 0xb3 ),     /* 179 */\r
+/* 190 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 192 */      NdrFcShort( 0x0 ),      /* 0 */\r
 \r
        /* Parameter hParentWnd */\r
 \r
-/* 186 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 188 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 190 */      NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
+/* 194 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 196 */      NdrFcShort( 0x8 ),      /* X64 Stack size/offset = 8 */\r
+/* 198 */      NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
 \r
        /* Parameter parameters */\r
 \r
-/* 192 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 194 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 196 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 200 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 202 */      NdrFcShort( 0x10 ),     /* X64 Stack size/offset = 16 */\r
+/* 204 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter commonURL */\r
 \r
-/* 198 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 200 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 202 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 206 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 208 */      NdrFcShort( 0x18 ),     /* X64 Stack size/offset = 24 */\r
+/* 210 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter commonRoot */\r
 \r
-/* 204 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 206 */      NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 208 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 212 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 214 */      NdrFcShort( 0x20 ),     /* X64 Stack size/offset = 32 */\r
+/* 216 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter pathList */\r
 \r
-/* 210 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 212 */      NdrFcShort( 0x14 ),     /* x86 Stack size/offset = 20 */\r
-/* 214 */      NdrFcShort( 0x44e ),    /* Type Offset=1102 */\r
+/* 218 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 220 */      NdrFcShort( 0x28 ),     /* X64 Stack size/offset = 40 */\r
+/* 222 */      NdrFcShort( 0x41c ),    /* Type Offset=1052 */\r
 \r
        /* Parameter originalMessage */\r
 \r
-/* 216 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 218 */      NdrFcShort( 0x18 ),     /* x86 Stack size/offset = 24 */\r
-/* 220 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 224 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 226 */      NdrFcShort( 0x30 ),     /* X64 Stack size/offset = 48 */\r
+/* 228 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter newMessage */\r
 \r
-/* 222 */      NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
-/* 224 */      NdrFcShort( 0x1c ),     /* x86 Stack size/offset = 28 */\r
-/* 226 */      NdrFcShort( 0x54 ),     /* Type Offset=84 */\r
+/* 230 */      NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
+/* 232 */      NdrFcShort( 0x38 ),     /* X64 Stack size/offset = 56 */\r
+/* 234 */      NdrFcShort( 0x54 ),     /* Type Offset=84 */\r
 \r
        /* Return value */\r
 \r
-/* 228 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 230 */      NdrFcShort( 0x20 ),     /* x86 Stack size/offset = 32 */\r
-/* 232 */      0x8,            /* FC_LONG */\r
+/* 236 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
+/* 238 */      NdrFcShort( 0x40 ),     /* X64 Stack size/offset = 64 */\r
+/* 240 */      0x8,            /* FC_LONG */\r
                        0x0,            /* 0 */\r
 \r
        /* Procedure OnCommitFinished */\r
 \r
-/* 234 */      0x33,           /* FC_AUTO_HANDLE */\r
+/* 242 */      0x33,           /* FC_AUTO_HANDLE */\r
                        0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 236 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 240 */      NdrFcShort( 0x7 ),      /* 7 */\r
-/* 242 */      NdrFcShort( 0x20 ),     /* x86 Stack size/offset = 32 */\r
-/* 244 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 246 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 248 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
+/* 244 */      NdrFcLong( 0x0 ),       /* 0 */\r
+/* 248 */      NdrFcShort( 0x7 ),      /* 7 */\r
+/* 250 */      NdrFcShort( 0x40 ),     /* X64 Stack size/offset = 64 */\r
+/* 252 */      NdrFcShort( 0x8 ),      /* 8 */\r
+/* 254 */      NdrFcShort( 0x8 ),      /* 8 */\r
+/* 256 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
                        0x7,            /* 7 */\r
-/* 250 */      0x8,            /* 8 */\r
+/* 258 */      0xa,            /* 10 */\r
                        0x7,            /* Ext Flags:  new corr desc, clt corr check, srv corr check, */\r
-/* 252 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 254 */      NdrFcShort( 0xa1 ),     /* 161 */\r
-/* 256 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 260 */      NdrFcShort( 0x1 ),      /* 1 */\r
+/* 262 */      NdrFcShort( 0xa1 ),     /* 161 */\r
+/* 264 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 266 */      NdrFcShort( 0x0 ),      /* 0 */\r
 \r
        /* Parameter hParentWnd */\r
 \r
-/* 258 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 260 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 262 */      NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
+/* 268 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 270 */      NdrFcShort( 0x8 ),      /* X64 Stack size/offset = 8 */\r
+/* 272 */      NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
 \r
        /* Parameter commonRoot */\r
 \r
-/* 264 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 266 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 268 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 274 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 276 */      NdrFcShort( 0x10 ),     /* X64 Stack size/offset = 16 */\r
+/* 278 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter pathList */\r
 \r
-/* 270 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 272 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 274 */      NdrFcShort( 0x44e ),    /* Type Offset=1102 */\r
+/* 280 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 282 */      NdrFcShort( 0x18 ),     /* X64 Stack size/offset = 24 */\r
+/* 284 */      NdrFcShort( 0x41c ),    /* Type Offset=1052 */\r
 \r
        /* Parameter logMessage */\r
 \r
-/* 276 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 278 */      NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 280 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 286 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 288 */      NdrFcShort( 0x20 ),     /* X64 Stack size/offset = 32 */\r
+/* 290 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter revision */\r
 \r
-/* 282 */      NdrFcShort( 0x48 ),     /* Flags:  in, base type, */\r
-/* 284 */      NdrFcShort( 0x14 ),     /* x86 Stack size/offset = 20 */\r
-/* 286 */      0x8,            /* FC_LONG */\r
+/* 292 */      NdrFcShort( 0x48 ),     /* Flags:  in, base type, */\r
+/* 294 */      NdrFcShort( 0x28 ),     /* X64 Stack size/offset = 40 */\r
+/* 296 */      0x8,            /* FC_LONG */\r
                        0x0,            /* 0 */\r
 \r
        /* Parameter error */\r
 \r
-/* 288 */      NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
-/* 290 */      NdrFcShort( 0x18 ),     /* x86 Stack size/offset = 24 */\r
-/* 292 */      NdrFcShort( 0x54 ),     /* Type Offset=84 */\r
+/* 298 */      NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
+/* 300 */      NdrFcShort( 0x30 ),     /* X64 Stack size/offset = 48 */\r
+/* 302 */      NdrFcShort( 0x54 ),     /* Type Offset=84 */\r
 \r
        /* Return value */\r
 \r
-/* 294 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 296 */      NdrFcShort( 0x1c ),     /* x86 Stack size/offset = 28 */\r
-/* 298 */      0x8,            /* FC_LONG */\r
+/* 304 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
+/* 306 */      NdrFcShort( 0x38 ),     /* X64 Stack size/offset = 56 */\r
+/* 308 */      0x8,            /* FC_LONG */\r
                        0x0,            /* 0 */\r
 \r
        /* Procedure HasOptions */\r
 \r
-/* 300 */      0x33,           /* FC_AUTO_HANDLE */\r
+/* 310 */      0x33,           /* FC_AUTO_HANDLE */\r
                        0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 302 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 306 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 308 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 310 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 312 */      NdrFcShort( 0x22 ),     /* 34 */\r
-/* 314 */      0x44,           /* Oi2 Flags:  has return, has ext, */\r
+/* 312 */      NdrFcLong( 0x0 ),       /* 0 */\r
+/* 316 */      NdrFcShort( 0x8 ),      /* 8 */\r
+/* 318 */      NdrFcShort( 0x18 ),     /* X64 Stack size/offset = 24 */\r
+/* 320 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 322 */      NdrFcShort( 0x22 ),     /* 34 */\r
+/* 324 */      0x44,           /* Oi2 Flags:  has return, has ext, */\r
                        0x2,            /* 2 */\r
-/* 316 */      0x8,            /* 8 */\r
+/* 326 */      0xa,            /* 10 */\r
                        0x1,            /* Ext Flags:  new corr desc, */\r
-/* 318 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 320 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 322 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 328 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 330 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 332 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 334 */      NdrFcShort( 0x0 ),      /* 0 */\r
 \r
        /* Parameter ret */\r
 \r
-/* 324 */      NdrFcShort( 0x2150 ),   /* Flags:  out, base type, simple ref, srv alloc size=8 */\r
-/* 326 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 328 */      0x6,            /* FC_SHORT */\r
+/* 336 */      NdrFcShort( 0x2150 ),   /* Flags:  out, base type, simple ref, srv alloc size=8 */\r
+/* 338 */      NdrFcShort( 0x8 ),      /* X64 Stack size/offset = 8 */\r
+/* 340 */      0x6,            /* FC_SHORT */\r
                        0x0,            /* 0 */\r
 \r
        /* Return value */\r
 \r
-/* 330 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 332 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 334 */      0x8,            /* FC_LONG */\r
+/* 342 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
+/* 344 */      NdrFcShort( 0x10 ),     /* X64 Stack size/offset = 16 */\r
+/* 346 */      0x8,            /* FC_LONG */\r
                        0x0,            /* 0 */\r
 \r
        /* Procedure ShowOptionsDialog */\r
 \r
-/* 336 */      0x33,           /* FC_AUTO_HANDLE */\r
+/* 348 */      0x33,           /* FC_AUTO_HANDLE */\r
                        0x6c,           /* Old Flags:  object, Oi2 */\r
-/* 338 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 342 */      NdrFcShort( 0x9 ),      /* 9 */\r
-/* 344 */      NdrFcShort( 0x14 ),     /* x86 Stack size/offset = 20 */\r
-/* 346 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 348 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 350 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
+/* 350 */      NdrFcLong( 0x0 ),       /* 0 */\r
+/* 354 */      NdrFcShort( 0x9 ),      /* 9 */\r
+/* 356 */      NdrFcShort( 0x28 ),     /* X64 Stack size/offset = 40 */\r
+/* 358 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 360 */      NdrFcShort( 0x8 ),      /* 8 */\r
+/* 362 */      0x47,           /* Oi2 Flags:  srv must size, clt must size, has return, has ext, */\r
                        0x4,            /* 4 */\r
-/* 352 */      0x8,            /* 8 */\r
+/* 364 */      0xa,            /* 10 */\r
                        0x7,            /* Ext Flags:  new corr desc, clt corr check, srv corr check, */\r
-/* 354 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 356 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 358 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 366 */      NdrFcShort( 0x1 ),      /* 1 */\r
+/* 368 */      NdrFcShort( 0x1 ),      /* 1 */\r
+/* 370 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 372 */      NdrFcShort( 0x0 ),      /* 0 */\r
 \r
        /* Parameter hParentWnd */\r
 \r
-/* 360 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 362 */      NdrFcShort( 0x4 ),      /* x86 Stack size/offset = 4 */\r
-/* 364 */      NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
+/* 374 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 376 */      NdrFcShort( 0x8 ),      /* X64 Stack size/offset = 8 */\r
+/* 378 */      NdrFcShort( 0x1a ),     /* Type Offset=26 */\r
 \r
        /* Parameter parameters */\r
 \r
-/* 366 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
-/* 368 */      NdrFcShort( 0x8 ),      /* x86 Stack size/offset = 8 */\r
-/* 370 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
+/* 380 */      NdrFcShort( 0x8b ),     /* Flags:  must size, must free, in, by val, */\r
+/* 382 */      NdrFcShort( 0x10 ),     /* X64 Stack size/offset = 16 */\r
+/* 384 */      NdrFcShort( 0x3e ),     /* Type Offset=62 */\r
 \r
        /* Parameter newparameters */\r
 \r
-/* 372 */      NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
-/* 374 */      NdrFcShort( 0xc ),      /* x86 Stack size/offset = 12 */\r
-/* 376 */      NdrFcShort( 0x54 ),     /* Type Offset=84 */\r
+/* 386 */      NdrFcShort( 0x2113 ),   /* Flags:  must size, must free, out, simple ref, srv alloc size=8 */\r
+/* 388 */      NdrFcShort( 0x18 ),     /* X64 Stack size/offset = 24 */\r
+/* 390 */      NdrFcShort( 0x54 ),     /* Type Offset=84 */\r
 \r
        /* Return value */\r
 \r
-/* 378 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
-/* 380 */      NdrFcShort( 0x10 ),     /* x86 Stack size/offset = 16 */\r
-/* 382 */      0x8,            /* FC_LONG */\r
+/* 392 */      NdrFcShort( 0x70 ),     /* Flags:  out, return, base type, */\r
+/* 394 */      NdrFcShort( 0x20 ),     /* X64 Stack size/offset = 32 */\r
+/* 396 */      0x8,            /* FC_LONG */\r
                        0x0,            /* 0 */\r
 \r
                        0x0\r
@@ -486,7 +482,7 @@ static const IBugTraqProvider_MIDL_TYPE_FORMAT_STRING IBugTraqProvider__MIDL_Typ
 /* 26 */       0xb4,           /* FC_USER_MARSHAL */\r
                        0x83,           /* 131 */\r
 /* 28 */       NdrFcShort( 0x0 ),      /* 0 */\r
-/* 30 */       NdrFcShort( 0x4 ),      /* 4 */\r
+/* 30 */       NdrFcShort( 0x8 ),      /* 8 */\r
 /* 32 */       NdrFcShort( 0x0 ),      /* 0 */\r
 /* 34 */       NdrFcShort( 0xffe0 ),   /* Offset= -32 (2) */\r
 /* 36 */       \r
@@ -514,7 +510,7 @@ static const IBugTraqProvider_MIDL_TYPE_FORMAT_STRING IBugTraqProvider__MIDL_Typ
 /* 62 */       0xb4,           /* FC_USER_MARSHAL */\r
                        0x83,           /* 131 */\r
 /* 64 */       NdrFcShort( 0x1 ),      /* 1 */\r
-/* 66 */       NdrFcShort( 0x4 ),      /* 4 */\r
+/* 66 */       NdrFcShort( 0x8 ),      /* 8 */\r
 /* 68 */       NdrFcShort( 0x0 ),      /* 0 */\r
 /* 70 */       NdrFcShort( 0xffde ),   /* Offset= -34 (36) */\r
 /* 72 */       \r
@@ -530,7 +526,7 @@ static const IBugTraqProvider_MIDL_TYPE_FORMAT_STRING IBugTraqProvider__MIDL_Typ
 /* 84 */       0xb4,           /* FC_USER_MARSHAL */\r
                        0x83,           /* 131 */\r
 /* 86 */       NdrFcShort( 0x1 ),      /* 1 */\r
-/* 88 */       NdrFcShort( 0x4 ),      /* 4 */\r
+/* 88 */       NdrFcShort( 0x8 ),      /* 8 */\r
 /* 90 */       NdrFcShort( 0x0 ),      /* 0 */\r
 /* 92 */       NdrFcShort( 0xfff4 ),   /* Offset= -12 (80) */\r
 /* 94 */       \r
@@ -538,684 +534,613 @@ static const IBugTraqProvider_MIDL_TYPE_FORMAT_STRING IBugTraqProvider__MIDL_Typ
 /* 96 */       NdrFcShort( 0x2 ),      /* Offset= 2 (98) */\r
 /* 98 */       \r
                        0x12, 0x0,      /* FC_UP */\r
-/* 100 */      NdrFcShort( 0x3d8 ),    /* Offset= 984 (1084) */\r
+/* 100 */      NdrFcShort( 0x3a6 ),    /* Offset= 934 (1034) */\r
 /* 102 */      \r
                        0x2a,           /* FC_ENCAPSULATED_UNION */\r
-                       0x49,           /* 73 */\r
-/* 104 */      NdrFcShort( 0x18 ),     /* 24 */\r
+                       0x89,           /* 137 */\r
+/* 104 */      NdrFcShort( 0x20 ),     /* 32 */\r
 /* 106 */      NdrFcShort( 0xa ),      /* 10 */\r
 /* 108 */      NdrFcLong( 0x8 ),       /* 8 */\r
-/* 112 */      NdrFcShort( 0x5a ),     /* Offset= 90 (202) */\r
+/* 112 */      NdrFcShort( 0x50 ),     /* Offset= 80 (192) */\r
 /* 114 */      NdrFcLong( 0xd ),       /* 13 */\r
-/* 118 */      NdrFcShort( 0x90 ),     /* Offset= 144 (262) */\r
+/* 118 */      NdrFcShort( 0x82 ),     /* Offset= 130 (248) */\r
 /* 120 */      NdrFcLong( 0x9 ),       /* 9 */\r
-/* 124 */      NdrFcShort( 0xc2 ),     /* Offset= 194 (318) */\r
+/* 124 */      NdrFcShort( 0xb4 ),     /* Offset= 180 (304) */\r
 /* 126 */      NdrFcLong( 0xc ),       /* 12 */\r
-/* 130 */      NdrFcShort( 0x2bc ),    /* Offset= 700 (830) */\r
+/* 130 */      NdrFcShort( 0x2a4 ),    /* Offset= 676 (806) */\r
 /* 132 */      NdrFcLong( 0x24 ),      /* 36 */\r
-/* 136 */      NdrFcShort( 0x2e6 ),    /* Offset= 742 (878) */\r
+/* 136 */      NdrFcShort( 0x2c4 ),    /* Offset= 708 (844) */\r
 /* 138 */      NdrFcLong( 0x800d ),    /* 32781 */\r
-/* 142 */      NdrFcShort( 0x302 ),    /* Offset= 770 (912) */\r
+/* 142 */      NdrFcShort( 0x2e0 ),    /* Offset= 736 (878) */\r
 /* 144 */      NdrFcLong( 0x10 ),      /* 16 */\r
-/* 148 */      NdrFcShort( 0x31c ),    /* Offset= 796 (944) */\r
+/* 148 */      NdrFcShort( 0x2fa ),    /* Offset= 762 (910) */\r
 /* 150 */      NdrFcLong( 0x2 ),       /* 2 */\r
-/* 154 */      NdrFcShort( 0x336 ),    /* Offset= 822 (976) */\r
+/* 154 */      NdrFcShort( 0x310 ),    /* Offset= 784 (938) */\r
 /* 156 */      NdrFcLong( 0x3 ),       /* 3 */\r
-/* 160 */      NdrFcShort( 0x350 ),    /* Offset= 848 (1008) */\r
+/* 160 */      NdrFcShort( 0x326 ),    /* Offset= 806 (966) */\r
 /* 162 */      NdrFcLong( 0x14 ),      /* 20 */\r
-/* 166 */      NdrFcShort( 0x36a ),    /* Offset= 874 (1040) */\r
+/* 166 */      NdrFcShort( 0x33c ),    /* Offset= 828 (994) */\r
 /* 168 */      NdrFcShort( 0xffff ),   /* Offset= -1 (167) */\r
 /* 170 */      \r
-                       0x1b,           /* FC_CARRAY */\r
+                       0x21,           /* FC_BOGUS_ARRAY */\r
                        0x3,            /* 3 */\r
-/* 172 */      NdrFcShort( 0x4 ),      /* 4 */\r
+/* 172 */      NdrFcShort( 0x0 ),      /* 0 */\r
 /* 174 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
                        0x0,            /*  */\r
 /* 176 */      NdrFcShort( 0x0 ),      /* 0 */\r
 /* 178 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 180 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 182 */      \r
-                       0x48,           /* FC_VARIABLE_REPEAT */\r
-                       0x49,           /* FC_FIXED_OFFSET */\r
-/* 184 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 186 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 188 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 190 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 192 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 194 */      0x12, 0x0,      /* FC_UP */\r
-/* 196 */      NdrFcShort( 0xff70 ),   /* Offset= -144 (52) */\r
-/* 198 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 200 */      0x5c,           /* FC_PAD */\r
+/* 180 */      NdrFcLong( 0xffffffff ),        /* -1 */\r
+/* 184 */      NdrFcShort( 0x0 ),      /* Corr flags:  */\r
+/* 186 */      \r
+                       0x12, 0x0,      /* FC_UP */\r
+/* 188 */      NdrFcShort( 0xff78 ),   /* Offset= -136 (52) */\r
+/* 190 */      0x5c,           /* FC_PAD */\r
                        0x5b,           /* FC_END */\r
-/* 202 */      \r
-                       0x16,           /* FC_PSTRUCT */\r
+/* 192 */      \r
+                       0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 204 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 206 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 208 */      \r
-                       0x46,           /* FC_NO_REPEAT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 210 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 212 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 214 */      0x11, 0x0,      /* FC_RP */\r
-/* 216 */      NdrFcShort( 0xffd2 ),   /* Offset= -46 (170) */\r
-/* 218 */      \r
+/* 194 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 196 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 198 */      NdrFcShort( 0x6 ),      /* Offset= 6 (204) */\r
+/* 200 */      0x8,            /* FC_LONG */\r
+                       0x40,           /* FC_STRUCTPAD4 */\r
+/* 202 */      0x36,           /* FC_POINTER */\r
                        0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 220 */      0x8,            /* FC_LONG */\r
-                       0x5b,           /* FC_END */\r
-/* 222 */      \r
+/* 204 */      \r
+                       0x11, 0x0,      /* FC_RP */\r
+/* 206 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (170) */\r
+/* 208 */      \r
                        0x2f,           /* FC_IP */\r
                        0x5a,           /* FC_CONSTANT_IID */\r
-/* 224 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 228 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 230 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 232 */      0xc0,           /* 192 */\r
+/* 210 */      NdrFcLong( 0x0 ),       /* 0 */\r
+/* 214 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 216 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 218 */      0xc0,           /* 192 */\r
                        0x0,            /* 0 */\r
-/* 234 */      0x0,            /* 0 */\r
+/* 220 */      0x0,            /* 0 */\r
                        0x0,            /* 0 */\r
-/* 236 */      0x0,            /* 0 */\r
+/* 222 */      0x0,            /* 0 */\r
                        0x0,            /* 0 */\r
-/* 238 */      0x0,            /* 0 */\r
+/* 224 */      0x0,            /* 0 */\r
                        0x46,           /* 70 */\r
-/* 240 */      \r
+/* 226 */      \r
                        0x21,           /* FC_BOGUS_ARRAY */\r
                        0x3,            /* 3 */\r
-/* 242 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 244 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
+/* 228 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 230 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
                        0x0,            /*  */\r
-/* 246 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 248 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 250 */      NdrFcLong( 0xffffffff ),        /* -1 */\r
-/* 254 */      NdrFcShort( 0x0 ),      /* Corr flags:  */\r
-/* 256 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
+/* 232 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 234 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
+/* 236 */      NdrFcLong( 0xffffffff ),        /* -1 */\r
+/* 240 */      NdrFcShort( 0x0 ),      /* Corr flags:  */\r
+/* 242 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
                        0x0,            /* 0 */\r
-/* 258 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (222) */\r
-/* 260 */      0x5c,           /* FC_PAD */\r
+/* 244 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (208) */\r
+/* 246 */      0x5c,           /* FC_PAD */\r
                        0x5b,           /* FC_END */\r
-/* 262 */      \r
+/* 248 */      \r
                        0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 264 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 266 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 268 */      NdrFcShort( 0x6 ),      /* Offset= 6 (274) */\r
-/* 270 */      0x8,            /* FC_LONG */\r
-                       0x36,           /* FC_POINTER */\r
-/* 272 */      0x5c,           /* FC_PAD */\r
+/* 250 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 252 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 254 */      NdrFcShort( 0x6 ),      /* Offset= 6 (260) */\r
+/* 256 */      0x8,            /* FC_LONG */\r
+                       0x40,           /* FC_STRUCTPAD4 */\r
+/* 258 */      0x36,           /* FC_POINTER */\r
                        0x5b,           /* FC_END */\r
-/* 274 */      \r
+/* 260 */      \r
                        0x11, 0x0,      /* FC_RP */\r
-/* 276 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (240) */\r
-/* 278 */      \r
+/* 262 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (226) */\r
+/* 264 */      \r
                        0x2f,           /* FC_IP */\r
                        0x5a,           /* FC_CONSTANT_IID */\r
-/* 280 */      NdrFcLong( 0x20400 ),   /* 132096 */\r
-/* 284 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 286 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 288 */      0xc0,           /* 192 */\r
+/* 266 */      NdrFcLong( 0x20400 ),   /* 132096 */\r
+/* 270 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 272 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 274 */      0xc0,           /* 192 */\r
                        0x0,            /* 0 */\r
-/* 290 */      0x0,            /* 0 */\r
+/* 276 */      0x0,            /* 0 */\r
                        0x0,            /* 0 */\r
-/* 292 */      0x0,            /* 0 */\r
+/* 278 */      0x0,            /* 0 */\r
                        0x0,            /* 0 */\r
-/* 294 */      0x0,            /* 0 */\r
+/* 280 */      0x0,            /* 0 */\r
                        0x46,           /* 70 */\r
-/* 296 */      \r
+/* 282 */      \r
                        0x21,           /* FC_BOGUS_ARRAY */\r
                        0x3,            /* 3 */\r
-/* 298 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 300 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
+/* 284 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 286 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
                        0x0,            /*  */\r
-/* 302 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 304 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 306 */      NdrFcLong( 0xffffffff ),        /* -1 */\r
-/* 310 */      NdrFcShort( 0x0 ),      /* Corr flags:  */\r
-/* 312 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
+/* 288 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 290 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
+/* 292 */      NdrFcLong( 0xffffffff ),        /* -1 */\r
+/* 296 */      NdrFcShort( 0x0 ),      /* Corr flags:  */\r
+/* 298 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
                        0x0,            /* 0 */\r
-/* 314 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (278) */\r
-/* 316 */      0x5c,           /* FC_PAD */\r
+/* 300 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (264) */\r
+/* 302 */      0x5c,           /* FC_PAD */\r
                        0x5b,           /* FC_END */\r
-/* 318 */      \r
+/* 304 */      \r
                        0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 320 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 322 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 324 */      NdrFcShort( 0x6 ),      /* Offset= 6 (330) */\r
-/* 326 */      0x8,            /* FC_LONG */\r
-                       0x36,           /* FC_POINTER */\r
-/* 328 */      0x5c,           /* FC_PAD */\r
+/* 306 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 308 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 310 */      NdrFcShort( 0x6 ),      /* Offset= 6 (316) */\r
+/* 312 */      0x8,            /* FC_LONG */\r
+                       0x40,           /* FC_STRUCTPAD4 */\r
+/* 314 */      0x36,           /* FC_POINTER */\r
                        0x5b,           /* FC_END */\r
-/* 330 */      \r
+/* 316 */      \r
                        0x11, 0x0,      /* FC_RP */\r
-/* 332 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (296) */\r
-/* 334 */      \r
+/* 318 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (282) */\r
+/* 320 */      \r
                        0x2b,           /* FC_NON_ENCAPSULATED_UNION */\r
                        0x9,            /* FC_ULONG */\r
-/* 336 */      0x7,            /* Corr desc: FC_USHORT */\r
+/* 322 */      0x7,            /* Corr desc: FC_USHORT */\r
                        0x0,            /*  */\r
-/* 338 */      NdrFcShort( 0xfff8 ),   /* -8 */\r
-/* 340 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 342 */      NdrFcShort( 0x2 ),      /* Offset= 2 (344) */\r
-/* 344 */      NdrFcShort( 0x10 ),     /* 16 */\r
-/* 346 */      NdrFcShort( 0x2f ),     /* 47 */\r
-/* 348 */      NdrFcLong( 0x14 ),      /* 20 */\r
-/* 352 */      NdrFcShort( 0x800b ),   /* Simple arm type: FC_HYPER */\r
-/* 354 */      NdrFcLong( 0x3 ),       /* 3 */\r
-/* 358 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
-/* 360 */      NdrFcLong( 0x11 ),      /* 17 */\r
-/* 364 */      NdrFcShort( 0x8001 ),   /* Simple arm type: FC_BYTE */\r
-/* 366 */      NdrFcLong( 0x2 ),       /* 2 */\r
-/* 370 */      NdrFcShort( 0x8006 ),   /* Simple arm type: FC_SHORT */\r
-/* 372 */      NdrFcLong( 0x4 ),       /* 4 */\r
-/* 376 */      NdrFcShort( 0x800a ),   /* Simple arm type: FC_FLOAT */\r
-/* 378 */      NdrFcLong( 0x5 ),       /* 5 */\r
-/* 382 */      NdrFcShort( 0x800c ),   /* Simple arm type: FC_DOUBLE */\r
-/* 384 */      NdrFcLong( 0xb ),       /* 11 */\r
-/* 388 */      NdrFcShort( 0x8006 ),   /* Simple arm type: FC_SHORT */\r
-/* 390 */      NdrFcLong( 0xa ),       /* 10 */\r
-/* 394 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
-/* 396 */      NdrFcLong( 0x6 ),       /* 6 */\r
-/* 400 */      NdrFcShort( 0xe8 ),     /* Offset= 232 (632) */\r
-/* 402 */      NdrFcLong( 0x7 ),       /* 7 */\r
-/* 406 */      NdrFcShort( 0x800c ),   /* Simple arm type: FC_DOUBLE */\r
-/* 408 */      NdrFcLong( 0x8 ),       /* 8 */\r
-/* 412 */      NdrFcShort( 0xfe88 ),   /* Offset= -376 (36) */\r
-/* 414 */      NdrFcLong( 0xd ),       /* 13 */\r
-/* 418 */      NdrFcShort( 0xff3c ),   /* Offset= -196 (222) */\r
-/* 420 */      NdrFcLong( 0x9 ),       /* 9 */\r
-/* 424 */      NdrFcShort( 0xff6e ),   /* Offset= -146 (278) */\r
-/* 426 */      NdrFcLong( 0x2000 ),    /* 8192 */\r
-/* 430 */      NdrFcShort( 0xd0 ),     /* Offset= 208 (638) */\r
-/* 432 */      NdrFcLong( 0x24 ),      /* 36 */\r
-/* 436 */      NdrFcShort( 0xd2 ),     /* Offset= 210 (646) */\r
-/* 438 */      NdrFcLong( 0x4024 ),    /* 16420 */\r
-/* 442 */      NdrFcShort( 0xcc ),     /* Offset= 204 (646) */\r
-/* 444 */      NdrFcLong( 0x4011 ),    /* 16401 */\r
-/* 448 */      NdrFcShort( 0xfc ),     /* Offset= 252 (700) */\r
-/* 450 */      NdrFcLong( 0x4002 ),    /* 16386 */\r
-/* 454 */      NdrFcShort( 0xfa ),     /* Offset= 250 (704) */\r
-/* 456 */      NdrFcLong( 0x4003 ),    /* 16387 */\r
-/* 460 */      NdrFcShort( 0xf8 ),     /* Offset= 248 (708) */\r
-/* 462 */      NdrFcLong( 0x4014 ),    /* 16404 */\r
-/* 466 */      NdrFcShort( 0xf6 ),     /* Offset= 246 (712) */\r
-/* 468 */      NdrFcLong( 0x4004 ),    /* 16388 */\r
-/* 472 */      NdrFcShort( 0xf4 ),     /* Offset= 244 (716) */\r
-/* 474 */      NdrFcLong( 0x4005 ),    /* 16389 */\r
-/* 478 */      NdrFcShort( 0xf2 ),     /* Offset= 242 (720) */\r
-/* 480 */      NdrFcLong( 0x400b ),    /* 16395 */\r
-/* 484 */      NdrFcShort( 0xdc ),     /* Offset= 220 (704) */\r
-/* 486 */      NdrFcLong( 0x400a ),    /* 16394 */\r
-/* 490 */      NdrFcShort( 0xda ),     /* Offset= 218 (708) */\r
-/* 492 */      NdrFcLong( 0x4006 ),    /* 16390 */\r
-/* 496 */      NdrFcShort( 0xe4 ),     /* Offset= 228 (724) */\r
-/* 498 */      NdrFcLong( 0x4007 ),    /* 16391 */\r
-/* 502 */      NdrFcShort( 0xda ),     /* Offset= 218 (720) */\r
-/* 504 */      NdrFcLong( 0x4008 ),    /* 16392 */\r
-/* 508 */      NdrFcShort( 0xdc ),     /* Offset= 220 (728) */\r
-/* 510 */      NdrFcLong( 0x400d ),    /* 16397 */\r
-/* 514 */      NdrFcShort( 0xda ),     /* Offset= 218 (732) */\r
-/* 516 */      NdrFcLong( 0x4009 ),    /* 16393 */\r
-/* 520 */      NdrFcShort( 0xd8 ),     /* Offset= 216 (736) */\r
-/* 522 */      NdrFcLong( 0x6000 ),    /* 24576 */\r
-/* 526 */      NdrFcShort( 0xd6 ),     /* Offset= 214 (740) */\r
-/* 528 */      NdrFcLong( 0x400c ),    /* 16396 */\r
-/* 532 */      NdrFcShort( 0xdc ),     /* Offset= 220 (752) */\r
-/* 534 */      NdrFcLong( 0x10 ),      /* 16 */\r
-/* 538 */      NdrFcShort( 0x8002 ),   /* Simple arm type: FC_CHAR */\r
-/* 540 */      NdrFcLong( 0x12 ),      /* 18 */\r
-/* 544 */      NdrFcShort( 0x8006 ),   /* Simple arm type: FC_SHORT */\r
-/* 546 */      NdrFcLong( 0x13 ),      /* 19 */\r
-/* 550 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
-/* 552 */      NdrFcLong( 0x15 ),      /* 21 */\r
-/* 556 */      NdrFcShort( 0x800b ),   /* Simple arm type: FC_HYPER */\r
-/* 558 */      NdrFcLong( 0x16 ),      /* 22 */\r
-/* 562 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
-/* 564 */      NdrFcLong( 0x17 ),      /* 23 */\r
-/* 568 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
-/* 570 */      NdrFcLong( 0xe ),       /* 14 */\r
-/* 574 */      NdrFcShort( 0xba ),     /* Offset= 186 (760) */\r
-/* 576 */      NdrFcLong( 0x400e ),    /* 16398 */\r
-/* 580 */      NdrFcShort( 0xbe ),     /* Offset= 190 (770) */\r
-/* 582 */      NdrFcLong( 0x4010 ),    /* 16400 */\r
-/* 586 */      NdrFcShort( 0xbc ),     /* Offset= 188 (774) */\r
-/* 588 */      NdrFcLong( 0x4012 ),    /* 16402 */\r
-/* 592 */      NdrFcShort( 0x70 ),     /* Offset= 112 (704) */\r
-/* 594 */      NdrFcLong( 0x4013 ),    /* 16403 */\r
-/* 598 */      NdrFcShort( 0x6e ),     /* Offset= 110 (708) */\r
-/* 600 */      NdrFcLong( 0x4015 ),    /* 16405 */\r
-/* 604 */      NdrFcShort( 0x6c ),     /* Offset= 108 (712) */\r
-/* 606 */      NdrFcLong( 0x4016 ),    /* 16406 */\r
-/* 610 */      NdrFcShort( 0x62 ),     /* Offset= 98 (708) */\r
-/* 612 */      NdrFcLong( 0x4017 ),    /* 16407 */\r
-/* 616 */      NdrFcShort( 0x5c ),     /* Offset= 92 (708) */\r
-/* 618 */      NdrFcLong( 0x0 ),       /* 0 */\r
-/* 622 */      NdrFcShort( 0x0 ),      /* Offset= 0 (622) */\r
-/* 624 */      NdrFcLong( 0x1 ),       /* 1 */\r
-/* 628 */      NdrFcShort( 0x0 ),      /* Offset= 0 (628) */\r
-/* 630 */      NdrFcShort( 0xffff ),   /* Offset= -1 (629) */\r
-/* 632 */      \r
+/* 324 */      NdrFcShort( 0xfff8 ),   /* -8 */\r
+/* 326 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
+/* 328 */      NdrFcShort( 0x2 ),      /* Offset= 2 (330) */\r
+/* 330 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 332 */      NdrFcShort( 0x2f ),     /* 47 */\r
+/* 334 */      NdrFcLong( 0x14 ),      /* 20 */\r
+/* 338 */      NdrFcShort( 0x800b ),   /* Simple arm type: FC_HYPER */\r
+/* 340 */      NdrFcLong( 0x3 ),       /* 3 */\r
+/* 344 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
+/* 346 */      NdrFcLong( 0x11 ),      /* 17 */\r
+/* 350 */      NdrFcShort( 0x8001 ),   /* Simple arm type: FC_BYTE */\r
+/* 352 */      NdrFcLong( 0x2 ),       /* 2 */\r
+/* 356 */      NdrFcShort( 0x8006 ),   /* Simple arm type: FC_SHORT */\r
+/* 358 */      NdrFcLong( 0x4 ),       /* 4 */\r
+/* 362 */      NdrFcShort( 0x800a ),   /* Simple arm type: FC_FLOAT */\r
+/* 364 */      NdrFcLong( 0x5 ),       /* 5 */\r
+/* 368 */      NdrFcShort( 0x800c ),   /* Simple arm type: FC_DOUBLE */\r
+/* 370 */      NdrFcLong( 0xb ),       /* 11 */\r
+/* 374 */      NdrFcShort( 0x8006 ),   /* Simple arm type: FC_SHORT */\r
+/* 376 */      NdrFcLong( 0xa ),       /* 10 */\r
+/* 380 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
+/* 382 */      NdrFcLong( 0x6 ),       /* 6 */\r
+/* 386 */      NdrFcShort( 0xe8 ),     /* Offset= 232 (618) */\r
+/* 388 */      NdrFcLong( 0x7 ),       /* 7 */\r
+/* 392 */      NdrFcShort( 0x800c ),   /* Simple arm type: FC_DOUBLE */\r
+/* 394 */      NdrFcLong( 0x8 ),       /* 8 */\r
+/* 398 */      NdrFcShort( 0xfe96 ),   /* Offset= -362 (36) */\r
+/* 400 */      NdrFcLong( 0xd ),       /* 13 */\r
+/* 404 */      NdrFcShort( 0xff3c ),   /* Offset= -196 (208) */\r
+/* 406 */      NdrFcLong( 0x9 ),       /* 9 */\r
+/* 410 */      NdrFcShort( 0xff6e ),   /* Offset= -146 (264) */\r
+/* 412 */      NdrFcLong( 0x2000 ),    /* 8192 */\r
+/* 416 */      NdrFcShort( 0xd0 ),     /* Offset= 208 (624) */\r
+/* 418 */      NdrFcLong( 0x24 ),      /* 36 */\r
+/* 422 */      NdrFcShort( 0xd2 ),     /* Offset= 210 (632) */\r
+/* 424 */      NdrFcLong( 0x4024 ),    /* 16420 */\r
+/* 428 */      NdrFcShort( 0xcc ),     /* Offset= 204 (632) */\r
+/* 430 */      NdrFcLong( 0x4011 ),    /* 16401 */\r
+/* 434 */      NdrFcShort( 0xfc ),     /* Offset= 252 (686) */\r
+/* 436 */      NdrFcLong( 0x4002 ),    /* 16386 */\r
+/* 440 */      NdrFcShort( 0xfa ),     /* Offset= 250 (690) */\r
+/* 442 */      NdrFcLong( 0x4003 ),    /* 16387 */\r
+/* 446 */      NdrFcShort( 0xf8 ),     /* Offset= 248 (694) */\r
+/* 448 */      NdrFcLong( 0x4014 ),    /* 16404 */\r
+/* 452 */      NdrFcShort( 0xf6 ),     /* Offset= 246 (698) */\r
+/* 454 */      NdrFcLong( 0x4004 ),    /* 16388 */\r
+/* 458 */      NdrFcShort( 0xf4 ),     /* Offset= 244 (702) */\r
+/* 460 */      NdrFcLong( 0x4005 ),    /* 16389 */\r
+/* 464 */      NdrFcShort( 0xf2 ),     /* Offset= 242 (706) */\r
+/* 466 */      NdrFcLong( 0x400b ),    /* 16395 */\r
+/* 470 */      NdrFcShort( 0xdc ),     /* Offset= 220 (690) */\r
+/* 472 */      NdrFcLong( 0x400a ),    /* 16394 */\r
+/* 476 */      NdrFcShort( 0xda ),     /* Offset= 218 (694) */\r
+/* 478 */      NdrFcLong( 0x4006 ),    /* 16390 */\r
+/* 482 */      NdrFcShort( 0xe4 ),     /* Offset= 228 (710) */\r
+/* 484 */      NdrFcLong( 0x4007 ),    /* 16391 */\r
+/* 488 */      NdrFcShort( 0xda ),     /* Offset= 218 (706) */\r
+/* 490 */      NdrFcLong( 0x4008 ),    /* 16392 */\r
+/* 494 */      NdrFcShort( 0xdc ),     /* Offset= 220 (714) */\r
+/* 496 */      NdrFcLong( 0x400d ),    /* 16397 */\r
+/* 500 */      NdrFcShort( 0xda ),     /* Offset= 218 (718) */\r
+/* 502 */      NdrFcLong( 0x4009 ),    /* 16393 */\r
+/* 506 */      NdrFcShort( 0xd8 ),     /* Offset= 216 (722) */\r
+/* 508 */      NdrFcLong( 0x6000 ),    /* 24576 */\r
+/* 512 */      NdrFcShort( 0xd6 ),     /* Offset= 214 (726) */\r
+/* 514 */      NdrFcLong( 0x400c ),    /* 16396 */\r
+/* 518 */      NdrFcShort( 0xdc ),     /* Offset= 220 (738) */\r
+/* 520 */      NdrFcLong( 0x10 ),      /* 16 */\r
+/* 524 */      NdrFcShort( 0x8002 ),   /* Simple arm type: FC_CHAR */\r
+/* 526 */      NdrFcLong( 0x12 ),      /* 18 */\r
+/* 530 */      NdrFcShort( 0x8006 ),   /* Simple arm type: FC_SHORT */\r
+/* 532 */      NdrFcLong( 0x13 ),      /* 19 */\r
+/* 536 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
+/* 538 */      NdrFcLong( 0x15 ),      /* 21 */\r
+/* 542 */      NdrFcShort( 0x800b ),   /* Simple arm type: FC_HYPER */\r
+/* 544 */      NdrFcLong( 0x16 ),      /* 22 */\r
+/* 548 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
+/* 550 */      NdrFcLong( 0x17 ),      /* 23 */\r
+/* 554 */      NdrFcShort( 0x8008 ),   /* Simple arm type: FC_LONG */\r
+/* 556 */      NdrFcLong( 0xe ),       /* 14 */\r
+/* 560 */      NdrFcShort( 0xba ),     /* Offset= 186 (746) */\r
+/* 562 */      NdrFcLong( 0x400e ),    /* 16398 */\r
+/* 566 */      NdrFcShort( 0xbe ),     /* Offset= 190 (756) */\r
+/* 568 */      NdrFcLong( 0x4010 ),    /* 16400 */\r
+/* 572 */      NdrFcShort( 0xbc ),     /* Offset= 188 (760) */\r
+/* 574 */      NdrFcLong( 0x4012 ),    /* 16402 */\r
+/* 578 */      NdrFcShort( 0x70 ),     /* Offset= 112 (690) */\r
+/* 580 */      NdrFcLong( 0x4013 ),    /* 16403 */\r
+/* 584 */      NdrFcShort( 0x6e ),     /* Offset= 110 (694) */\r
+/* 586 */      NdrFcLong( 0x4015 ),    /* 16405 */\r
+/* 590 */      NdrFcShort( 0x6c ),     /* Offset= 108 (698) */\r
+/* 592 */      NdrFcLong( 0x4016 ),    /* 16406 */\r
+/* 596 */      NdrFcShort( 0x62 ),     /* Offset= 98 (694) */\r
+/* 598 */      NdrFcLong( 0x4017 ),    /* 16407 */\r
+/* 602 */      NdrFcShort( 0x5c ),     /* Offset= 92 (694) */\r
+/* 604 */      NdrFcLong( 0x0 ),       /* 0 */\r
+/* 608 */      NdrFcShort( 0x0 ),      /* Offset= 0 (608) */\r
+/* 610 */      NdrFcLong( 0x1 ),       /* 1 */\r
+/* 614 */      NdrFcShort( 0x0 ),      /* Offset= 0 (614) */\r
+/* 616 */      NdrFcShort( 0xffff ),   /* Offset= -1 (615) */\r
+/* 618 */      \r
                        0x15,           /* FC_STRUCT */\r
                        0x7,            /* 7 */\r
-/* 634 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 636 */      0xb,            /* FC_HYPER */\r
+/* 620 */      NdrFcShort( 0x8 ),      /* 8 */\r
+/* 622 */      0xb,            /* FC_HYPER */\r
                        0x5b,           /* FC_END */\r
-/* 638 */      \r
+/* 624 */      \r
                        0x12, 0x10,     /* FC_UP [pointer_deref] */\r
-/* 640 */      NdrFcShort( 0x2 ),      /* Offset= 2 (642) */\r
-/* 642 */      \r
+/* 626 */      NdrFcShort( 0x2 ),      /* Offset= 2 (628) */\r
+/* 628 */      \r
                        0x12, 0x0,      /* FC_UP */\r
-/* 644 */      NdrFcShort( 0x1b8 ),    /* Offset= 440 (1084) */\r
-/* 646 */      \r
+/* 630 */      NdrFcShort( 0x194 ),    /* Offset= 404 (1034) */\r
+/* 632 */      \r
                        0x12, 0x0,      /* FC_UP */\r
-/* 648 */      NdrFcShort( 0x20 ),     /* Offset= 32 (680) */\r
-/* 650 */      \r
+/* 634 */      NdrFcShort( 0x20 ),     /* Offset= 32 (666) */\r
+/* 636 */      \r
                        0x2f,           /* FC_IP */\r
                        0x5a,           /* FC_CONSTANT_IID */\r
-/* 652 */      NdrFcLong( 0x2f ),      /* 47 */\r
-/* 656 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 658 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 660 */      0xc0,           /* 192 */\r
+/* 638 */      NdrFcLong( 0x2f ),      /* 47 */\r
+/* 642 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 644 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 646 */      0xc0,           /* 192 */\r
                        0x0,            /* 0 */\r
-/* 662 */      0x0,            /* 0 */\r
+/* 648 */      0x0,            /* 0 */\r
                        0x0,            /* 0 */\r
-/* 664 */      0x0,            /* 0 */\r
+/* 650 */      0x0,            /* 0 */\r
                        0x0,            /* 0 */\r
-/* 666 */      0x0,            /* 0 */\r
+/* 652 */      0x0,            /* 0 */\r
                        0x46,           /* 70 */\r
-/* 668 */      \r
+/* 654 */      \r
                        0x1b,           /* FC_CARRAY */\r
                        0x0,            /* 0 */\r
-/* 670 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 672 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
+/* 656 */      NdrFcShort( 0x1 ),      /* 1 */\r
+/* 658 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
                        0x0,            /*  */\r
-/* 674 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 676 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 678 */      0x1,            /* FC_BYTE */\r
+/* 660 */      NdrFcShort( 0x4 ),      /* 4 */\r
+/* 662 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
+/* 664 */      0x1,            /* FC_BYTE */\r
                        0x5b,           /* FC_END */\r
-/* 680 */      \r
+/* 666 */      \r
                        0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 682 */      NdrFcShort( 0x10 ),     /* 16 */\r
-/* 684 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 686 */      NdrFcShort( 0xa ),      /* Offset= 10 (696) */\r
-/* 688 */      0x8,            /* FC_LONG */\r
+/* 668 */      NdrFcShort( 0x18 ),     /* 24 */\r
+/* 670 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 672 */      NdrFcShort( 0xa ),      /* Offset= 10 (682) */\r
+/* 674 */      0x8,            /* FC_LONG */\r
                        0x8,            /* FC_LONG */\r
-/* 690 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
+/* 676 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
                        0x0,            /* 0 */\r
-/* 692 */      NdrFcShort( 0xffd6 ),   /* Offset= -42 (650) */\r
-/* 694 */      0x36,           /* FC_POINTER */\r
+/* 678 */      NdrFcShort( 0xffd6 ),   /* Offset= -42 (636) */\r
+/* 680 */      0x36,           /* FC_POINTER */\r
                        0x5b,           /* FC_END */\r
-/* 696 */      \r
+/* 682 */      \r
                        0x12, 0x0,      /* FC_UP */\r
-/* 698 */      NdrFcShort( 0xffe2 ),   /* Offset= -30 (668) */\r
-/* 700 */      \r
+/* 684 */      NdrFcShort( 0xffe2 ),   /* Offset= -30 (654) */\r
+/* 686 */      \r
                        0x12, 0x8,      /* FC_UP [simple_pointer] */\r
-/* 702 */      0x1,            /* FC_BYTE */\r
+/* 688 */      0x1,            /* FC_BYTE */\r
                        0x5c,           /* FC_PAD */\r
-/* 704 */      \r
+/* 690 */      \r
                        0x12, 0x8,      /* FC_UP [simple_pointer] */\r
-/* 706 */      0x6,            /* FC_SHORT */\r
+/* 692 */      0x6,            /* FC_SHORT */\r
                        0x5c,           /* FC_PAD */\r
-/* 708 */      \r
+/* 694 */      \r
                        0x12, 0x8,      /* FC_UP [simple_pointer] */\r
-/* 710 */      0x8,            /* FC_LONG */\r
+/* 696 */      0x8,            /* FC_LONG */\r
                        0x5c,           /* FC_PAD */\r
-/* 712 */      \r
+/* 698 */      \r
                        0x12, 0x8,      /* FC_UP [simple_pointer] */\r
-/* 714 */      0xb,            /* FC_HYPER */\r
+/* 700 */      0xb,            /* FC_HYPER */\r
                        0x5c,           /* FC_PAD */\r
-/* 716 */      \r
+/* 702 */      \r
                        0x12, 0x8,      /* FC_UP [simple_pointer] */\r
-/* 718 */      0xa,            /* FC_FLOAT */\r
+/* 704 */      0xa,            /* FC_FLOAT */\r
                        0x5c,           /* FC_PAD */\r
-/* 720 */      \r
+/* 706 */      \r
                        0x12, 0x8,      /* FC_UP [simple_pointer] */\r
-/* 722 */      0xc,            /* FC_DOUBLE */\r
+/* 708 */      0xc,            /* FC_DOUBLE */\r
                        0x5c,           /* FC_PAD */\r
-/* 724 */      \r
+/* 710 */      \r
                        0x12, 0x0,      /* FC_UP */\r
-/* 726 */      NdrFcShort( 0xffa2 ),   /* Offset= -94 (632) */\r
-/* 728 */      \r
+/* 712 */      NdrFcShort( 0xffa2 ),   /* Offset= -94 (618) */\r
+/* 714 */      \r
                        0x12, 0x10,     /* FC_UP [pointer_deref] */\r
-/* 730 */      NdrFcShort( 0xfd4a ),   /* Offset= -694 (36) */\r
-/* 732 */      \r
+/* 716 */      NdrFcShort( 0xfd58 ),   /* Offset= -680 (36) */\r
+/* 718 */      \r
                        0x12, 0x10,     /* FC_UP [pointer_deref] */\r
-/* 734 */      NdrFcShort( 0xfe00 ),   /* Offset= -512 (222) */\r
-/* 736 */      \r
+/* 720 */      NdrFcShort( 0xfe00 ),   /* Offset= -512 (208) */\r
+/* 722 */      \r
                        0x12, 0x10,     /* FC_UP [pointer_deref] */\r
-/* 738 */      NdrFcShort( 0xfe34 ),   /* Offset= -460 (278) */\r
-/* 740 */      \r
+/* 724 */      NdrFcShort( 0xfe34 ),   /* Offset= -460 (264) */\r
+/* 726 */      \r
                        0x12, 0x10,     /* FC_UP [pointer_deref] */\r
-/* 742 */      NdrFcShort( 0x2 ),      /* Offset= 2 (744) */\r
-/* 744 */      \r
+/* 728 */      NdrFcShort( 0x2 ),      /* Offset= 2 (730) */\r
+/* 730 */      \r
                        0x12, 0x10,     /* FC_UP [pointer_deref] */\r
-/* 746 */      NdrFcShort( 0x2 ),      /* Offset= 2 (748) */\r
-/* 748 */      \r
+/* 732 */      NdrFcShort( 0x2 ),      /* Offset= 2 (734) */\r
+/* 734 */      \r
                        0x12, 0x0,      /* FC_UP */\r
-/* 750 */      NdrFcShort( 0x14e ),    /* Offset= 334 (1084) */\r
-/* 752 */      \r
+/* 736 */      NdrFcShort( 0x12a ),    /* Offset= 298 (1034) */\r
+/* 738 */      \r
                        0x12, 0x10,     /* FC_UP [pointer_deref] */\r
-/* 754 */      NdrFcShort( 0x2 ),      /* Offset= 2 (756) */\r
-/* 756 */      \r
+/* 740 */      NdrFcShort( 0x2 ),      /* Offset= 2 (742) */\r
+/* 742 */      \r
                        0x12, 0x0,      /* FC_UP */\r
-/* 758 */      NdrFcShort( 0x14 ),     /* Offset= 20 (778) */\r
-/* 760 */      \r
+/* 744 */      NdrFcShort( 0x14 ),     /* Offset= 20 (764) */\r
+/* 746 */      \r
                        0x15,           /* FC_STRUCT */\r
                        0x7,            /* 7 */\r
-/* 762 */      NdrFcShort( 0x10 ),     /* 16 */\r
-/* 764 */      0x6,            /* FC_SHORT */\r
+/* 748 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 750 */      0x6,            /* FC_SHORT */\r
                        0x1,            /* FC_BYTE */\r
-/* 766 */      0x1,            /* FC_BYTE */\r
+/* 752 */      0x1,            /* FC_BYTE */\r
                        0x8,            /* FC_LONG */\r
-/* 768 */      0xb,            /* FC_HYPER */\r
+/* 754 */      0xb,            /* FC_HYPER */\r
                        0x5b,           /* FC_END */\r
-/* 770 */      \r
+/* 756 */      \r
                        0x12, 0x0,      /* FC_UP */\r
-/* 772 */      NdrFcShort( 0xfff4 ),   /* Offset= -12 (760) */\r
-/* 774 */      \r
+/* 758 */      NdrFcShort( 0xfff4 ),   /* Offset= -12 (746) */\r
+/* 760 */      \r
                        0x12, 0x8,      /* FC_UP [simple_pointer] */\r
-/* 776 */      0x2,            /* FC_CHAR */\r
+/* 762 */      0x2,            /* FC_CHAR */\r
                        0x5c,           /* FC_PAD */\r
-/* 778 */      \r
+/* 764 */      \r
                        0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x7,            /* 7 */\r
-/* 780 */      NdrFcShort( 0x20 ),     /* 32 */\r
-/* 782 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 784 */      NdrFcShort( 0x0 ),      /* Offset= 0 (784) */\r
-/* 786 */      0x8,            /* FC_LONG */\r
+/* 766 */      NdrFcShort( 0x20 ),     /* 32 */\r
+/* 768 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 770 */      NdrFcShort( 0x0 ),      /* Offset= 0 (770) */\r
+/* 772 */      0x8,            /* FC_LONG */\r
                        0x8,            /* FC_LONG */\r
-/* 788 */      0x6,            /* FC_SHORT */\r
+/* 774 */      0x6,            /* FC_SHORT */\r
                        0x6,            /* FC_SHORT */\r
-/* 790 */      0x6,            /* FC_SHORT */\r
+/* 776 */      0x6,            /* FC_SHORT */\r
                        0x6,            /* FC_SHORT */\r
-/* 792 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
+/* 778 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
                        0x0,            /* 0 */\r
-/* 794 */      NdrFcShort( 0xfe34 ),   /* Offset= -460 (334) */\r
-/* 796 */      0x5c,           /* FC_PAD */\r
+/* 780 */      NdrFcShort( 0xfe34 ),   /* Offset= -460 (320) */\r
+/* 782 */      0x5c,           /* FC_PAD */\r
                        0x5b,           /* FC_END */\r
-/* 798 */      \r
-                       0x1b,           /* FC_CARRAY */\r
+/* 784 */      \r
+                       0x21,           /* FC_BOGUS_ARRAY */\r
                        0x3,            /* 3 */\r
-/* 800 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 802 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
+/* 786 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 788 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
                        0x0,            /*  */\r
-/* 804 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 806 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 808 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 810 */      \r
-                       0x48,           /* FC_VARIABLE_REPEAT */\r
-                       0x49,           /* FC_FIXED_OFFSET */\r
-/* 812 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 814 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 816 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 818 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 820 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 822 */      0x12, 0x0,      /* FC_UP */\r
-/* 824 */      NdrFcShort( 0xffd2 ),   /* Offset= -46 (778) */\r
-/* 826 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 828 */      0x5c,           /* FC_PAD */\r
+/* 790 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 792 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
+/* 794 */      NdrFcLong( 0xffffffff ),        /* -1 */\r
+/* 798 */      NdrFcShort( 0x0 ),      /* Corr flags:  */\r
+/* 800 */      \r
+                       0x12, 0x0,      /* FC_UP */\r
+/* 802 */      NdrFcShort( 0xffda ),   /* Offset= -38 (764) */\r
+/* 804 */      0x5c,           /* FC_PAD */\r
                        0x5b,           /* FC_END */\r
-/* 830 */      \r
+/* 806 */      \r
                        0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 832 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 834 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 836 */      NdrFcShort( 0x6 ),      /* Offset= 6 (842) */\r
-/* 838 */      0x8,            /* FC_LONG */\r
-                       0x36,           /* FC_POINTER */\r
-/* 840 */      0x5c,           /* FC_PAD */\r
+/* 808 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 810 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 812 */      NdrFcShort( 0x6 ),      /* Offset= 6 (818) */\r
+/* 814 */      0x8,            /* FC_LONG */\r
+                       0x40,           /* FC_STRUCTPAD4 */\r
+/* 816 */      0x36,           /* FC_POINTER */\r
                        0x5b,           /* FC_END */\r
-/* 842 */      \r
+/* 818 */      \r
                        0x11, 0x0,      /* FC_RP */\r
-/* 844 */      NdrFcShort( 0xffd2 ),   /* Offset= -46 (798) */\r
-/* 846 */      \r
-                       0x1b,           /* FC_CARRAY */\r
+/* 820 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (784) */\r
+/* 822 */      \r
+                       0x21,           /* FC_BOGUS_ARRAY */\r
                        0x3,            /* 3 */\r
-/* 848 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 850 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
+/* 824 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 826 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
                        0x0,            /*  */\r
-/* 852 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 854 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 856 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 858 */      \r
-                       0x48,           /* FC_VARIABLE_REPEAT */\r
-                       0x49,           /* FC_FIXED_OFFSET */\r
-/* 860 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 862 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 864 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 866 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 868 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 870 */      0x12, 0x0,      /* FC_UP */\r
-/* 872 */      NdrFcShort( 0xff40 ),   /* Offset= -192 (680) */\r
-/* 874 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 876 */      0x5c,           /* FC_PAD */\r
+/* 828 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 830 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
+/* 832 */      NdrFcLong( 0xffffffff ),        /* -1 */\r
+/* 836 */      NdrFcShort( 0x0 ),      /* Corr flags:  */\r
+/* 838 */      \r
+                       0x12, 0x0,      /* FC_UP */\r
+/* 840 */      NdrFcShort( 0xff52 ),   /* Offset= -174 (666) */\r
+/* 842 */      0x5c,           /* FC_PAD */\r
                        0x5b,           /* FC_END */\r
-/* 878 */      \r
+/* 844 */      \r
                        0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 880 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 882 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 884 */      NdrFcShort( 0x6 ),      /* Offset= 6 (890) */\r
-/* 886 */      0x8,            /* FC_LONG */\r
-                       0x36,           /* FC_POINTER */\r
-/* 888 */      0x5c,           /* FC_PAD */\r
+/* 846 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 848 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 850 */      NdrFcShort( 0x6 ),      /* Offset= 6 (856) */\r
+/* 852 */      0x8,            /* FC_LONG */\r
+                       0x40,           /* FC_STRUCTPAD4 */\r
+/* 854 */      0x36,           /* FC_POINTER */\r
                        0x5b,           /* FC_END */\r
-/* 890 */      \r
+/* 856 */      \r
                        0x11, 0x0,      /* FC_RP */\r
-/* 892 */      NdrFcShort( 0xffd2 ),   /* Offset= -46 (846) */\r
-/* 894 */      \r
+/* 858 */      NdrFcShort( 0xffdc ),   /* Offset= -36 (822) */\r
+/* 860 */      \r
                        0x1d,           /* FC_SMFARRAY */\r
                        0x0,            /* 0 */\r
-/* 896 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 898 */      0x1,            /* FC_BYTE */\r
+/* 862 */      NdrFcShort( 0x8 ),      /* 8 */\r
+/* 864 */      0x1,            /* FC_BYTE */\r
                        0x5b,           /* FC_END */\r
-/* 900 */      \r
+/* 866 */      \r
                        0x15,           /* FC_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 902 */      NdrFcShort( 0x10 ),     /* 16 */\r
-/* 904 */      0x8,            /* FC_LONG */\r
+/* 868 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 870 */      0x8,            /* FC_LONG */\r
                        0x6,            /* FC_SHORT */\r
-/* 906 */      0x6,            /* FC_SHORT */\r
+/* 872 */      0x6,            /* FC_SHORT */\r
                        0x4c,           /* FC_EMBEDDED_COMPLEX */\r
-/* 908 */      0x0,            /* 0 */\r
-                       NdrFcShort( 0xfff1 ),   /* Offset= -15 (894) */\r
+/* 874 */      0x0,            /* 0 */\r
+                       NdrFcShort( 0xfff1 ),   /* Offset= -15 (860) */\r
                        0x5b,           /* FC_END */\r
-/* 912 */      \r
+/* 878 */      \r
                        0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 914 */      NdrFcShort( 0x18 ),     /* 24 */\r
-/* 916 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 918 */      NdrFcShort( 0xa ),      /* Offset= 10 (928) */\r
-/* 920 */      0x8,            /* FC_LONG */\r
-                       0x36,           /* FC_POINTER */\r
-/* 922 */      0x4c,           /* FC_EMBEDDED_COMPLEX */\r
-                       0x0,            /* 0 */\r
-/* 924 */      NdrFcShort( 0xffe8 ),   /* Offset= -24 (900) */\r
-/* 926 */      0x5c,           /* FC_PAD */\r
+/* 880 */      NdrFcShort( 0x20 ),     /* 32 */\r
+/* 882 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 884 */      NdrFcShort( 0xa ),      /* Offset= 10 (894) */\r
+/* 886 */      0x8,            /* FC_LONG */\r
+                       0x40,           /* FC_STRUCTPAD4 */\r
+/* 888 */      0x36,           /* FC_POINTER */\r
+                       0x4c,           /* FC_EMBEDDED_COMPLEX */\r
+/* 890 */      0x0,            /* 0 */\r
+                       NdrFcShort( 0xffe7 ),   /* Offset= -25 (866) */\r
                        0x5b,           /* FC_END */\r
-/* 928 */      \r
+/* 894 */      \r
                        0x11, 0x0,      /* FC_RP */\r
-/* 930 */      NdrFcShort( 0xfd4e ),   /* Offset= -690 (240) */\r
-/* 932 */      \r
+/* 896 */      NdrFcShort( 0xfd62 ),   /* Offset= -670 (226) */\r
+/* 898 */      \r
                        0x1b,           /* FC_CARRAY */\r
                        0x0,            /* 0 */\r
-/* 934 */      NdrFcShort( 0x1 ),      /* 1 */\r
-/* 936 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
+/* 900 */      NdrFcShort( 0x1 ),      /* 1 */\r
+/* 902 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
                        0x0,            /*  */\r
-/* 938 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 940 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 942 */      0x1,            /* FC_BYTE */\r
+/* 904 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 906 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
+/* 908 */      0x1,            /* FC_BYTE */\r
                        0x5b,           /* FC_END */\r
-/* 944 */      \r
-                       0x16,           /* FC_PSTRUCT */\r
+/* 910 */      \r
+                       0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 946 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 948 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 950 */      \r
-                       0x46,           /* FC_NO_REPEAT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 952 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 954 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 956 */      0x12, 0x0,      /* FC_UP */\r
-/* 958 */      NdrFcShort( 0xffe6 ),   /* Offset= -26 (932) */\r
-/* 960 */      \r
+/* 912 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 914 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 916 */      NdrFcShort( 0x6 ),      /* Offset= 6 (922) */\r
+/* 918 */      0x8,            /* FC_LONG */\r
+                       0x40,           /* FC_STRUCTPAD4 */\r
+/* 920 */      0x36,           /* FC_POINTER */\r
                        0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 962 */      0x8,            /* FC_LONG */\r
-                       0x5b,           /* FC_END */\r
-/* 964 */      \r
+/* 922 */      \r
+                       0x12, 0x0,      /* FC_UP */\r
+/* 924 */      NdrFcShort( 0xffe6 ),   /* Offset= -26 (898) */\r
+/* 926 */      \r
                        0x1b,           /* FC_CARRAY */\r
                        0x1,            /* 1 */\r
-/* 966 */      NdrFcShort( 0x2 ),      /* 2 */\r
-/* 968 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
+/* 928 */      NdrFcShort( 0x2 ),      /* 2 */\r
+/* 930 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
                        0x0,            /*  */\r
-/* 970 */      NdrFcShort( 0x0 ),      /* 0 */\r
-/* 972 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 974 */      0x6,            /* FC_SHORT */\r
+/* 932 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 934 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
+/* 936 */      0x6,            /* FC_SHORT */\r
                        0x5b,           /* FC_END */\r
-/* 976 */      \r
-                       0x16,           /* FC_PSTRUCT */\r
+/* 938 */      \r
+                       0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 978 */      NdrFcShort( 0x8 ),      /* 8 */\r
-/* 980 */      \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 982 */      \r
-                       0x46,           /* FC_NO_REPEAT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 984 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 986 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 988 */      0x12, 0x0,      /* FC_UP */\r
-/* 990 */      NdrFcShort( 0xffe6 ),   /* Offset= -26 (964) */\r
-/* 992 */      \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 994 */      0x8,            /* FC_LONG */\r
+/* 940 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 942 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 944 */      NdrFcShort( 0x6 ),      /* Offset= 6 (950) */\r
+/* 946 */      0x8,            /* FC_LONG */\r
+                       0x40,           /* FC_STRUCTPAD4 */\r
+/* 948 */      0x36,           /* FC_POINTER */\r
                        0x5b,           /* FC_END */\r
-/* 996 */      \r
+/* 950 */      \r
+                       0x12, 0x0,      /* FC_UP */\r
+/* 952 */      NdrFcShort( 0xffe6 ),   /* Offset= -26 (926) */\r
+/* 954 */      \r
                        0x1b,           /* FC_CARRAY */\r
                        0x3,            /* 3 */\r
-/* 998 */      NdrFcShort( 0x4 ),      /* 4 */\r
-/* 1000 */     0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
+/* 956 */      NdrFcShort( 0x4 ),      /* 4 */\r
+/* 958 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
                        0x0,            /*  */\r
-/* 1002 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1004 */     NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 1006 */     0x8,            /* FC_LONG */\r
+/* 960 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 962 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
+/* 964 */      0x8,            /* FC_LONG */\r
                        0x5b,           /* FC_END */\r
-/* 1008 */     \r
-                       0x16,           /* FC_PSTRUCT */\r
+/* 966 */      \r
+                       0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 1010 */     NdrFcShort( 0x8 ),      /* 8 */\r
-/* 1012 */     \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 1014 */     \r
-                       0x46,           /* FC_NO_REPEAT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 1016 */     NdrFcShort( 0x4 ),      /* 4 */\r
-/* 1018 */     NdrFcShort( 0x4 ),      /* 4 */\r
-/* 1020 */     0x12, 0x0,      /* FC_UP */\r
-/* 1022 */     NdrFcShort( 0xffe6 ),   /* Offset= -26 (996) */\r
-/* 1024 */     \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 1026 */     0x8,            /* FC_LONG */\r
+/* 968 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 970 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 972 */      NdrFcShort( 0x6 ),      /* Offset= 6 (978) */\r
+/* 974 */      0x8,            /* FC_LONG */\r
+                       0x40,           /* FC_STRUCTPAD4 */\r
+/* 976 */      0x36,           /* FC_POINTER */\r
                        0x5b,           /* FC_END */\r
-/* 1028 */     \r
+/* 978 */      \r
+                       0x12, 0x0,      /* FC_UP */\r
+/* 980 */      NdrFcShort( 0xffe6 ),   /* Offset= -26 (954) */\r
+/* 982 */      \r
                        0x1b,           /* FC_CARRAY */\r
                        0x7,            /* 7 */\r
-/* 1030 */     NdrFcShort( 0x8 ),      /* 8 */\r
-/* 1032 */     0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
+/* 984 */      NdrFcShort( 0x8 ),      /* 8 */\r
+/* 986 */      0x19,           /* Corr desc:  field pointer, FC_ULONG */\r
                        0x0,            /*  */\r
-/* 1034 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1036 */     NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 1038 */     0xb,            /* FC_HYPER */\r
+/* 988 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 990 */      NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
+/* 992 */      0xb,            /* FC_HYPER */\r
                        0x5b,           /* FC_END */\r
-/* 1040 */     \r
-                       0x16,           /* FC_PSTRUCT */\r
+/* 994 */      \r
+                       0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 1042 */     NdrFcShort( 0x8 ),      /* 8 */\r
-/* 1044 */     \r
-                       0x4b,           /* FC_PP */\r
-                       0x5c,           /* FC_PAD */\r
-/* 1046 */     \r
-                       0x46,           /* FC_NO_REPEAT */\r
-                       0x5c,           /* FC_PAD */\r
-/* 1048 */     NdrFcShort( 0x4 ),      /* 4 */\r
-/* 1050 */     NdrFcShort( 0x4 ),      /* 4 */\r
-/* 1052 */     0x12, 0x0,      /* FC_UP */\r
-/* 1054 */     NdrFcShort( 0xffe6 ),   /* Offset= -26 (1028) */\r
-/* 1056 */     \r
-                       0x5b,           /* FC_END */\r
-\r
-                       0x8,            /* FC_LONG */\r
-/* 1058 */     0x8,            /* FC_LONG */\r
+/* 996 */      NdrFcShort( 0x10 ),     /* 16 */\r
+/* 998 */      NdrFcShort( 0x0 ),      /* 0 */\r
+/* 1000 */     NdrFcShort( 0x6 ),      /* Offset= 6 (1006) */\r
+/* 1002 */     0x8,            /* FC_LONG */\r
+                       0x40,           /* FC_STRUCTPAD4 */\r
+/* 1004 */     0x36,           /* FC_POINTER */\r
                        0x5b,           /* FC_END */\r
-/* 1060 */     \r
+/* 1006 */     \r
+                       0x12, 0x0,      /* FC_UP */\r
+/* 1008 */     NdrFcShort( 0xffe6 ),   /* Offset= -26 (982) */\r
+/* 1010 */     \r
                        0x15,           /* FC_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 1062 */     NdrFcShort( 0x8 ),      /* 8 */\r
-/* 1064 */     0x8,            /* FC_LONG */\r
+/* 1012 */     NdrFcShort( 0x8 ),      /* 8 */\r
+/* 1014 */     0x8,            /* FC_LONG */\r
                        0x8,            /* FC_LONG */\r
-/* 1066 */     0x5c,           /* FC_PAD */\r
+/* 1016 */     0x5c,           /* FC_PAD */\r
                        0x5b,           /* FC_END */\r
-/* 1068 */     \r
+/* 1018 */     \r
                        0x1b,           /* FC_CARRAY */\r
                        0x3,            /* 3 */\r
-/* 1070 */     NdrFcShort( 0x8 ),      /* 8 */\r
-/* 1072 */     0x7,            /* Corr desc: FC_USHORT */\r
+/* 1020 */     NdrFcShort( 0x8 ),      /* 8 */\r
+/* 1022 */     0x7,            /* Corr desc: FC_USHORT */\r
                        0x0,            /*  */\r
-/* 1074 */     NdrFcShort( 0xffd8 ),   /* -40 */\r
-/* 1076 */     NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
-/* 1078 */     0x4c,           /* FC_EMBEDDED_COMPLEX */\r
+/* 1024 */     NdrFcShort( 0xffc8 ),   /* -56 */\r
+/* 1026 */     NdrFcShort( 0x1 ),      /* Corr flags:  early, */\r
+/* 1028 */     0x4c,           /* FC_EMBEDDED_COMPLEX */\r
                        0x0,            /* 0 */\r
-/* 1080 */     NdrFcShort( 0xffec ),   /* Offset= -20 (1060) */\r
-/* 1082 */     0x5c,           /* FC_PAD */\r
+/* 1030 */     NdrFcShort( 0xffec ),   /* Offset= -20 (1010) */\r
+/* 1032 */     0x5c,           /* FC_PAD */\r
                        0x5b,           /* FC_END */\r
-/* 1084 */     \r
+/* 1034 */     \r
                        0x1a,           /* FC_BOGUS_STRUCT */\r
                        0x3,            /* 3 */\r
-/* 1086 */     NdrFcShort( 0x28 ),     /* 40 */\r
-/* 1088 */     NdrFcShort( 0xffec ),   /* Offset= -20 (1068) */\r
-/* 1090 */     NdrFcShort( 0x0 ),      /* Offset= 0 (1090) */\r
-/* 1092 */     0x6,            /* FC_SHORT */\r
+/* 1036 */     NdrFcShort( 0x38 ),     /* 56 */\r
+/* 1038 */     NdrFcShort( 0xffec ),   /* Offset= -20 (1018) */\r
+/* 1040 */     NdrFcShort( 0x0 ),      /* Offset= 0 (1040) */\r
+/* 1042 */     0x6,            /* FC_SHORT */\r
                        0x6,            /* FC_SHORT */\r
-/* 1094 */     0x8,            /* FC_LONG */\r
+/* 1044 */     0x8,            /* FC_LONG */\r
                        0x8,            /* FC_LONG */\r
-/* 1096 */     0x4c,           /* FC_EMBEDDED_COMPLEX */\r
-                       0x0,            /* 0 */\r
-/* 1098 */     NdrFcShort( 0xfc1c ),   /* Offset= -996 (102) */\r
-/* 1100 */     0x5c,           /* FC_PAD */\r
+/* 1046 */     0x40,           /* FC_STRUCTPAD4 */\r
+                       0x4c,           /* FC_EMBEDDED_COMPLEX */\r
+/* 1048 */     0x0,            /* 0 */\r
+                       NdrFcShort( 0xfc4d ),   /* Offset= -947 (102) */\r
                        0x5b,           /* FC_END */\r
-/* 1102 */     0xb4,           /* FC_USER_MARSHAL */\r
+/* 1052 */     0xb4,           /* FC_USER_MARSHAL */\r
                        0x83,           /* 131 */\r
-/* 1104 */     NdrFcShort( 0x2 ),      /* 2 */\r
-/* 1106 */     NdrFcShort( 0x4 ),      /* 4 */\r
-/* 1108 */     NdrFcShort( 0x0 ),      /* 0 */\r
-/* 1110 */     NdrFcShort( 0xfc08 ),   /* Offset= -1016 (94) */\r
+/* 1054 */     NdrFcShort( 0x2 ),      /* 2 */\r
+/* 1056 */     NdrFcShort( 0x8 ),      /* 8 */\r
+/* 1058 */     NdrFcShort( 0x0 ),      /* 0 */\r
+/* 1060 */     NdrFcShort( 0xfc3a ),   /* Offset= -966 (94) */\r
 \r
                        0x0\r
         }\r
@@ -1262,8 +1187,8 @@ static const USER_MARSHAL_ROUTINE_QUADRUPLE UserMarshalRoutines[ WIRE_MARSHAL_TA
 static const unsigned short IBugTraqProvider_FormatStringOffsetTable[] =\r
     {\r
     0,\r
-    48,\r
-    96\r
+    50,\r
+    100\r
     };\r
 \r
 static const MIDL_STUBLESS_PROXY_INFO IBugTraqProvider_ProxyInfo =\r
@@ -1316,12 +1241,12 @@ const CInterfaceStubVtbl _IBugTraqProviderStubVtbl =
 static const unsigned short IBugTraqProvider2_FormatStringOffsetTable[] =\r
     {\r
     0,\r
-    48,\r
-    96,\r
-    162,\r
-    234,\r
-    300,\r
-    336\r
+    50,\r
+    100,\r
+    168,\r
+    242,\r
+    310,\r
+    348\r
     };\r
 \r
 static const MIDL_STUBLESS_PROXY_INFO IBugTraqProvider2_ProxyInfo =\r
@@ -1441,11 +1366,10 @@ const ExtendedProxyFileInfo IBugTraqProvider_ProxyFileInfo =
     0, /* Filler2 */\r
     0  /* Filler3 */\r
 };\r
-#pragma optimize("", on )\r
 #if _MSC_VER >= 1200\r
 #pragma warning(pop)\r
 #endif\r
 \r
 \r
-#endif /* !defined(_M_IA64) && !defined(_M_AMD64)*/\r
+#endif /* defined(_M_AMD64)*/\r
 \r
index 16bbce6..9d0cf37 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
+                       Name="Debug|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
                        Name="Release|Win32"\r
                        >\r
                        <DebugSettings\r
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index 964a25a..3feb87f 100644 (file)
@@ -1,6 +1,6 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 10.00\r
-# Visual C++ Express 2008\r
+# Visual Studio 2008\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Git", "Git\Git.vcproj", "{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseProc", "TortoiseProc\TortoiseProc.vcproj", "{50797F06-39C5-4802-8E2B-7B7A4EF03214}"\r
@@ -40,8 +40,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoisePlink", "TortoisePl
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CustomActions", "TortoiseGitSetup\CustomActions\CustomActions.vcproj", "{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IBugTraqProvider", "IBugTraqProvider\IBugTraqProvider.vcproj", "{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseGitBlame", "TortoiseGitBlame\TortoiseGitBlame.vcproj", "{62507C2F-9290-4342-910F-BFC44DF99B01}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37} = {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}\r
@@ -49,9 +47,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseGitBlame", "Tortois
                {A5498556-CE09-4095-8335-08FC8370552D} = {A5498556-CE09-4095-8335-08FC8370552D}\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB} = {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B} = {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}\r
-               {4BE529FB-C2F2-49F7-A897-054B955564CF} = {4BE529FB-C2F2-49F7-A897-054B955564CF}\r
        EndProjectSection\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IBugTraqProvider", "IBugTraqProvider\IBugTraqProvider.vcproj", "{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                debug_static|Mixed Platforms = debug_static|Mixed Platforms\r
@@ -463,6 +462,31 @@ Global
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x64.ActiveCfg = Release|x64\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x64.Build.0 = Release|x64\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x86.ActiveCfg = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x64.ActiveCfg = Debug|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x86.ActiveCfg = Debug|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.Build.0 = Debug|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.ActiveCfg = Debug|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.Build.0 = Debug|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.Build.0 = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x64.ActiveCfg = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x86.ActiveCfg = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.Build.0 = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.ActiveCfg = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.Build.0 = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.ActiveCfg = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x86.ActiveCfg = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Win32.ActiveCfg = Debug|Win32\r
@@ -473,7 +497,8 @@ Global
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|Win32.Build.0 = Debug|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|x64.ActiveCfg = Debug|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|x64.Build.0 = Debug|x64\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Debug|x86.ActiveCfg = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
@@ -487,30 +512,6 @@ Global
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.Build.0 = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.ActiveCfg = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x86.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Win32.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Win32.Build.0 = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x64.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x86.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.Build.0 = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.Build.0 = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x64.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x86.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.Build.0 = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.Build.0 = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.ActiveCfg = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x86.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index 8e8c0f9..ca91d9a 100644 (file)
@@ -12,6 +12,9 @@
                <Platform\r
                        Name="Win32"\r
                />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
                        />\r
                </Configuration>\r
                <Configuration\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\debug64\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="2"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               MkTypLibCompatible="false"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
+                               PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="2"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
+                               LinkIncremental="2"\r
+                               IgnoreDefaultLibraryNames="LIBCMTD"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       OutputDirectory="..\..\bin\Release64\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       UseOfMFC="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               MkTypLibCompatible="false"\r
+                               TargetEnvironment="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
+                               PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"\r
+                               MinimalRebuild="false"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="2"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="17"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="1"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
                                        Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="1"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\TortoiseGitBlame.cpp"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCResourceCompilerTool"\r
+                                               AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
                                        Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCResourceCompilerTool"\r
+                                               AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Making help file..."\r
+                                               CommandLine="start /wait hhc &quot;hlp\TortoiseGitBlame.hhp&quot;&#x0D;&#x0A;if not exist &quot;hlp\TortoiseGitBlame.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;hlp\TortoiseGitBlame.chm&quot; &quot;$(OutDir)\TortoiseGitBlame.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo hlp\TortoiseGitBlame.hhp(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="hlp\HTMLDefines.h"\r
+                                               Outputs="$(OutDir)\$(ProjectName).chm"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
                                        Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Outputs="$(OutDir)\$(ProjectName).chm"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Making help file..."\r
+                                               CommandLine="start /wait hhc &quot;hlp\TortoiseGitBlame.hhp&quot;&#x0D;&#x0A;if not exist &quot;hlp\TortoiseGitBlame.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;hlp\TortoiseGitBlame.chm&quot; &quot;$(OutDir)\TortoiseGitBlame.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo hlp\TortoiseGitBlame.hhp(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="hlp\HTMLDefines.h"\r
+                                               Outputs="$(OutDir)\$(ProjectName).chm"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                </Filter>\r
                <File\r
index d149873..a6fe7ae 100644 (file)
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index 55dd3ea..4ad7b75 100644 (file)
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command=""\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index f8ddd52..dc309cf 100644 (file)
        <!-- Target specific component GUIDs ............................................. -->\r
 \r
        <?if $(var.Platform) = "x64" ?>\r
-       <?define GuidInfoFiles="B776F75C-B019-44b1-957A-3F58D3A225CF"?>\r
+       <?define GuidInfoFiles="78ACAFC6-6F62-4a58-85DC-E4FE52AEA41E"?>\r
        <?define GuidProgramMenuFolder="B776F75C-B019-44b1-957A-3F58D3A225CF"?>\r
 \r
        <?define GuidShellRegistry="9E011A3C-F5D1-47ab-8BE2-443C2FFF9499"?>\r
-       <?define GuidMachineRegistry="9E011A3C-F5D1-47ab-8BE2-443C2FFF9499"?>\r
+       <?define GuidMachineRegistry="E61BA450-C3DF-4ea5-98D4-240E4B05C9C4"?>\r
        <?define GuidApproveShellComponents="E7E43AE0-DB46-4af9-95EA-2EF7AD3F2119"?>\r
        <?define GuidSvnProtocol="0AD2B787-A9B3-4ad7-99A5-EC6DFF0EB2B7"?>\r
        <?define GuidASPNETHack="C9279E7B-3D81-4c9e-962F-987252011A29"?>\r
@@ -96,9 +96,9 @@
        <?define GuidIconsClassic="1123191B-D931-49ae-A6D0-551CC82B8E83"?>\r
        <?define GuidIconsCVSClassic="5D337941-A1FA-46a4-9B23-B6EDB133D97C"?>\r
        <?define GuidIconsModern="4C840CEE-A967-4784-AF1C-617757D60DBB"?>\r
-       <?define GuidIconsXPStyle="53FBA4D1-B436-4f1c-875C-0A7FA18002FE"?>\r
-       <?define GuidIconsMarkPhippard="53FBA4D1-B436-4f1c-875C-0A7FA18002FE"?>\r
-       <?define GuidIconsStraight="53FBA4D1-B436-4f1c-875C-0A7FA18002FE"?>\r
+       <?define GuidIconsXPStyle="96412A1D-3EE2-4874-8CFC-8EF4D0E36467"?>\r
+       <?define GuidIconsMarkPhippard="9151E386-6DD8-45a8-8C04-EBEBD9D8E179"?>\r
+       <?define GuidIconsStraight="669EE534-B358-489e-AD81-544A32172FE7"?>\r
 \r
        <?else?>\r
 \r
index 0d7e285..8e15097 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
                        Name="Debug|Win32"\r
                        >\r
                        <DebugSettings\r
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index aa7f0de..b6d8594 100644 (file)
@@ -48,7 +48,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="2"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\Debug64\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseProc\Debug64"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
+                       UseOfATL="0"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                MkTypLibCompatible="false"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="1"\r
-                               InlineFunctionExpansion="1"\r
-                               FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
-                               PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
-                               StringPooling="true"\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
+                               PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="2"\r
-                               RuntimeLibrary="2"\r
-                               BufferSecurityCheck="false"\r
+                               RuntimeLibrary="3"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;..\TortoiseShell"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="0"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
-                               Profile="true"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="..\..\bin\Debug64\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseProc\Debug64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
-                       UseOfATL="0"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                MkTypLibCompatible="false"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r
-                               PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
-                               MinimalRebuild="true"\r
+                               Optimization="1"\r
+                               InlineFunctionExpansion="1"\r
+                               FavorSizeOrSpeed="2"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
+                               PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
+                               StringPooling="true"\r
+                               MinimalRebuild="false"\r
                                ExceptionHandling="2"\r
-                               RuntimeLibrary="3"\r
+                               RuntimeLibrary="2"\r
+                               BufferSecurityCheck="false"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;..\TortoiseShell"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
-                               LinkIncremental="2"\r
-                               IgnoreDefaultLibraryNames="shell32;msvcrt.lib"\r
+                               LinkIncremental="1"\r
+                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="0"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
+                               Profile="true"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                                Optimization="1"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
                                PreprocessorDefinitions="WIN64;_WINDOWS;NDEBUG;THESAURUS"\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
                                LinkIncremental="1"\r
-                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;"\r
+                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Release|Win32"\r
+                               Name="Debug|x64"\r
                                >\r
                                <Tool\r
                                        Name="VCCLCompilerTool"\r
                                />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Debug|x64"\r
+                               Name="Release|Win32"\r
                                >\r
                                <Tool\r
                                        Name="VCCLCompilerTool"\r
index 271096d..c2f3d52 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
+                       Name="Debug|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
                        Name="Release|Win32"\r
                        >\r
                        <DebugSettings\r
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r
index ce8ddfa..21040b3 100644 (file)
                                Name="VCLinkerTool"\r
                                IgnoreImportLibrary="true"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
-                               OutputFile="$(OutDir)/TortoiseSVN.dll"\r
+                               OutputFile="$(OutDir)/TortoiseGit.dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                IgnoreDefaultLibraryNames="libcd, libc, shell32"\r
index 07d7a27..d5c47d5 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
+                       UseOfATL="1"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
-                       UseOfATL="1"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell"\r
+                               AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
index 55dd3ea..4ad7b75 100644 (file)
                                MPIAcceptFilter=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       >\r
+                       <DebugSettings\r
+                               Command=""\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="B20596-02"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
 </VisualStudioUserFile>\r