microsoft
/
xlang
зеркало из https://github.com/microsoft/xlang.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Move to OS based dispenser (#780)

This commit is contained in:
JohnMcPMS 2022-11-17 13:44:43 -08:00 коммит произвёл GitHub
Родитель 8b8e7a19c2
Коммит cfe510d0d2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 12 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
src/UndockedRegFreeWinRT/ManifestParserTest/ManifestParserTest.vcxproj
Просмотреть файл

@ -99,7 +99,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;Rometadata.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -115,7 +115,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;Rometadata.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -131,7 +131,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;Rometadata.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -151,7 +151,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;Rometadata.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@ -221,4 +221,4 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
</Target>
</Project>
</Project>

8
src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj
Просмотреть файл

@ -109,7 +109,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;</AdditionalDependencies>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;Rometadata.lib</AdditionalDependencies>
<ModuleDefinitionFile>winrtact.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
@ -128,7 +128,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;</AdditionalDependencies>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;Rometadata.lib</AdditionalDependencies>
<ModuleDefinitionFile>winrtact.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
@ -151,7 +151,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;</AdditionalDependencies>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;Rometadata.lib</AdditionalDependencies>
<ModuleDefinitionFile>winrtact.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>
@ -174,7 +174,7 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;</AdditionalDependencies>
<AdditionalDependencies>comsuppw.lib;shlwapi.lib;xmllite.lib;runtimeobject.lib;Pathcch.lib;Rometadata.lib</AdditionalDependencies>
<ModuleDefinitionFile>winrtact.def</ModuleDefinitionFile>
</Link>
</ItemDefinitionGroup>

5
src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/catalog.cpp
Просмотреть файл

@ -14,6 +14,7 @@
#include <codecvt>
#include <locale>
#include <RoMetadataApi.h>
#include <RoMetadata.h>
#include <algorithm>
#include "catalog.h"
#include "TypeResolution.h"
@ -383,9 +384,7 @@ HRESULT WinRTGetMetadataFile(
// will create an instance of the metadata reader to dispense metadata files.
if (metaDataDispenser == nullptr)
{
RETURN_IF_FAILED(CoCreateInstance(CLSID_CorMetaDataDispenser,
nullptr,
CLSCTX_INPROC,
RETURN_IF_FAILED(MetaDataGetDispenser(CLSID_CorMetaDataDispenser,
IID_IMetaDataDispenser,
&spMetaDataDispenser));
{

2
src/UndockedRegFreeWinRT/mwinrtact/mwinrtact.cs
Просмотреть файл

@ -4,7 +4,7 @@ namespace Microsoft.Windows
{
public static class UndockedRegFreeWinrt
{
[DllImport("winrtact.dll", PreserveSig=false)]
[DllImport("winrtact.dll", PreserveSig=true)]
static extern void winrtact_Initialize();
public static void Initialize()