Skip to content

API: Update GUID's to prepare for a new API release - DO NOT MERGE YET #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
forderud wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

API: Update GUID's to prepare for a new API release - DO NOT MERGE YET #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b56d5b0
Update interface GUID's to prepare for a new API release
Dec 31, 2019
22b643a
Update DummyLoader GUID's to prepare for a new API release
Dec 31, 2019
f52b5cd
Update copyright year.
Dec 31, 2019
e7859fa
API: Upgrade version to 2.0.
Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions DummyLoader/DummyLoader.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import "IImage3d.idl";


[
version(1.2),
uuid(67E59584-3F6A-4852-8051-103A4583CA5E),
version(2.0),
uuid(ED4540BD-07B5-44B0-BCDE-3E2C1D99183B),
helpstring("DummyLoader module")
]
library DummyLoader
{
importlib("stdole2.tlb");

[
version(1.2),
uuid(6FA82ED5-6332-4344-8417-DEA55E72098C),
version(2.0),
uuid(50BE330D-F729-4D8F-A1E4-C939E0598EDF),
helpstring("3D image source")
]
coclass Image3dSource
Expand All @@ -23,8 +23,8 @@ library DummyLoader
};

[
version(1.2),
uuid(8E754A72-0067-462B-9267-E84AF84828F1),
version(2.0),
uuid(1326A2C6-7753-4584-B866-CDF3C6E240F1),
helpstring("3D image file loader")
]
coclass Image3dFileLoader
Expand Down
2 changes: 1 addition & 1 deletion DummyLoader/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions DummyLoader/UNREGISTER_DummyLoader.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
)

Expand Down
8 changes: 4 additions & 4 deletions Image3dAPI/IImage3d.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down Expand Up @@ -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")]
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Image3dAPI/IImage3dTypeLibraryGenerator.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Image3dAPI/UNREGISTER_Image3dAPI.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion PackagingGE/DummyLoader.redist.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<owners>Fredrik Orderud</owners>
<version><<GIT-VERSION>></version>
<releaseNotes>changelog in docs/changelog.txt</releaseNotes>
<copyright>Copyright 2015-2018</copyright>
<copyright>Copyright 2015-2020</copyright>

<dependencies>
<dependency id="Image3dAPI" version="<<GIT-VERSION>>" />
Expand Down
2 changes: 1 addition & 1 deletion PackagingGE/Image3dAPI.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<version><<GIT-VERSION>></version>

<releaseNotes>changelog in docs/changelog.txt</releaseNotes>
<copyright>Copyright 2015-2018</copyright>
<copyright>Copyright 2015-2020</copyright>
</metadata>

<files>
Expand Down