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

Fix memory leak with openssl (#485)

This commit is contained in:
Ruben Guerrero 2021-10-25 11:25:30 -07:00 коммит произвёл GitHub
Родитель 625f0a5a82
Коммит 36b08bf7d2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 91 добавлений и 55 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
sample/BundleSample/BundleSample.cpp
Просмотреть файл

@ -262,6 +262,8 @@ int main(int argc, char* argv[])
}
}
CleanupMsixSdk();
return 0;
}

2
sample/ExtractContentsSample/ExtractContentsSample.cpp
Просмотреть файл

@ -643,5 +643,7 @@ int main(int argc, char* argv[])
{ std::cout << "UNABLE TO GET LOG WITH HR=" << std::hex << logResult << std::endl;
}
}
CleanupMsixSdk();
return result;
}

2
sample/OverrideLanguageSample/OverrideLanguageSample.cpp
Просмотреть файл

@ -324,6 +324,8 @@ int main(int argc, char* argv[])
}
}
CleanupMsixSdk();
return 0;
}

2
sample/OverrideStreamSample/OverrideStreamSample.cpp
Просмотреть файл

@ -623,5 +623,7 @@ int main(int argc, char* argv[])
}
}
CleanupMsixSdk();
return 0;
}

115
src/inc/AppxPackaging.hpp
Просмотреть файл

@ -121,13 +121,48 @@ interface IAppxBundleManifestReader;
interface IAppxBundleManifestPackageInfoEnumerator;
interface IAppxBundleManifestPackageInfo;
MSIX_INTERFACE(IAppxManifestPackageDependency,0xe4946b59,0x733e,0x43f0,0xa7,0x24,0x3b,0xde,0x4c,0x12,0x85,0xa0);
MSIX_INTERFACE(IAppxBundleManifestReader,0xcf0ebbc1,0xcc99,0x4106,0x91,0xeb,0xe6,0x74,0x62,0xe0,0x4f,0xb0);
MSIX_INTERFACE(IAppxBundleReader,0xdd75b8c0,0xba76,0x43b0,0xae,0x0f,0x68,0x65,0x6a,0x1d,0xc5,0xc8);
MSIX_INTERFACE(IUnknown,0x00000000,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
MSIX_INTERFACE(ISequentialStream,0x0c733a30,0x2a1c,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44,0x77,0x3d);
MSIX_INTERFACE(IStream,0x0000000c,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
MSIX_INTERFACE(IAppxFactory,0xbeb94909,0xe451,0x438b,0xb5,0xa7,0xd7,0x9e,0x76,0x7b,0x75,0xd8);
MSIX_INTERFACE(IAppxPackageReader,0xb5c49650,0x99bc,0x481c,0x9a,0x34,0x3d,0x53,0xa4,0x10,0x67,0x08);
MSIX_INTERFACE(IAppxPackageWriter,0x9099e33b,0x246f,0x41e4,0x88,0x1a,0x00,0x8e,0xb6,0x13,0xf8,0x58);
MSIX_INTERFACE(IAppxFile,0x91df827b,0x94fd,0x468f,0x82,0x7b,0x57,0xf4,0x1b,0x2f,0x6f,0x2e);
MSIX_INTERFACE(IAppxFilesEnumerator,0xf007eeaf,0x9831,0x411c,0x98,0x47,0x91,0x7c,0xdc,0x62,0xd1,0xfe);
MSIX_INTERFACE(IAppxBlockMapReader,0x5efec991,0xbca3,0x42d1,0x9e,0xc2,0xe9,0x2d,0x60,0x9e,0xc2,0x2a);
MSIX_INTERFACE(IAppxBlockMapFile,0x277672ac,0x4f63,0x42c1,0x8a,0xbc,0xbe,0xae,0x36,0x00,0xeb,0x59);
MSIX_INTERFACE(IAppxBlockMapFilesEnumerator,0x02b856a2,0x4262,0x4070,0xba,0xcb,0x1a,0x8c,0xbb,0xc4,0x23,0x05);
MSIX_INTERFACE(IAppxBlockMapBlock,0x75cf3930,0x3244,0x4fe0,0xa8,0xc8,0xe0,0xbc,0xb2,0x70,0xb8,0x89);
MSIX_INTERFACE(IAppxBlockMapBlocksEnumerator,0x6b429b5b,0x36ef,0x479e,0xb9,0xeb,0x0c,0x14,0x82,0xb4,0x9e,0x16);
MSIX_INTERFACE(IAppxManifestReader,0x4e1bd148,0x55a0,0x4480,0xa3,0xd1,0x15,0x54,0x47,0x10,0x63,0x7c);
MSIX_INTERFACE(IAppxManifestReader2,0xd06f67bc,0xb31d,0x4eba,0xa8,0xaf,0x63,0x8e,0x73,0xe7,0x7b,0x4d);
MSIX_INTERFACE(IAppxManifestReader3,0xc43825ab,0x69b7,0x400a,0x97,0x09,0xcc,0x37,0xf5,0xa7,0x2d,0x24);
MSIX_INTERFACE(IAppxManifestPackageId,0x283ce2d7,0x7153,0x4a91,0x96,0x49,0x7a,0x0f,0x72,0x40,0x94,0x5f);
MSIX_INTERFACE(IAppxManifestProperties,0x03faf64d,0xf26f,0x4b2c,0xaa,0xf7,0x8f,0xe7,0x78,0x9b,0x8b,0xca);
MSIX_INTERFACE(IAppxManifestTargetDeviceFamiliesEnumerator,0x36537F36,0x27A4,0x4788,0x88,0xC0,0x73,0x38,0x19,0x57,0x50,0x17);
MSIX_INTERFACE(IAppxManifestTargetDeviceFamily,0x9091B09B,0xC8D5,0x4F31,0x86,0x87,0xA3,0x38,0x25,0x9F,0xAE,0xFB);
MSIX_INTERFACE(IAppxManifestPackageDependenciesEnumerator,0xb43bbcf9,0x65a6,0x42dd,0xba,0xc0,0x8c,0x67,0x41,0xe7,0xf5,0xa4);
MSIX_INTERFACE(IAppxManifestResourcesEnumerator,0xde4dfbbd,0x881a,0x48bb,0x85,0x8c,0xd6,0xf2,0xba,0xea,0xe6,0xed);
MSIX_INTERFACE(IAppxManifestDeviceCapabilitiesEnumerator,0x30204541,0x427b,0x4a1c,0xba,0xcf,0x65,0x5b,0xf4,0x63,0xa5,0x40);
MSIX_INTERFACE(IAppxManifestCapabilitiesEnumerator,0x11D22258,0xF470,0x42C1,0xB2,0x91,0x83,0x61,0xC5,0x43,0x7E,0x41);
MSIX_INTERFACE(IAppxManifestApplicationsEnumerator,0x9eb8a55a,0xf04b,0x4d0d,0x80,0x8d,0x68,0x61,0x85,0xd4,0x84,0x7a);
MSIX_INTERFACE(IAppxManifestApplication,0x5da89bf4,0x3773,0x46be,0xb6,0x50,0x7e,0x74,0x48,0x63,0xb7,0xe8);
MSIX_INTERFACE(IAppxManifestQualifiedResourcesEnumerator,0x8ef6adfe,0x3762,0x4a8f,0x93,0x73,0x2f,0xc5,0xd4,0x44,0xc8,0xd2);
MSIX_INTERFACE(IAppxManifestQualifiedResource,0x3b53a497,0x3c5c,0x48d1,0x9e,0xa3,0xbb,0x7e,0xac,0x8c,0xd7,0xd4);
MSIX_INTERFACE(IAppxBundleFactory,0xbba65864,0x965f,0x4a5f,0x85,0x5f,0xf0,0x74,0xbd,0xbf,0x3a,0x7b);
MSIX_INTERFACE(IAppxBundleWriter,0xec446fe8,0xbfec,0x4c64,0xab,0x4f,0x49,0xf0,0x38,0xf0,0xc6,0xd2);
MSIX_INTERFACE(IAppxBundleManifestPackageInfoEnumerator,0xf9b856ee,0x49a6,0x4e19,0xb2,0xb0,0x6a,0x24,0x06,0xd6,0x3a,0x32);
MSIX_INTERFACE(IAppxBundleManifestPackageInfo,0x54cd06c1,0x268f,0x40bb,0x8e,0xd2,0x75,0x7a,0x9e,0xba,0xec,0x8d);
extern "C"{
#ifndef __IUnknown_INTERFACE_DEFINED__
#define __IUnknown_INTERFACE_DEFINED__
// {00000000-0000-0000-C000-000000000046}
MSIX_INTERFACE(IUnknown,0x00000000,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
interface IUnknown
{
public:
@ -143,7 +178,6 @@ extern "C"{
#define __ISequentialStream_INTERFACE_DEFINED__
// {0c733a30-2a1c-11ce-ade5-00aa0044773d}
MSIX_INTERFACE(ISequentialStream,0x0c733a30,0x2a1c,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44,0x77,0x3d);
interface ISequentialStream : public IUnknown
{
public:
@ -203,7 +237,6 @@ enum tagLOCKTYPE
} LOCKTYPE;
// {0000000c-0000-0000-C000-000000000046}
MSIX_INTERFACE(IStream,0x0000000c,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
interface IStream : public ISequentialStream
{
public:
@ -351,7 +384,6 @@ enum tagLOCKTYPE
} APPX_CAPABILITY_CLASS_TYPE;
// {beb94909-e451-438b-b5a7-d79e767b75d8}
MSIX_INTERFACE(IAppxFactory,0xbeb94909,0xe451,0x438b,0xb5,0xa7,0xd7,0x9e,0x76,0x7b,0x75,0xd8);
interface IAppxFactory : public IUnknown
{
public:
@ -383,7 +415,6 @@ enum tagLOCKTYPE
#define __IAppxPackageReader_INTERFACE_DEFINED__
// {b5c49650-99bc-481c-9a34-}
MSIX_INTERFACE(IAppxPackageReader,0xb5c49650,0x99bc,0x481c,0x9a,0x34,0x3d,0x53,0xa4,0x10,0x67,0x08);
interface IAppxPackageReader : public IUnknown
{
public:
@ -410,7 +441,6 @@ enum tagLOCKTYPE
#define __IAppxPackageWriter_INTERFACE_DEFINED__
// {9099e33b-246f-41e4-881a-008eb613f858}
MSIX_INTERFACE(IAppxPackageWriter,0x9099e33b,0x246f,0x41e4,0x88,0x1a,0x00,0x8e,0xb6,0x13,0xf8,0x58);
interface IAppxPackageWriter : public IUnknown
{
public:
@ -430,7 +460,6 @@ enum tagLOCKTYPE
#define __IAppxFile_INTERFACE_DEFINED__
// {91df827b-94fd-468f-827b-57f41b2f6f2e}
MSIX_INTERFACE(IAppxFile,0x91df827b,0x94fd,0x468f,0x82,0x7b,0x57,0xf4,0x1b,0x2f,0x6f,0x2e);
interface IAppxFile : public IUnknown
{
public:
@ -455,7 +484,6 @@ enum tagLOCKTYPE
#define __IAppxFilesEnumerator_INTERFACE_DEFINED__
// {f007eeaf-9831-411c-9847-917cdc62d1fe}
MSIX_INTERFACE(IAppxFilesEnumerator,0xf007eeaf,0x9831,0x411c,0x98,0x47,0x91,0x7c,0xdc,0x62,0xd1,0xfe);
interface IAppxFilesEnumerator : public IUnknown
{
public:
@ -475,7 +503,6 @@ enum tagLOCKTYPE
#define __IAppxBlockMapReader_INTERFACE_DEFINED__
// {5efec991-bca3-42d1-9ec2-e92d609ec22a}
MSIX_INTERFACE(IAppxBlockMapReader,0x5efec991,0xbca3,0x42d1,0x9e,0xc2,0xe9,0x2d,0x60,0x9e,0xc2,0x2a);
interface IAppxBlockMapReader : public IUnknown
{
public:
@ -498,7 +525,6 @@ enum tagLOCKTYPE
#define __IAppxBlockMapFile_INTERFACE_DEFINED__
// {277672ac-4f63-42c1-8abc-beae3600eb59}
MSIX_INTERFACE(IAppxBlockMapFile,0x277672ac,0x4f63,0x42c1,0x8a,0xbc,0xbe,0xae,0x36,0x00,0xeb,0x59);
interface IAppxBlockMapFile : public IUnknown
{
public:
@ -525,7 +551,6 @@ enum tagLOCKTYPE
#define __IAppxBlockMapFilesEnumerator_INTERFACE_DEFINED__
// {02b856a2-4262-4070-bacb-1a8cbbc42305}
MSIX_INTERFACE(IAppxBlockMapFilesEnumerator,0x02b856a2,0x4262,0x4070,0xba,0xcb,0x1a,0x8c,0xbb,0xc4,0x23,0x05);
interface IAppxBlockMapFilesEnumerator : public IUnknown
{
public:
@ -544,7 +569,6 @@ enum tagLOCKTYPE
#define __IAppxBlockMapBlock_INTERFACE_DEFINED__
// {75cf3930-3244-4fe0-a8c8-e0bcb270b889}
MSIX_INTERFACE(IAppxBlockMapBlock,0x75cf3930,0x3244,0x4fe0,0xa8,0xc8,0xe0,0xbc,0xb2,0x70,0xb8,0x89);
interface IAppxBlockMapBlock : public IUnknown
{
public:
@ -561,7 +585,6 @@ enum tagLOCKTYPE
#define __IAppxBlockMapBlocksEnumerator_INTERFACE_DEFINED__
// {6b429b5b-36ef-479e-b9eb-0c1482b49e16}
MSIX_INTERFACE(IAppxBlockMapBlocksEnumerator,0x6b429b5b,0x36ef,0x479e,0xb9,0xeb,0x0c,0x14,0x82,0xb4,0x9e,0x16);
interface IAppxBlockMapBlocksEnumerator : public IUnknown
{
public:
@ -580,7 +603,6 @@ enum tagLOCKTYPE
#define __IAppxManifestReader_INTERFACE_DEFINED__
// {4e1bd148-55a0-4480-a3d1-15544710637c}
MSIX_INTERFACE(IAppxManifestReader,0x4e1bd148,0x55a0,0x4480,0xa3,0xd1,0x15,0x54,0x47,0x10,0x63,0x7c);
interface IAppxManifestReader : public IUnknown
{
public:
@ -618,7 +640,6 @@ enum tagLOCKTYPE
#define __IAppxManifestReader2_INTERFACE_DEFINED__
// {d06f67bc-b31d-4eba-a8af-638e73e77b4d}
MSIX_INTERFACE(IAppxManifestReader2,0xd06f67bc,0xb31d,0x4eba,0xa8,0xaf,0x63,0x8e,0x73,0xe7,0x7b,0x4d);
interface IAppxManifestReader2 : public IAppxManifestReader
{
public:
@ -632,7 +653,6 @@ enum tagLOCKTYPE
#define __IAppxManifestReader3_INTERFACE_DEFINED__
// {c43825ab-69b7-400a-9709-cc37f5a72d24}
MSIX_INTERFACE(IAppxManifestReader3,0xc43825ab,0x69b7,0x400a,0x97,0x09,0xcc,0x37,0xf5,0xa7,0x2d,0x24);
interface IAppxManifestReader3 : public IAppxManifestReader2
{
public:
@ -649,7 +669,6 @@ enum tagLOCKTYPE
#define __IAppxManifestPackageId_INTERFACE_DEFINED__
// {283ce2d7-7153-4a91-9649-7a0f7240945f}
MSIX_INTERFACE(IAppxManifestPackageId,0x283ce2d7,0x7153,0x4a91,0x96,0x49,0x7a,0x0f,0x72,0x40,0x94,0x5f);
interface IAppxManifestPackageId : public IUnknown
{
public:
@ -684,7 +703,6 @@ enum tagLOCKTYPE
#define __IAppxManifestProperties_INTERFACE_DEFINED__
// {03faf64d-f26f-4b2c-aaf7-8fe7789b8bca}
MSIX_INTERFACE(IAppxManifestProperties,0x03faf64d,0xf26f,0x4b2c,0xaa,0xf7,0x8f,0xe7,0x78,0x9b,0x8b,0xca);
interface IAppxManifestProperties : public IUnknown
{
public:
@ -702,7 +720,6 @@ enum tagLOCKTYPE
#define __IAppxManifestTargetDeviceFamiliesEnumerator_INTERFACE_DEFINED__
// {36537f36-27a4-4788-88c0-733819575017}
MSIX_INTERFACE(IAppxManifestTargetDeviceFamiliesEnumerator,0x36537F36,0x27A4,0x4788,0x88,0xC0,0x73,0x38,0x19,0x57,0x50,0x17);
interface IAppxManifestTargetDeviceFamiliesEnumerator : public IUnknown
{
public:
@ -721,7 +738,6 @@ enum tagLOCKTYPE
#define __IAppxManifestTargetDeviceFamily_INTERFACE_DEFINED__
// {9091b09b-c8d5-4f31-8687-a338259faefb}
MSIX_INTERFACE(IAppxManifestTargetDeviceFamily,0x9091B09B,0xC8D5,0x4F31,0x86,0x87,0xA3,0x38,0x25,0x9F,0xAE,0xFB);
interface IAppxManifestTargetDeviceFamily : public IUnknown
{
public:
@ -741,7 +757,6 @@ enum tagLOCKTYPE
#define __IAppxManifestPackageDependenciesEnumerator_INTERFACE_DEFINED__
// {b43bbcf9-65a6-42dd-bac0-8c6741e7f5a4}
MSIX_INTERFACE(IAppxManifestPackageDependenciesEnumerator,0xb43bbcf9,0x65a6,0x42dd,0xba,0xc0,0x8c,0x67,0x41,0xe7,0xf5,0xa4);
interface IAppxManifestPackageDependenciesEnumerator : public IUnknown
{
public:
@ -760,7 +775,6 @@ enum tagLOCKTYPE
#define __IAppxManifestResourcesEnumerator_INTERFACE_DEFINED__
// {de4dfbbd-881a-48bb-858c-d6f2baeae6ed}
MSIX_INTERFACE(IAppxManifestResourcesEnumerator,0xde4dfbbd,0x881a,0x48bb,0x85,0x8c,0xd6,0xf2,0xba,0xea,0xe6,0xed);
interface IAppxManifestResourcesEnumerator : public IUnknown
{
public:
@ -779,7 +793,6 @@ enum tagLOCKTYPE
#define __IAppxManifestDeviceCapabilitiesEnumerator_INTERFACE_DEFINED__
// {30204541-427b-4a1c-bacf-655bf463a540}
MSIX_INTERFACE(IAppxManifestDeviceCapabilitiesEnumerator,0x30204541,0x427b,0x4a1c,0xba,0xcf,0x65,0x5b,0xf4,0x63,0xa5,0x40);
interface IAppxManifestDeviceCapabilitiesEnumerator : public IUnknown
{
public:
@ -799,7 +812,6 @@ enum tagLOCKTYPE
#define __IAppxManifestCapabilitiesEnumerator_INTERFACE_DEFINED__
// {11d22258-f470-42c1-b291-8361c5437e41}
MSIX_INTERFACE(IAppxManifestCapabilitiesEnumerator,0x11D22258,0xF470,0x42C1,0xB2,0x91,0x83,0x61,0xC5,0x43,0x7E,0x41);
interface IAppxManifestCapabilitiesEnumerator : public IUnknown
{
public:
@ -819,7 +831,6 @@ enum tagLOCKTYPE
#define __IAppxManifestApplicationsEnumerator_INTERFACE_DEFINED__
// {9eb8a55a-f04b-4d0d-808d-686185d4847a}
MSIX_INTERFACE(IAppxManifestApplicationsEnumerator,0x9eb8a55a,0xf04b,0x4d0d,0x80,0x8d,0x68,0x61,0x85,0xd4,0x84,0x7a);
interface IAppxManifestApplicationsEnumerator : public IUnknown
{
public:
@ -839,7 +850,6 @@ enum tagLOCKTYPE
#define __IAppxManifestApplication_INTERFACE_DEFINED__
// {5da89bf4-3773-46be-b650-7e744863b7e8}
MSIX_INTERFACE(IAppxManifestApplication,0x5da89bf4,0x3773,0x46be,0xb6,0x50,0x7e,0x74,0x48,0x63,0xb7,0xe8);
interface IAppxManifestApplication : public IUnknown
{
public:
@ -856,7 +866,6 @@ enum tagLOCKTYPE
#define __IAppxManifestQualifiedResourcesEnumerator_INTERFACE_DEFINED__
// {8ef6adfe-3762-4a8f-9373-2fc5d444c8d2}
MSIX_INTERFACE(IAppxManifestQualifiedResourcesEnumerator,0x8ef6adfe,0x3762,0x4a8f,0x93,0x73,0x2f,0xc5,0xd4,0x44,0xc8,0xd2);
interface IAppxManifestQualifiedResourcesEnumerator : public IUnknown
{
public:
@ -875,7 +884,6 @@ enum tagLOCKTYPE
#define __IAppxManifestQualifiedResource_INTERFACE_DEFINED__
// {3b53a497-3c5c-48d1-9ea3-bb7eac8cd7d4}
MSIX_INTERFACE(IAppxManifestQualifiedResource,0x3b53a497,0x3c5c,0x48d1,0x9e,0xa3,0xbb,0x7e,0xac,0x8c,0xd7,0xd4);
interface IAppxManifestQualifiedResource : public IUnknown
{
public:
@ -895,7 +903,6 @@ enum tagLOCKTYPE
#define __IAppxBundleFactory_INTERFACE_DEFINED__
// {bba65864-965f-4a5f-855f-f074bdbf3a7b}
MSIX_INTERFACE(IAppxBundleFactory,0xbba65864,0x965f,0x4a5f,0x85,0x5f,0xf0,0x74,0xbd,0xbf,0x3a,0x7b);
interface IAppxBundleFactory : public IUnknown
{
public:
@ -919,7 +926,6 @@ enum tagLOCKTYPE
#define __IAppxBundleWriter_INTERFACE_DEFINED__
// {ec446fe8-bfec-4c64-ab4f-49f038f0c6d2}
MSIX_INTERFACE(IAppxBundleWriter,0xec446fe8,0xbfec,0x4c64,0xab,0x4f,0x49,0xf0,0x38,0xf0,0xc6,0xd2);
interface IAppxBundleWriter : public IUnknown
{
public:
@ -936,7 +942,6 @@ enum tagLOCKTYPE
#define __IAppxBundleReader_INTERFACE_DEFINED__
// {dd75b8c0-ba76-43b0-ae0f-68656a1dc5c8}
MSIX_INTERFACE(IAppxBundleReader,0xdd75b8c0,0xba76,0x43b0,0xae,0x0f,0x68,0x65,0x6a,0x1d,0xc5,0xc8);
interface IAppxBundleReader : public IUnknown
{
public:
@ -963,7 +968,6 @@ enum tagLOCKTYPE
#define __IAppxBundleManifestReader_INTERFACE_DEFINED__
// {cf0ebbc1-cc99-4106-91eb-e67462e04fb0}
MSIX_INTERFACE(IAppxBundleManifestReader,0xcf0ebbc1,0xcc99,0x4106,0x91,0xeb,0xe6,0x74,0x62,0xe0,0x4f,0xb0);
interface IAppxBundleManifestReader : public IUnknown
{
public:
@ -982,7 +986,6 @@ enum tagLOCKTYPE
#define __IAppxManifestPackageDependency_INTERFACE_DEFINED__
// {e4946b59-733e-43f0-a724-3bde4c1285a0}
MSIX_INTERFACE(IAppxManifestPackageDependency,0xe4946b59,0x733e,0x43f0,0xa7,0x24,0x3b,0xde,0x4c,0x12,0x85,0xa0);
interface IAppxManifestPackageDependency : public IUnknown
{
public:
@ -1001,7 +1004,6 @@ enum tagLOCKTYPE
#define __IAppxBundleManifestPackageInfoEnumerator_INTERFACE_DEFINED__
// {f9b856ee-49a6-4e19-b2b0-6a2406d63a32}
MSIX_INTERFACE(IAppxBundleManifestPackageInfoEnumerator,0xf9b856ee,0x49a6,0x4e19,0xb2,0xb0,0x6a,0x24,0x06,0xd6,0x3a,0x32);
interface IAppxBundleManifestPackageInfoEnumerator : public IUnknown
{
public:
@ -1020,7 +1022,6 @@ enum tagLOCKTYPE
#define __IAppxBundleManifestPackageInfo_INTERFACE_DEFINED__
// {54cd06c1-268f-40bb-8ed2-757a9ebaec8d}
MSIX_INTERFACE(IAppxBundleManifestPackageInfo,0x54cd06c1,0x268f,0x40bb,0x8e,0xd2,0x75,0x7a,0x9e,0xba,0xec,0x8d);
interface IAppxBundleManifestPackageInfo : public IUnknown
{
public:
@ -1057,11 +1058,17 @@ interface IMsixFactoryOverrides;
interface IMsixStreamFactory;
interface IMsixApplicabilityLanguagesEnumerator;
MSIX_INTERFACE(IMsixDocumentElement,0xe8900e0e,0x1dfd,0x4728,0x83,0x52,0xaa,0xda,0xeb,0xbf,0x00,0x65);
MSIX_INTERFACE(IMsixElement,0x5b6786ff,0x6145,0x4f0e,0xb8,0xc9,0x8e,0x03,0xaa,0xcb,0x60,0xd0);
MSIX_INTERFACE(IMsixElementEnumerator,0x7e7ea105,0xa4f9,0x4c12,0x9e,0xfa,0x98,0xef,0x18,0x95,0x41,0x8a);
MSIX_INTERFACE(IMsixFactoryOverrides,0x0acedbdb,0x57cd,0x4aca,0x8c,0xee,0x33,0xfa,0x52,0x39,0x43,0x16);
MSIX_INTERFACE(IMsixStreamFactory,0xc74f4821,0x3b82,0x4ad5,0x98,0xea,0x3d,0x52,0x68,0x1a,0xff,0x56);
MSIX_INTERFACE(IMsixApplicabilityLanguagesEnumerator,0xbfc4655a,0xbe7a,0x456a,0xbc,0x4e,0x2a,0xf9,0x48,0x1e,0x84,0x32);
#ifndef __IMsixDocumentElement_INTERFACE_DEFINED__
#define __IMsixDocumentElement_INTERFACE_DEFINED__
// {e8900e0e-1dfd-4728-8352-aadaebbf0065}
MSIX_INTERFACE(IMsixDocumentElement,0xe8900e0e,0x1dfd,0x4728,0x83,0x52,0xaa,0xda,0xeb,0xbf,0x00,0x65);
interface IMsixDocumentElement : public IUnknown
{
public:
@ -1074,7 +1081,6 @@ interface IMsixApplicabilityLanguagesEnumerator;
#define __IMsixElement_INTERFACE_DEFINED__
// {5b6786ff-6145-4f0e-b8c9-8e03aacb60d0}
MSIX_INTERFACE(IMsixElement,0x5b6786ff,0x6145,0x4f0e,0xb8,0xc9,0x8e,0x03,0xaa,0xcb,0x60,0xd0);
interface IMsixElement : public IUnknown
{
public:
@ -1106,7 +1112,6 @@ interface IMsixApplicabilityLanguagesEnumerator;
#define __IMsixElementEnumerator_INTERFACE_DEFINED__
// {7e7ea105-a4f9-4c12-9efa-98ef1895418a}
MSIX_INTERFACE(IMsixElementEnumerator,0x7e7ea105,0xa4f9,0x4c12,0x9e,0xfa,0x98,0xef,0x18,0x95,0x41,0x8a);
interface IMsixElementEnumerator : public IUnknown
{
public:
@ -1132,7 +1137,6 @@ interface IMsixApplicabilityLanguagesEnumerator;
} MSIX_FACTORY_EXTENSION;
// {0acedbdb-57cd-4aca-8cee-33fa52394316}
MSIX_INTERFACE(IMsixFactoryOverrides,0x0acedbdb,0x57cd,0x4aca,0x8c,0xee,0x33,0xfa,0x52,0x39,0x43,0x16);
interface IMsixFactoryOverrides : public IUnknown
{
public:
@ -1150,7 +1154,6 @@ interface IMsixApplicabilityLanguagesEnumerator;
#define __IMsixStreamFactory_INTERFACE_DEFINED__
// {c74f4821-3b82-4ad5-98ea-3d52681aff56}
MSIX_INTERFACE(IMsixStreamFactory,0xc74f4821,0x3b82,0x4ad5,0x98,0xea,0x3d,0x52,0x68,0x1a,0xff,0x56);
interface IMsixStreamFactory : public IUnknown
{
public:
@ -1168,7 +1171,6 @@ interface IMsixApplicabilityLanguagesEnumerator;
#define __IMsixApplicabilityLanguagesEnumerator_INTERFACE_DEFINED__
// {bfc4655a-be7a-456a-bc4e-2af9481e8432}
MSIX_INTERFACE(IMsixApplicabilityLanguagesEnumerator,0xbfc4655a,0xbe7a,0x456a,0xbc,0x4e,0x2a,0xf9,0x48,0x1e,0x84,0x32);
interface IMsixApplicabilityLanguagesEnumerator : public IUnknown
{
virtual HRESULT STDMETHODCALLTYPE GetCurrent(
@ -1198,11 +1200,25 @@ interface IAppxManifestResourcesEnumeratorUtf8;
interface IAppxManifestTargetDeviceFamilyUtf8;
interface IAppxPackageReaderUtf8;
MSIX_INTERFACE(IAppxBlockMapFileUtf8,0x52023973,0x05fd,0x46ca,0x8a,0xc5,0xbb,0x0a,0xa4,0x31,0xfe,0xd6);
MSIX_INTERFACE(IAppxBlockMapReaderUtf8,0x1a02d8b4,0x477a,0x487e,0x98,0x15,0x31,0x7c,0xc0,0x9a,0xcc,0x22);
MSIX_INTERFACE(IAppxBundleManifestPackageInfoUtf8,0xf1ae9284,0xf7ee,0x431c,0x9a,0x85,0x03,0x63,0x0a,0xda,0x28,0x5b);
MSIX_INTERFACE(IAppxBundleReaderUtf8, 0x90f4a4fc,0xf655,0x43b6,0xb0,0x33,0x35,0xa8,0xdf,0xc9,0x2c,0xbf)
MSIX_INTERFACE(IAppxFactoryUtf8,0x16c3c3f5,0x6d63,0x47af,0x8a,0x68,0xdc,0xc3,0xae,0xb0,0xce,0xbb);
MSIX_INTERFACE(IAppxFileUtf8,0x73d14f3f,0x4c55,0x4b6d,0x93,0x11,0xa0,0x2b,0xb3,0x53,0x8b,0xb6);
MSIX_INTERFACE(IAppxManifestApplicationUtf8,0x3fb53200,0xbd86,0x4971,0xa8,0xad,0x2e,0x18,0xc3,0xc0,0x2a,0xae);
MSIX_INTERFACE(IAppxManifestPackageDependencyUtf8,0x7ff7ba87,0xd29e,0x447a,0xb2,0xe6,0x31,0xdd,0xc8,0x8b,0x94,0xe9);
MSIX_INTERFACE(IAppxManifestPackageIdUtf8,0xa1f79b28,0x37f3,0x4b58,0x91,0x00,0x7a,0xf8,0x98,0xd1,0x1f,0x65);
MSIX_INTERFACE(IAppxManifestPropertiesUtf8,0x1c3fe108,0x9115,0x4623,0xbe,0x85,0xf0,0xfe,0xc9,0x9e,0xc5,0x16);
MSIX_INTERFACE(IAppxManifestQualifiedResourceUtf8,0x2fac530d,0x87e4,0x4dd5,0x99,0xd3,0x29,0x0b,0xb1,0x92,0x36,0x3e);
MSIX_INTERFACE(IAppxManifestResourcesEnumeratorUtf8,0x194cfd4a,0x55db,0x4832,0xb1,0xaf,0x0d,0x68,0x05,0xa4,0x53,0x2a);
MSIX_INTERFACE(IAppxManifestTargetDeviceFamilyUtf8,0x70adc4fb,0x33f5,0x4ed3,0xaa,0xaf,0xe5,0xad,0x74,0x99,0x16,0x69);
MSIX_INTERFACE(IAppxPackageReaderUtf8,0x842ffe95,0xcf7a,0x4707,0x97,0x3a,0x0a,0x2e,0x9f,0xfc,0x3a,0x85);
#ifndef __IAppxBlockMapFileUtf8_INTERFACE_DEFINED__
#define __IAppxBlockMapFileUtf8_INTERFACE_DEFINED__
// {52023973-05fd-46ca-8ac5-bb0aa431fed6}
MSIX_INTERFACE(IAppxBlockMapFileUtf8,0x52023973,0x05fd,0x46ca,0x8a,0xc5,0xbb,0x0a,0xa4,0x31,0xfe,0xd6);
interface IAppxBlockMapFileUtf8 : public IUnknown
{
public:
@ -1215,7 +1231,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxBlockMapReaderUtf8_INTERFACE_DEFINED__
// {1a02d8b4-477a-487e-9815-317cc09acc22}
MSIX_INTERFACE(IAppxBlockMapReaderUtf8,0x1a02d8b4,0x477a,0x487e,0x98,0x15,0x31,0x7c,0xc0,0x9a,0xcc,0x22);
interface IAppxBlockMapReaderUtf8 : public IUnknown
{
public:
@ -1229,7 +1244,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxBundleManifestPackageInfoUtf8_INTERFACE_DEFINED__
// {f1ae9284-f7ee-431c-9a85-03630ada285b}
MSIX_INTERFACE(IAppxBundleManifestPackageInfoUtf8,0xf1ae9284,0xf7ee,0x431c,0x9a,0x85,0x03,0x63,0x0a,0xda,0x28,0x5b);
interface IAppxBundleManifestPackageInfoUtf8 : public IUnknown
{
public:
@ -1243,7 +1257,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxBundleReaderUtf8_INTERFACE_DEFINED__
// {90f4a4fc-f655-43b6-b033-35a8dfc92cbf}
MSIX_INTERFACE(IAppxBundleReaderUtf8, 0x90f4a4fc,0xf655,0x43b6,0xb0,0x33,0x35,0xa8,0xdf,0xc9,0x2c,0xbf)
interface IAppxBundleReaderUtf8 : public IUnknown
{
public:
@ -1257,7 +1270,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxFactoryUtf8_INTERFACE_DEFINED__
// {16c3c3f5-6d63-47af-8a68-dcc3aeb0cebb}
MSIX_INTERFACE(IAppxFactoryUtf8,0x16c3c3f5,0x6d63,0x47af,0x8a,0x68,0xdc,0xc3,0xae,0xb0,0xce,0xbb);
interface IAppxFactoryUtf8 : public IUnknown
{
public:
@ -1272,7 +1284,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxFileUtf8_INTERFACE_DEFINED__
// {73d14f3f-4c55-4b6d-9311-a02bb3538bb6}
MSIX_INTERFACE(IAppxFileUtf8,0x73d14f3f,0x4c55,0x4b6d,0x93,0x11,0xa0,0x2b,0xb3,0x53,0x8b,0xb6);
interface IAppxFileUtf8 : public IUnknown
{
public:
@ -1288,7 +1299,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxManifestApplicationUtf8_INTERFACE_DEFINED__
// {3fb53200-bd86-4971-a8ad-2e18c3c02aae}
MSIX_INTERFACE(IAppxManifestApplicationUtf8,0x3fb53200,0xbd86,0x4971,0xa8,0xad,0x2e,0x18,0xc3,0xc0,0x2a,0xae);
interface IAppxManifestApplicationUtf8 : public IUnknown
{
public:
@ -1305,7 +1315,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxManifestPackageDependencyUtf8_INTERFACE_DEFINED__
// {7ff7ba87-d29e-447a-b2e6-31ddc88b94e9}
MSIX_INTERFACE(IAppxManifestPackageDependencyUtf8,0x7ff7ba87,0xd29e,0x447a,0xb2,0xe6,0x31,0xdd,0xc8,0x8b,0x94,0xe9);
interface IAppxManifestPackageDependencyUtf8 : public IUnknown
{
public:
@ -1321,7 +1330,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxManifestPackageIdUtf8_INTERFACE_DEFINED__
// {a1f79b28-37f3-4b58-9100-7af898d11f65}
MSIX_INTERFACE(IAppxManifestPackageIdUtf8,0xa1f79b28,0x37f3,0x4b58,0x91,0x00,0x7a,0xf8,0x98,0xd1,0x1f,0x65);
interface IAppxManifestPackageIdUtf8 : public IUnknown
{
public:
@ -1350,7 +1358,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxManifestPropertiesUtf8_INTERFACE_DEFINED__
// {1c3fe108-9115-4623-be85-f0fec99ec516}
MSIX_INTERFACE(IAppxManifestPropertiesUtf8,0x1c3fe108,0x9115,0x4623,0xbe,0x85,0xf0,0xfe,0xc9,0x9e,0xc5,0x16);
interface IAppxManifestPropertiesUtf8 : public IUnknown
{
public:
@ -1368,7 +1375,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxManifestQualifiedResourceUtf8_INTERFACE_DEFINED__
// {2fac530d-87e4-4dd5-99d3-290bb192363e}
MSIX_INTERFACE(IAppxManifestQualifiedResourceUtf8,0x2fac530d,0x87e4,0x4dd5,0x99,0xd3,0x29,0x0b,0xb1,0x92,0x36,0x3e);
interface IAppxManifestQualifiedResourceUtf8 : public IUnknown
{
public:
@ -1381,7 +1387,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxManifestResourcesEnumeratorUtf8_INTERFACE_DEFINED__
// {194cfd4a-55db-4832-b1af-0d6805a4532a}
MSIX_INTERFACE(IAppxManifestResourcesEnumeratorUtf8,0x194cfd4a,0x55db,0x4832,0xb1,0xaf,0x0d,0x68,0x05,0xa4,0x53,0x2a);
interface IAppxManifestResourcesEnumeratorUtf8 : public IUnknown
{
public:
@ -1394,7 +1399,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxManifestTargetDeviceFamilyUtf8_INTERFACE_DEFINED__
// {70adc4fb-33f5-4ed3-aaaf-e5ad74991669}
MSIX_INTERFACE(IAppxManifestTargetDeviceFamilyUtf8,0x70adc4fb,0x33f5,0x4ed3,0xaa,0xaf,0xe5,0xad,0x74,0x99,0x16,0x69);
interface IAppxManifestTargetDeviceFamilyUtf8 : public IUnknown
{
public:
@ -1407,7 +1411,6 @@ interface IAppxPackageReaderUtf8;
#define __IAppxPackageReaderUtf8_INTERFACE_DEFINED__
// {842ffe95-cf7a-4707-973a-0a2e9ffc3a85}
MSIX_INTERFACE(IAppxPackageReaderUtf8,0x842ffe95,0xcf7a,0x4707,0x97,0x3a,0x0a,0x2e,0x9f,0xfc,0x3a,0x85);
interface IAppxPackageReaderUtf8 : public IUnknown
{
public:
@ -1537,6 +1540,8 @@ MSIX_API HRESULT STDMETHODCALLTYPE CreateStreamOnFileUTF16(
bool forRead,
IStream** stream) noexcept;
MSIX_API HRESULT STDMETHODCALLTYPE CleanupMsixSdk() noexcept;
} // extern "C++"
#endif //__appxpackaging_hpp__

1
src/msix/CMakeLists.txt
Просмотреть файл

@ -63,6 +63,7 @@ else()
"UnpackBundleFromStream"
"CoCreateAppxBundleFactory"
"CoCreateAppxBundleFactoryWithHeap"
"CleanupMsixSdk"
)
if((IOS) OR (MACOS))
# on Apple platforms you can explicitly define which symbols are exported

20
src/msix/msix.cpp
Просмотреть файл

@ -37,6 +37,11 @@ static void finalizer(void) {
// printf("[%s] finalizer()\n", __FILE__);
}
// Used for deinit openssl.
#include <openssl/evp.h>
#include <openssl/crypto.h>
#include <openssl/err.h>
#endif
LPVOID STDMETHODCALLTYPE InternalAllocate(SIZE_T cb) { return std::malloc(cb); }
@ -67,6 +72,7 @@ MSIX_API HRESULT STDMETHODCALLTYPE UnpackPackage(
auto to = MSIX::ComPtr<IStorageObject>::Make<MSIX::DirectoryObject>(utf8Destination);
reader.As<IPackage>()->Unpack(packUnpackOptions, to.Get());
CleanupMsixSdk();
return static_cast<HRESULT>(MSIX::Error::OK);
} CATCH_RETURN();
@ -91,6 +97,7 @@ MSIX_API HRESULT STDMETHODCALLTYPE UnpackPackageFromStream(
auto to = MSIX::ComPtr<IStorageObject>::Make<MSIX::DirectoryObject>(utf8Destination);
reader.As<IPackage>()->Unpack(packUnpackOptions, to.Get());
CleanupMsixSdk();
return static_cast<HRESULT>(MSIX::Error::OK);
} CATCH_RETURN();
@ -120,6 +127,7 @@ MSIX_API HRESULT STDMETHODCALLTYPE UnpackBundle(
auto to = MSIX::ComPtr<IStorageObject>::Make<MSIX::DirectoryObject>(utf8Destination);
reader.As<IPackage>()->Unpack(packUnpackOptions, to.Get());
CleanupMsixSdk();
return static_cast<HRESULT>(MSIX::Error::OK);
#else
return static_cast<HRESULT>(MSIX::Error::NotSupported);
@ -149,6 +157,7 @@ MSIX_API HRESULT STDMETHODCALLTYPE UnpackBundleFromStream(
auto to = MSIX::ComPtr<IStorageObject>::Make<MSIX::DirectoryObject>(utf8Destination);
reader.As<IPackage>()->Unpack(packUnpackOptions, to.Get());
CleanupMsixSdk();
return static_cast<HRESULT>(MSIX::Error::OK);
#else
return static_cast<HRESULT>(MSIX::Error::NotSupported);
@ -238,3 +247,14 @@ MSIX_API HRESULT STDMETHODCALLTYPE CoCreateAppxBundleFactory(
return static_cast<HRESULT>(MSIX::Error::NotSupported);
#endif
}
MSIX_API HRESULT STDMETHODCALLTYPE CleanupMsixSdk() noexcept
{
#ifndef WIN32
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();
ERR_remove_thread_state(NULL);
ERR_free_strings();
#endif
return static_cast<HRESULT>(MSIX::Error::OK);
}

2
test/api/ApiTests.cpp
Просмотреть файл

@ -1252,6 +1252,8 @@ int RunApiTestInternal(char* input, char* target, char* packageRootPath)
std::cout << "\t" << result << std::endl;
}
CleanupMsixSdk();
return g_testResult;
}