From b56d5b029e2927b910c4805ccb4c0c1db32b863b Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Tue, 31 Dec 2019 14:41:54 +0100 Subject: [PATCH 1/4] Update interface GUID's to prepare for a new API release Done to enable old (v1.2) and new (v2.0) loaders to co-exist on the same system within interfering with one another. --- Image3dAPI/IImage3d.idl | 4 ++-- Image3dAPI/IImage3dTypeLibraryGenerator.idl | 2 +- Image3dAPI/UNREGISTER_Image3dAPI.bat | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Image3dAPI/IImage3d.idl b/Image3dAPI/IImage3d.idl index e1256ce..6bc27d5 100644 --- a/Image3dAPI/IImage3d.idl +++ b/Image3dAPI/IImage3d.idl @@ -276,7 +276,7 @@ cpp_quote("#endif") [ object, oleautomation, // use "automation" marshaler (oleaut32.dll) - uuid(D483D815-52DD-4750-8CA2-5C6C489588B6), + uuid(881DC121-1C8B-44AE-99E2-AAE4AD6A50E0), helpstring("Interface for retrieving 3D image data.")] interface IImage3dSource : IUnknown { [helpstring("Get the number of frames available")] @@ -319,7 +319,7 @@ enum Image3dError { [ object, oleautomation, // use "automation" marshaler (oleaut32.dll) - uuid(CD30759B-EB38-4469-9CA5-4DF75737A31B), + uuid(381BA014-DA39-48B2-B0E7-7454D439469A), helpstring("Factory for loading 3D image data from a file.\n" "Implementors are responsible for also providing details on relevant DICOM tags that indicate that the loader might support the file.")] interface IImage3dFileLoader : IUnknown { diff --git a/Image3dAPI/IImage3dTypeLibraryGenerator.idl b/Image3dAPI/IImage3dTypeLibraryGenerator.idl index 7ae016c..fdcfe65 100644 --- a/Image3dAPI/IImage3dTypeLibraryGenerator.idl +++ b/Image3dAPI/IImage3dTypeLibraryGenerator.idl @@ -8,7 +8,7 @@ import "IImage3d.idl"; [ - uuid(3ff1aab8-f3d8-33d4-825d-00104b3646c0), + uuid(1979020F-3402-49AD-A17C-507A1BBE4D09), helpstring("Interface to generate IImage3dAPI.tlb .") ] library Image3dlib diff --git a/Image3dAPI/UNREGISTER_Image3dAPI.bat b/Image3dAPI/UNREGISTER_Image3dAPI.bat index 6f6a849..49f7c40 100644 --- a/Image3dAPI/UNREGISTER_Image3dAPI.bat +++ b/Image3dAPI/UNREGISTER_Image3dAPI.bat @@ -10,12 +10,12 @@ cd /d "%~dp0" :: Remove all traces of Image3dAPI interfaces from registry :: IImage3dTypeLibraryGenerator.idl -reg delete "HKCR\TypeLib\{3ff1aab8-f3d8-33d4-825d-00104b3646c0}" /f 2> NUL +reg delete "HKCR\TypeLib\{1979020F-3402-49AD-A17C-507A1BBE4D09}" /f 2> NUL for %%P in (32 64) do ( :: IImage3d.idl - reg delete "HKCR\Interface\{D483D815-52DD-4750-8CA2-5C6C489588B6}" /f /reg:%%P 2> NUL - reg delete "HKCR\Interface\{CD30759B-EB38-4469-9CA5-4DF75737A31B}" /f /reg:%%P 2> NUL + reg delete "HKCR\Interface\{881DC121-1C8B-44AE-99E2-AAE4AD6A50E0}" /f /reg:%%P 2> NUL + reg delete "HKCR\Interface\{381BA014-DA39-48B2-B0E7-7454D439469A}" /f /reg:%%P 2> NUL ) ::pause From 22b643a23e04a04a3594138660a9734d7ecddd5f Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Tue, 31 Dec 2019 14:47:37 +0100 Subject: [PATCH 2/4] Update DummyLoader GUID's to prepare for a new API release Done to enable old (v1.2) and new (v2.0) DummyLoader to co-exist on the same system within interfering with one another. --- DummyLoader/DummyLoader.idl | 6 +++--- DummyLoader/Main.cpp | 2 +- DummyLoader/UNREGISTER_DummyLoader.bat | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DummyLoader/DummyLoader.idl b/DummyLoader/DummyLoader.idl index f4aa7bf..4546899 100644 --- a/DummyLoader/DummyLoader.idl +++ b/DummyLoader/DummyLoader.idl @@ -5,7 +5,7 @@ import "IImage3d.idl"; [ version(1.2), - uuid(67E59584-3F6A-4852-8051-103A4583CA5E), + uuid(ED4540BD-07B5-44B0-BCDE-3E2C1D99183B), helpstring("DummyLoader module") ] library DummyLoader @@ -14,7 +14,7 @@ library DummyLoader [ version(1.2), - uuid(6FA82ED5-6332-4344-8417-DEA55E72098C), + uuid(50BE330D-F729-4D8F-A1E4-C939E0598EDF), helpstring("3D image source") ] coclass Image3dSource @@ -24,7 +24,7 @@ library DummyLoader [ version(1.2), - uuid(8E754A72-0067-462B-9267-E84AF84828F1), + uuid(1326A2C6-7753-4584-B866-CDF3C6E240F1), helpstring("3D image file loader") ] coclass Image3dFileLoader diff --git a/DummyLoader/Main.cpp b/DummyLoader/Main.cpp index 48f8751..ef0b2cb 100644 --- a/DummyLoader/Main.cpp +++ b/DummyLoader/Main.cpp @@ -11,7 +11,7 @@ class DummyLoaderModule : { public: DECLARE_LIBID(LIBID_DummyLoader) - DECLARE_REGISTRY_APPID_RESOURCEID(IDR_AppID, "{92280FDD-C149-44E3-BDEE-736F9F9EEA4E}") + DECLARE_REGISTRY_APPID_RESOURCEID(IDR_AppID, "{AE03BF33-C065-4DB2-94E3-8167CF9B1E23}") }; DummyLoaderModule _AtlModule; diff --git a/DummyLoader/UNREGISTER_DummyLoader.bat b/DummyLoader/UNREGISTER_DummyLoader.bat index 9585016..bf5a156 100644 --- a/DummyLoader/UNREGISTER_DummyLoader.bat +++ b/DummyLoader/UNREGISTER_DummyLoader.bat @@ -10,18 +10,18 @@ cd /d "%~dp0" :: Remove all traces of DummyLoader from registry for %%R in (HKEY_LOCAL_MACHINE HKEY_CURRENT_USER) do ( :: TypeLib - reg delete "%%R\SOFTWARE\Classes\TypeLib\{67E59584-3F6A-4852-8051-103A4583CA5E}" /f 2> NUL + reg delete "%%R\SOFTWARE\Classes\TypeLib\{ED4540BD-07B5-44B0-BCDE-3E2C1D99183B}" /f 2> NUL for %%P in (32 64) do ( :: Image3dSource class reg delete "%%R\SOFTWARE\Classes\DummyLoader.Image3dSource" /f 2> NUL reg delete "%%R\SOFTWARE\Classes\DummyLoader.Image3dSource.1" /f 2> NUL - reg delete "%%R\SOFTWARE\Classes\CLSID\{6FA82ED5-6332-4344-8417-DEA55E72098C}" /f /reg:%%P 2> NUL + reg delete "%%R\SOFTWARE\Classes\CLSID\{50BE330D-F729-4D8F-A1E4-C939E0598EDF}" /f /reg:%%P 2> NUL :: Image3dFileLoader class reg delete "%%R\SOFTWARE\Classes\DummyLoader.Image3dFileLoader" /f 2> NUL reg delete "%%R\SOFTWARE\Classes\DummyLoader.Image3dFileLoader.1" /f 2> NUL - reg delete "%%R\SOFTWARE\Classes\CLSID\{8E754A72-0067-462B-9267-E84AF84828F1}" /f /reg:%%P 2> NUL + reg delete "%%R\SOFTWARE\Classes\CLSID\{1326A2C6-7753-4584-B866-CDF3C6E240F1}" /f /reg:%%P 2> NUL ) ) From f52b5cd505e8b9982a2bbf08389855f455f19944 Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Tue, 31 Dec 2019 14:49:44 +0100 Subject: [PATCH 3/4] Update copyright year. --- PackagingGE/DummyLoader.redist.nuspec | 2 +- PackagingGE/Image3dAPI.nuspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PackagingGE/DummyLoader.redist.nuspec b/PackagingGE/DummyLoader.redist.nuspec index a13dde3..789665c 100644 --- a/PackagingGE/DummyLoader.redist.nuspec +++ b/PackagingGE/DummyLoader.redist.nuspec @@ -15,7 +15,7 @@ Fredrik Orderud <> changelog in docs/changelog.txt - Copyright 2015-2018 + Copyright 2015-2020 diff --git a/PackagingGE/Image3dAPI.nuspec b/PackagingGE/Image3dAPI.nuspec index 2f9a9d1..f082e0a 100644 --- a/PackagingGE/Image3dAPI.nuspec +++ b/PackagingGE/Image3dAPI.nuspec @@ -16,7 +16,7 @@ <> changelog in docs/changelog.txt - Copyright 2015-2018 + Copyright 2015-2020 From e7859fa2a099232c9246000ed65d60ba5fb5702f Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Mon, 23 Mar 2020 07:45:16 +0100 Subject: [PATCH 4/4] API: Upgrade version to 2.0. --- DummyLoader/DummyLoader.idl | 6 +++--- Image3dAPI/IImage3d.idl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DummyLoader/DummyLoader.idl b/DummyLoader/DummyLoader.idl index 4546899..ef31ef0 100644 --- a/DummyLoader/DummyLoader.idl +++ b/DummyLoader/DummyLoader.idl @@ -4,7 +4,7 @@ import "IImage3d.idl"; [ - version(1.2), + version(2.0), uuid(ED4540BD-07B5-44B0-BCDE-3E2C1D99183B), helpstring("DummyLoader module") ] @@ -13,7 +13,7 @@ library DummyLoader importlib("stdole2.tlb"); [ - version(1.2), + version(2.0), uuid(50BE330D-F729-4D8F-A1E4-C939E0598EDF), helpstring("3D image source") ] @@ -23,7 +23,7 @@ library DummyLoader }; [ - version(1.2), + version(2.0), uuid(1326A2C6-7753-4584-B866-CDF3C6E240F1), helpstring("3D image file loader") ] diff --git a/Image3dAPI/IImage3d.idl b/Image3dAPI/IImage3d.idl index 6bc27d5..80611de 100644 --- a/Image3dAPI/IImage3d.idl +++ b/Image3dAPI/IImage3d.idl @@ -17,8 +17,8 @@ typedef [ v1_enum, // 32bit enum size helpstring("Image3dAPI version.")] enum Image3dAPIVersion { - IMAGE3DAPI_VERSION_MAJOR = 1, - IMAGE3DAPI_VERSION_MINOR = 2, + IMAGE3DAPI_VERSION_MAJOR = 2, + IMAGE3DAPI_VERSION_MINOR = 0, } Image3dAPIVersion;