Changeset 181


Ignore:
Timestamp:
Jun 16, 2013, 1:30:06 AM (8 years ago)
Author:
roman
Message:

server is set to run as DLL surrogate, added x64 build

Location:
trunk/Utilities/Miscellaneous/NullBstrArgument
Files:
13 added
5 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Utilities/Miscellaneous/NullBstrArgument

    • Property svn:ignore
      •  

        old new  
        11*.suo
         2_Bin
         3ipch
         4*.sdf
  • trunk/Utilities/Miscellaneous/NullBstrArgument/Application/Application.cpp

    r180 r181  
    1414        {
    1515                CComPtr<IFoo> pFoo;
    16                 A(pFoo.CoCreateInstance(__uuidof(Foo)));
     16                A(pFoo.CoCreateInstance(__uuidof(Foo), NULL, CLSCTX_LOCAL_SERVER));
    1717                CComBSTR sValue;
    1818                sValue = "Application";
  • trunk/Utilities/Miscellaneous/NullBstrArgument/Application/Application.vcxproj

    r180 r181  
    66      <Platform>Win32</Platform>
    77    </ProjectConfiguration>
     8    <ProjectConfiguration Include="Debug|x64">
     9      <Configuration>Debug</Configuration>
     10      <Platform>x64</Platform>
     11    </ProjectConfiguration>
    812    <ProjectConfiguration Include="Release|Win32">
    913      <Configuration>Release</Configuration>
    1014      <Platform>Win32</Platform>
     15    </ProjectConfiguration>
     16    <ProjectConfiguration Include="Release|x64">
     17      <Configuration>Release</Configuration>
     18      <Platform>x64</Platform>
    1119    </ProjectConfiguration>
    1220  </ItemGroup>
     
    2432    <UseOfAtl>Static</UseOfAtl>
    2533  </PropertyGroup>
     34  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     35    <ConfigurationType>Application</ConfigurationType>
     36    <UseDebugLibraries>true</UseDebugLibraries>
     37    <PlatformToolset>v100</PlatformToolset>
     38    <CharacterSet>Unicode</CharacterSet>
     39    <UseOfAtl>Static</UseOfAtl>
     40  </PropertyGroup>
    2641  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     42    <ConfigurationType>Application</ConfigurationType>
     43    <UseDebugLibraries>false</UseDebugLibraries>
     44    <PlatformToolset>v100</PlatformToolset>
     45    <WholeProgramOptimization>true</WholeProgramOptimization>
     46    <CharacterSet>Unicode</CharacterSet>
     47    <UseOfAtl>Static</UseOfAtl>
     48  </PropertyGroup>
     49  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    2750    <ConfigurationType>Application</ConfigurationType>
    2851    <UseDebugLibraries>false</UseDebugLibraries>
     
    3861    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3962  </ImportGroup>
     63  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     64    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     65  </ImportGroup>
    4066  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     67    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     68  </ImportGroup>
     69  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    4170    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4271  </ImportGroup>
     
    4473  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    4574    <LinkIncremental>true</LinkIncremental>
     75    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     76    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
     77  </PropertyGroup>
     78  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     79    <LinkIncremental>true</LinkIncremental>
     80    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     81    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
    4682  </PropertyGroup>
    4783  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    4884    <LinkIncremental>false</LinkIncremental>
     85    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     86    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
     87  </PropertyGroup>
     88  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     89    <LinkIncremental>false</LinkIncremental>
     90    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     91    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
    4992  </PropertyGroup>
    5093  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     94    <ClCompile>
     95      <PrecompiledHeader>Use</PrecompiledHeader>
     96      <WarningLevel>Level3</WarningLevel>
     97      <Optimization>Disabled</Optimization>
     98      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     99      <SDLCheck>true</SDLCheck>
     100    </ClCompile>
     101    <Link>
     102      <SubSystem>Console</SubSystem>
     103      <GenerateDebugInformation>true</GenerateDebugInformation>
     104    </Link>
     105  </ItemDefinitionGroup>
     106  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    51107    <ClCompile>
    52108      <PrecompiledHeader>Use</PrecompiledHeader>
     
    78134    </Link>
    79135  </ItemDefinitionGroup>
     136  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     137    <ClCompile>
     138      <WarningLevel>Level3</WarningLevel>
     139      <PrecompiledHeader>Use</PrecompiledHeader>
     140      <Optimization>MaxSpeed</Optimization>
     141      <FunctionLevelLinking>true</FunctionLevelLinking>
     142      <IntrinsicFunctions>true</IntrinsicFunctions>
     143      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     144      <SDLCheck>true</SDLCheck>
     145    </ClCompile>
     146    <Link>
     147      <SubSystem>Console</SubSystem>
     148      <GenerateDebugInformation>true</GenerateDebugInformation>
     149      <EnableCOMDATFolding>true</EnableCOMDATFolding>
     150      <OptimizeReferences>true</OptimizeReferences>
     151    </Link>
     152  </ItemDefinitionGroup>
    80153  <ItemGroup>
    81154    <Text Include="ReadMe.txt" />
     
    89162    <ClCompile Include="stdafx.cpp">
    90163      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
     164      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
    91165      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     166      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
    92167    </ClCompile>
    93168  </ItemGroup>
  • trunk/Utilities/Miscellaneous/NullBstrArgument/Library/Library.idl

    r180 r181  
    99        object,
    1010        uuid(955C1132-96DC-4221-86A3-BE4C8CEB698C),
    11         dual,
     11        //dual,
    1212        //oleautomation,
    13         //nonextensible,
     13        nonextensible,
    1414        pointer_default(unique)
    1515]
  • trunk/Utilities/Miscellaneous/NullBstrArgument/Library/Library.rgs

    r180 r181  
    11HKCR
    22{
     3        NoRemove AppID
     4        {
     5                ForceRemove {376B7D27-4AD3-47F6-AC02-D2DDE9E5A9B6} = s 'NULL BSTR Foo Class App'
     6                {
     7                        val DLLSurrogate = s ''
     8                }
     9        }
    310}
  • trunk/Utilities/Miscellaneous/NullBstrArgument/Library/Library.vcxproj

    r180 r181  
    66      <Platform>Win32</Platform>
    77    </ProjectConfiguration>
     8    <ProjectConfiguration Include="Debug|x64">
     9      <Configuration>Debug</Configuration>
     10      <Platform>x64</Platform>
     11    </ProjectConfiguration>
    812    <ProjectConfiguration Include="Release|Win32">
    913      <Configuration>Release</Configuration>
    1014      <Platform>Win32</Platform>
     15    </ProjectConfiguration>
     16    <ProjectConfiguration Include="Release|x64">
     17      <Configuration>Release</Configuration>
     18      <Platform>x64</Platform>
    1119    </ProjectConfiguration>
    1220  </ItemGroup>
     
    2331    <CharacterSet>Unicode</CharacterSet>
    2432  </PropertyGroup>
     33  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     34    <ConfigurationType>DynamicLibrary</ConfigurationType>
     35    <UseDebugLibraries>true</UseDebugLibraries>
     36    <PlatformToolset>v100</PlatformToolset>
     37    <UseOfAtl>Dynamic</UseOfAtl>
     38    <CharacterSet>Unicode</CharacterSet>
     39  </PropertyGroup>
    2540  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2641    <ConfigurationType>DynamicLibrary</ConfigurationType>
     
    3045    <CharacterSet>Unicode</CharacterSet>
    3146  </PropertyGroup>
     47  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     48    <ConfigurationType>DynamicLibrary</ConfigurationType>
     49    <UseDebugLibraries>false</UseDebugLibraries>
     50    <PlatformToolset>v100</PlatformToolset>
     51    <UseOfAtl>Dynamic</UseOfAtl>
     52    <CharacterSet>Unicode</CharacterSet>
     53  </PropertyGroup>
    3254  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    3355  <ImportGroup Label="ExtensionSettings">
     
    3658    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3759  </ImportGroup>
     60  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     61    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     62  </ImportGroup>
    3863  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     64    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     65  </ImportGroup>
     66  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    3967    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4068  </ImportGroup>
     
    4371    <IgnoreImportLibrary>true</IgnoreImportLibrary>
    4472    <LinkIncremental>true</LinkIncremental>
     73    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     74    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
     75  </PropertyGroup>
     76  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     77    <IgnoreImportLibrary>true</IgnoreImportLibrary>
     78    <LinkIncremental>true</LinkIncremental>
     79    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     80    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
    4581  </PropertyGroup>
    4682  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    4783    <IgnoreImportLibrary>true</IgnoreImportLibrary>
    4884    <LinkIncremental>false</LinkIncremental>
     85    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     86    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
     87  </PropertyGroup>
     88  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     89    <IgnoreImportLibrary>true</IgnoreImportLibrary>
     90    <LinkIncremental>false</LinkIncremental>
     91    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     92    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
    4993  </PropertyGroup>
    5094  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     
    5599      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    56100      <SDLCheck>true</SDLCheck>
     101      <AdditionalIncludeDirectories>.;$(PlatformName)</AdditionalIncludeDirectories>
    57102    </ClCompile>
    58103    <Midl>
    59104      <TargetEnvironment>Win32</TargetEnvironment>
    60105      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    61       <HeaderFileName>Library_i.h</HeaderFileName>
    62       <InterfaceIdentifierFileName>Library_i.c</InterfaceIdentifierFileName>
    63       <ProxyFileName>Library_p.c</ProxyFileName>
     106      <HeaderFileName>$(PlatformName)\$(TargetName)_i.h</HeaderFileName>
     107      <InterfaceIdentifierFileName>$(PlatformName)\$(TargetName)_i.c</InterfaceIdentifierFileName>
     108      <ProxyFileName>$(PlatformName)\$(TargetName)_p.c</ProxyFileName>
    64109      <GenerateStublessProxies>true</GenerateStublessProxies>
    65       <TypeLibraryName>$(IntDir)Library.tlb</TypeLibraryName>
    66       <DllDataFileName />
     110      <TypeLibraryName>$(IntDir)$(TargetName).tlb</TypeLibraryName>
     111      <DllDataFileName>$(PlatformName)\dlldata.c</DllDataFileName>
    67112      <ValidateAllParameters>true</ValidateAllParameters>
    68113      <MkTypLibCompatible>false</MkTypLibCompatible>
     114    </Midl>
     115    <ResourceCompile>
     116      <Culture>0x0409</Culture>
     117      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     118      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     119    </ResourceCompile>
     120    <Link>
     121      <SubSystem>Windows</SubSystem>
     122      <ModuleDefinitionFile>.\Library.def</ModuleDefinitionFile>
     123      <GenerateDebugInformation>true</GenerateDebugInformation>
     124      <RegisterOutput>true</RegisterOutput>
     125    </Link>
     126  </ItemDefinitionGroup>
     127  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     128    <ClCompile>
     129      <PrecompiledHeader>Use</PrecompiledHeader>
     130      <WarningLevel>Level3</WarningLevel>
     131      <Optimization>Disabled</Optimization>
     132      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     133      <SDLCheck>true</SDLCheck>
     134      <AdditionalIncludeDirectories>.;$(PlatformName)</AdditionalIncludeDirectories>
     135    </ClCompile>
     136    <Midl>
     137      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     138      <HeaderFileName>$(PlatformName)\$(TargetName)_i.h</HeaderFileName>
     139      <InterfaceIdentifierFileName>$(PlatformName)\$(TargetName)_i.c</InterfaceIdentifierFileName>
     140      <ProxyFileName>$(PlatformName)\$(TargetName)_p.c</ProxyFileName>
     141      <GenerateStublessProxies>true</GenerateStublessProxies>
     142      <TypeLibraryName>$(IntDir)$(TargetName).tlb</TypeLibraryName>
     143      <DllDataFileName>$(PlatformName)\dlldata.c</DllDataFileName>
     144      <MkTypLibCompatible>false</MkTypLibCompatible>
     145      <TargetEnvironment>X64</TargetEnvironment>
    69146    </Midl>
    70147    <ResourceCompile>
     
    87164      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    88165      <SDLCheck>true</SDLCheck>
     166      <AdditionalIncludeDirectories>.;$(PlatformName)</AdditionalIncludeDirectories>
    89167    </ClCompile>
    90168    <Midl>
     
    92170      <TargetEnvironment>Win32</TargetEnvironment>
    93171      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    94       <HeaderFileName>Library_i.h</HeaderFileName>
    95       <InterfaceIdentifierFileName>Library_i.c</InterfaceIdentifierFileName>
    96       <ProxyFileName>Library_p.c</ProxyFileName>
     172      <HeaderFileName>$(PlatformName)\$(TargetName)_i.h</HeaderFileName>
     173      <InterfaceIdentifierFileName>$(PlatformName)\$(TargetName)_i.c</InterfaceIdentifierFileName>
     174      <ProxyFileName>$(PlatformName)\$(TargetName)_p.c</ProxyFileName>
    97175      <GenerateStublessProxies>true</GenerateStublessProxies>
    98       <TypeLibraryName>$(IntDir)Library.tlb</TypeLibraryName>
    99       <DllDataFileName />
     176      <TypeLibraryName>$(IntDir)$(TargetName).tlb</TypeLibraryName>
     177      <DllDataFileName>$(PlatformName)\dlldata.c</DllDataFileName>
    100178      <ValidateAllParameters>true</ValidateAllParameters>
    101179    </Midl>
     
    114192    </Link>
    115193  </ItemDefinitionGroup>
     194  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     195    <ClCompile>
     196      <PrecompiledHeader>Use</PrecompiledHeader>
     197      <WarningLevel>Level3</WarningLevel>
     198      <Optimization>MaxSpeed</Optimization>
     199      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     200      <SDLCheck>true</SDLCheck>
     201      <AdditionalIncludeDirectories>.;$(PlatformName)</AdditionalIncludeDirectories>
     202    </ClCompile>
     203    <Midl>
     204      <MkTypLibCompatible>false</MkTypLibCompatible>
     205      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     206      <HeaderFileName>$(PlatformName)\$(TargetName)_i.h</HeaderFileName>
     207      <InterfaceIdentifierFileName>$(PlatformName)\$(TargetName)_i.c</InterfaceIdentifierFileName>
     208      <ProxyFileName>$(PlatformName)\$(TargetName)_p.c</ProxyFileName>
     209      <GenerateStublessProxies>true</GenerateStublessProxies>
     210      <TypeLibraryName>$(IntDir)$(TargetName).tlb</TypeLibraryName>
     211      <DllDataFileName>$(PlatformName)\dlldata.c</DllDataFileName>
     212      <TargetEnvironment>X64</TargetEnvironment>
     213    </Midl>
     214    <ResourceCompile>
     215      <Culture>0x0409</Culture>
     216      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     217      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     218    </ResourceCompile>
     219    <Link>
     220      <SubSystem>Windows</SubSystem>
     221      <ModuleDefinitionFile>.\Library.def</ModuleDefinitionFile>
     222      <GenerateDebugInformation>true</GenerateDebugInformation>
     223      <EnableCOMDATFolding>true</EnableCOMDATFolding>
     224      <OptimizeReferences>true</OptimizeReferences>
     225      <RegisterOutput>true</RegisterOutput>
     226    </Link>
     227  </ItemDefinitionGroup>
    116228  <ItemGroup>
    117229    <ClCompile Include="dllmain.cpp">
    118230      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
     231      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
    119232      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    120233      </PrecompiledHeader>
     234      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     235      </PrecompiledHeader>
    121236      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
     237      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
    122238      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    123239      </PrecompiledHeader>
     240      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     241      </PrecompiledHeader>
    124242    </ClCompile>
    125243    <ClCompile Include="Foo.cpp" />
    126244    <ClCompile Include="Library.cpp" />
    127     <ClCompile Include="Library_i.c">
     245    <ClCompile Include="Win32\Library_i.c">
     246      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     247      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     248      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
     249      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
     250      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
     251      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     252    </ClCompile>
     253    <ClCompile Include="x64\Library_i.c">
    128254      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
    129       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    130       </PrecompiledHeader>
     255      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
     256      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
     257      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
    131258      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
    132       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    133       </PrecompiledHeader>
     259      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
     260      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
     261      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     262      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     263      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    134264    </ClCompile>
    135265    <ClCompile Include="stdafx.cpp">
    136266      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
     267      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
    137268      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     269      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
    138270    </ClCompile>
    139271  </ItemGroup>
     
    141273    <ClInclude Include="dllmain.h" />
    142274    <ClInclude Include="Foo.h" />
    143     <ClInclude Include="Library_i.h" />
     275    <ClInclude Include="Win32\Library_i.h">
     276      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     277      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     278    </ClInclude>
     279    <ClInclude Include="x64\Library_i.h">
     280      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     281      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     282    </ClInclude>
    144283    <ClInclude Include="Resource.h" />
    145284    <ClInclude Include="stdafx.h" />
     
    150289  </ItemGroup>
    151290  <ItemGroup>
    152     <None Include="Foo1.rgs" />
     291    <None Include="Foo.rgs" />
    153292    <None Include="Library.def" />
    154293    <None Include="Library.rgs" />
  • trunk/Utilities/Miscellaneous/NullBstrArgument/Library/Library.vcxproj.filters

    r180 r181  
    1818      <SourceControlFiles>False</SourceControlFiles>
    1919    </Filter>
     20    <Filter Include="Generated Files\x64">
     21      <UniqueIdentifier>{0607d9c8-95c9-4c03-907b-7a9a9e3de226}</UniqueIdentifier>
     22    </Filter>
     23    <Filter Include="Generated Files\Win32">
     24      <UniqueIdentifier>{b7c20917-d804-4dcd-a53b-c700a69ac4b6}</UniqueIdentifier>
     25    </Filter>
    2026  </ItemGroup>
    2127  <ItemGroup>
     
    2935      <Filter>Source Files</Filter>
    3036    </ClCompile>
    31     <ClCompile Include="Library_i.c">
    32       <Filter>Generated Files</Filter>
    33     </ClCompile>
    3437    <ClCompile Include="Foo.cpp">
    3538      <Filter>Source Files</Filter>
     39    </ClCompile>
     40    <ClCompile Include="x64\Library_i.c">
     41      <Filter>Generated Files\x64</Filter>
     42    </ClCompile>
     43    <ClCompile Include="Win32\Library_i.c">
     44      <Filter>Generated Files\Win32</Filter>
    3645    </ClCompile>
    3746  </ItemGroup>
     
    4958      <Filter>Header Files</Filter>
    5059    </ClInclude>
    51     <ClInclude Include="Library_i.h">
    52       <Filter>Generated Files</Filter>
    53     </ClInclude>
    5460    <ClInclude Include="Foo.h">
    5561      <Filter>Header Files</Filter>
     62    </ClInclude>
     63    <ClInclude Include="x64\Library_i.h">
     64      <Filter>Generated Files\x64</Filter>
     65    </ClInclude>
     66    <ClInclude Include="Win32\Library_i.h">
     67      <Filter>Generated Files\Win32</Filter>
    5668    </ClInclude>
    5769  </ItemGroup>
     
    6880      <Filter>Source Files</Filter>
    6981    </None>
    70     <None Include="Foo1.rgs">
     82    <None Include="Foo.rgs">
    7183      <Filter>Resource Files</Filter>
    7284    </None>
  • trunk/Utilities/Miscellaneous/NullBstrArgument/Library/LibraryPS.vcxproj

    r180 r181  
    66      <Platform>Win32</Platform>
    77    </ProjectConfiguration>
     8    <ProjectConfiguration Include="Debug|x64">
     9      <Configuration>Debug</Configuration>
     10      <Platform>x64</Platform>
     11    </ProjectConfiguration>
    812    <ProjectConfiguration Include="Release|Win32">
    913      <Configuration>Release</Configuration>
    1014      <Platform>Win32</Platform>
     15    </ProjectConfiguration>
     16    <ProjectConfiguration Include="Release|x64">
     17      <Configuration>Release</Configuration>
     18      <Platform>x64</Platform>
    1119    </ProjectConfiguration>
    1220  </ItemGroup>
     
    2230    <CharacterSet>Unicode</CharacterSet>
    2331  </PropertyGroup>
     32  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     33    <ConfigurationType>DynamicLibrary</ConfigurationType>
     34    <UseDebugLibraries>true</UseDebugLibraries>
     35    <PlatformToolset>v100</PlatformToolset>
     36    <CharacterSet>Unicode</CharacterSet>
     37  </PropertyGroup>
    2438  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     39    <ConfigurationType>DynamicLibrary</ConfigurationType>
     40    <UseDebugLibraries>false</UseDebugLibraries>
     41    <PlatformToolset>v100</PlatformToolset>
     42    <CharacterSet>Unicode</CharacterSet>
     43  </PropertyGroup>
     44  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    2545    <ConfigurationType>DynamicLibrary</ConfigurationType>
    2646    <UseDebugLibraries>false</UseDebugLibraries>
     
    3454    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3555  </ImportGroup>
     56  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     57    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     58  </ImportGroup>
    3659  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     60    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     61  </ImportGroup>
     62  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    3763    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    3864  </ImportGroup>
    3965  <PropertyGroup Label="UserMacros" />
    4066  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    41     <IntDir>$(Configuration)PS\</IntDir>
     67    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
     68    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     69  </PropertyGroup>
     70  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     71    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     72    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
    4273  </PropertyGroup>
    4374  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    44     <IntDir>$(Configuration)PS\</IntDir>
     75    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
     76    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     77  </PropertyGroup>
     78  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     79    <OutDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\</OutDir>
     80    <IntDir>$(SolutionDir)_Bin\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
    4581  </PropertyGroup>
    4682  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    4783    <ClCompile>
    4884      <PreprocessorDefinitions>WIN32;REGISTER_PROXY_DLL;_DEBUG;%(PreprocessorDefinitions); REGISTER_PROXY_DLL</PreprocessorDefinitions>
     85      <AdditionalIncludeDirectories>.;$(PlatformName)</AdditionalIncludeDirectories>
    4986    </ClCompile>
    5087    <Link>
     
    5491    </Link>
    5592    <PreBuildEvent>
    56       <Command>if exist dlldata.c goto :END
     93      <Command>if exist Win32\dlldata.c goto :END
     94echo Error: MIDL will not generate DLLDATA.C unless you have at least 1 interface in the main project.
     95Exit 1
     96:END
     97</Command>
     98      <Message>Checking for required files</Message>
     99    </PreBuildEvent>
     100  </ItemDefinitionGroup>
     101  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     102    <ClCompile>
     103      <PreprocessorDefinitions>WIN32;REGISTER_PROXY_DLL;_DEBUG;%(PreprocessorDefinitions); REGISTER_PROXY_DLL</PreprocessorDefinitions>
     104      <AdditionalIncludeDirectories>.;$(PlatformName)</AdditionalIncludeDirectories>
     105    </ClCompile>
     106    <Link>
     107      <AdditionalDependencies>kernel32.lib;rpcns4.lib;rpcrt4.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
     108      <ModuleDefinitionFile>LibraryPS.def</ModuleDefinitionFile>
     109      <RegisterOutput>true</RegisterOutput>
     110    </Link>
     111    <PreBuildEvent>
     112      <Command>if exist x64\dlldata.c goto :END
    57113echo Error: MIDL will not generate DLLDATA.C unless you have at least 1 interface in the main project.
    58114Exit 1
     
    66122      <Optimization>MaxSpeed</Optimization>
    67123      <PreprocessorDefinitions>WIN32;REGISTER_PROXY_DLL;NDEBUG;%(PreprocessorDefinitions); REGISTER_PROXY_DLL</PreprocessorDefinitions>
     124      <AdditionalIncludeDirectories>.;$(PlatformName)</AdditionalIncludeDirectories>
    68125    </ClCompile>
    69126    <Link>
     
    75132    </Link>
    76133    <PreBuildEvent>
    77       <Command>if exist dlldata.c goto :END
     134      <Command>if exist Win32\dlldata.c goto :END
     135echo Error: MIDL will not generate DLLDATA.C unless you have at least 1 interface in the main project.
     136Exit 1
     137:END
     138</Command>
     139      <Message>Checking for required files</Message>
     140    </PreBuildEvent>
     141  </ItemDefinitionGroup>
     142  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     143    <ClCompile>
     144      <Optimization>MaxSpeed</Optimization>
     145      <PreprocessorDefinitions>WIN32;REGISTER_PROXY_DLL;NDEBUG;%(PreprocessorDefinitions); REGISTER_PROXY_DLL</PreprocessorDefinitions>
     146      <AdditionalIncludeDirectories>.;$(PlatformName)</AdditionalIncludeDirectories>
     147    </ClCompile>
     148    <Link>
     149      <AdditionalDependencies>kernel32.lib;rpcns4.lib;rpcrt4.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies)</AdditionalDependencies>
     150      <ModuleDefinitionFile>LibraryPS.def</ModuleDefinitionFile>
     151      <EnableCOMDATFolding>true</EnableCOMDATFolding>
     152      <OptimizeReferences>true</OptimizeReferences>
     153      <RegisterOutput>true</RegisterOutput>
     154    </Link>
     155    <PreBuildEvent>
     156      <Command>if exist x64\dlldata.c goto :END
    78157echo Error: MIDL will not generate DLLDATA.C unless you have at least 1 interface in the main project.
    79158Exit 1
     
    87166  </ItemGroup>
    88167  <ItemGroup>
    89     <ClCompile Include="dlldata.c" />
    90     <ClCompile Include="Library_i.c" />
    91     <ClCompile Include="Library_p.c" />
     168    <ClCompile Include="Win32\dlldata.c">
     169      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     170      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     171    </ClCompile>
     172    <ClCompile Include="Win32\Library_i.c">
     173      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     174      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     175    </ClCompile>
     176    <ClCompile Include="Win32\Library_p.c">
     177      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     178      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     179    </ClCompile>
     180    <ClCompile Include="x64\dlldata.c">
     181      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     182      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     183    </ClCompile>
     184    <ClCompile Include="x64\Library_i.c">
     185      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     186      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     187    </ClCompile>
     188    <ClCompile Include="x64\Library_p.c">
     189      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     190      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     191    </ClCompile>
    92192  </ItemGroup>
    93193  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  • trunk/Utilities/Miscellaneous/NullBstrArgument/Library/LibraryPS.vcxproj.filters

    r180 r181  
    99      <SourceControlFiles>False</SourceControlFiles>
    1010    </Filter>
     11    <Filter Include="Generated Files\x64">
     12      <UniqueIdentifier>{2b7d08ea-c975-4261-a83b-f645c765e8f7}</UniqueIdentifier>
     13    </Filter>
     14    <Filter Include="Generated Files\Win32">
     15      <UniqueIdentifier>{b7d7de73-72be-4d61-8580-3bc8cac5cf76}</UniqueIdentifier>
     16    </Filter>
    1117  </ItemGroup>
    1218  <ItemGroup>
     
    1420  </ItemGroup>
    1521  <ItemGroup>
    16     <ClCompile Include="Library_i.c">
    17       <Filter>Generated Files</Filter>
     22    <ClCompile Include="x64\dlldata.c">
     23      <Filter>Generated Files\x64</Filter>
    1824    </ClCompile>
    19     <ClCompile Include="Library_p.c">
    20       <Filter>Generated Files</Filter>
     25    <ClCompile Include="x64\Library_i.c">
     26      <Filter>Generated Files\x64</Filter>
    2127    </ClCompile>
    22     <ClCompile Include="dlldata.c">
    23       <Filter>Generated Files</Filter>
     28    <ClCompile Include="x64\Library_p.c">
     29      <Filter>Generated Files\x64</Filter>
     30    </ClCompile>
     31    <ClCompile Include="Win32\dlldata.c">
     32      <Filter>Generated Files\Win32</Filter>
     33    </ClCompile>
     34    <ClCompile Include="Win32\Library_i.c">
     35      <Filter>Generated Files\Win32</Filter>
     36    </ClCompile>
     37    <ClCompile Include="Win32\Library_p.c">
     38      <Filter>Generated Files\Win32</Filter>
    2439    </ClCompile>
    2540  </ItemGroup>
  • trunk/Utilities/Miscellaneous/NullBstrArgument/NullBstrArgument.sln

    r180 r181  
    1818        GlobalSection(SolutionConfigurationPlatforms) = preSolution
    1919                Debug|Win32 = Debug|Win32
     20                Debug|x64 = Debug|x64
    2021                Release|Win32 = Release|Win32
     22                Release|x64 = Release|x64
    2123        EndGlobalSection
    2224        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    2325                {69B9CB89-3F1B-4310-B5A9-7ACA272F65EC}.Debug|Win32.ActiveCfg = Debug|Win32
    24                 {69B9CB89-3F1B-4310-B5A9-7ACA272F65EC}.Debug|Win32.Build.0 = Debug|Win32
     26                {69B9CB89-3F1B-4310-B5A9-7ACA272F65EC}.Debug|x64.ActiveCfg = Debug|x64
    2527                {69B9CB89-3F1B-4310-B5A9-7ACA272F65EC}.Release|Win32.ActiveCfg = Release|Win32
    2628                {69B9CB89-3F1B-4310-B5A9-7ACA272F65EC}.Release|Win32.Build.0 = Release|Win32
     29                {69B9CB89-3F1B-4310-B5A9-7ACA272F65EC}.Release|x64.ActiveCfg = Release|x64
     30                {69B9CB89-3F1B-4310-B5A9-7ACA272F65EC}.Release|x64.Build.0 = Release|x64
    2731                {59FD4D2F-2D6C-4AA8-8B9C-5D0A5C332625}.Debug|Win32.ActiveCfg = Debug|Win32
     32                {59FD4D2F-2D6C-4AA8-8B9C-5D0A5C332625}.Debug|x64.ActiveCfg = Debug|x64
    2833                {59FD4D2F-2D6C-4AA8-8B9C-5D0A5C332625}.Release|Win32.ActiveCfg = Release|Win32
    2934                {59FD4D2F-2D6C-4AA8-8B9C-5D0A5C332625}.Release|Win32.Build.0 = Release|Win32
     35                {59FD4D2F-2D6C-4AA8-8B9C-5D0A5C332625}.Release|x64.ActiveCfg = Release|x64
    3036                {E71F3F2E-81A3-4888-B125-8910D94DD2F4}.Debug|Win32.ActiveCfg = Debug|Win32
    3137                {E71F3F2E-81A3-4888-B125-8910D94DD2F4}.Debug|Win32.Build.0 = Debug|Win32
     38                {E71F3F2E-81A3-4888-B125-8910D94DD2F4}.Debug|x64.ActiveCfg = Debug|x64
     39                {E71F3F2E-81A3-4888-B125-8910D94DD2F4}.Debug|x64.Build.0 = Debug|x64
    3240                {E71F3F2E-81A3-4888-B125-8910D94DD2F4}.Release|Win32.ActiveCfg = Release|Win32
    3341                {E71F3F2E-81A3-4888-B125-8910D94DD2F4}.Release|Win32.Build.0 = Release|Win32
     42                {E71F3F2E-81A3-4888-B125-8910D94DD2F4}.Release|x64.ActiveCfg = Release|x64
     43                {E71F3F2E-81A3-4888-B125-8910D94DD2F4}.Release|x64.Build.0 = Release|x64
    3444        EndGlobalSection
    3545        GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.