diff --git a/msvc2005/exiv2.sln b/msvc2005/exiv2.sln
index dfea4a8f..27fd0073 100644
--- a/msvc2005/exiv2.sln
+++ b/msvc2005/exiv2.sln
@@ -25,91 +25,109 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addmoddel", "addmoddel\addmoddel.vcproj", "{83914D93-57B3-4718-8A50-662C17C4AE8F}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iptctest", "iptctest\iptctest.vcproj", "{AD41F87C-242B-4B61-B767-A9879F0D5C04}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "easyaccess-test", "easyaccess-test\easyaccess-test.vcproj", "{30E18D87-0147-4601-9ED2-4D5291645DB3}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "largeiptc-test", "largeiptc-test\largeiptc-test.vcproj", "{953404C9-B20A-4D17-8262-9D9AD1CDC5C1}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convert-test", "convert-test\convert-test.vcproj", "{D802FE1E-7868-4034-92B8-00865E1CABAB}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iotest", "iotest\iotest.vcproj", "{21F0CEB1-D850-4C29-88BF-1CE4171824E6}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iptcprint", "iptcprint\iptcprint.vcproj", "{A7D22798-1262-4194-94A5-C636BCB68329}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "key-test", "key-test\key-test.vcproj", "{F11358FA-AA36-46E1-BA80-A17B8042BF9B}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mmap-test", "mmap-test\mmap-test.vcproj", "{556CB4FC-33BB-4E67-AB0E-1865E67176A5}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prevtest", "prevtest\prevtest.vcproj", "{FC7120EC-BEB2-4CC3-9B90-B022F560E584}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stringto-test", "stringto-test\stringto-test.vcproj", "{9DCEE051-A07B-4C6B-B2BC-0814F0C323AA}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiff-test", "tiff-test\tiff-test.vcproj", "{C34B11A1-B707-46B2-8053-2FA236B369CF}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "werror-test", "werror-test\werror-test.vcproj", "{430C4512-CC73-4943-8CDF-71DEA573BD47}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "write-test", "write-test\write-test.vcproj", "{98A9F59D-FDFE-4B27-88FE-2625F1E7597F}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "write2-test", "write2-test\write2-test.vcproj", "{E796088F-0EE6-4EC7-ABA0-8A18F54A4DD7}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exifdata-test", "exifdata-test\exifdata-test.vcproj", "{FEF9C19E-F774-4D8A-991C-A566C1B2E8B6}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exifprint", "exifprint\exifprint.vcproj", "{BFB98A96-7ABD-4F78-BA8B-2C2C257D74D8}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpsample", "xmpsample\xmpsample.vcproj", "{45CA5427-4260-4F4A-86B0-FB7AE233D76B}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpparser-test", "xmpparser-test\xmpparser-test.vcproj", "{85121FD0-01A1-49BA-B168-CC8D90F91A6F}"
@@ -120,42 +138,50 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpparse", "xmpparse\xmpparse.vcproj", "{1708EFC1-414E-4712-80A5-813A6F38814C}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exifcomment", "exifcomment\exifcomment.vcproj", "{D291B6EF-986B-4222-ADA6-38A2EC2A56CE}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metacopy", "metacopy\metacopy.vcproj", "{AD231915-942F-4083-9671-85E26A5798B0}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "path-test", "path-test\path-test.vcproj", "{E04D48BF-F529-4267-9311-908E94DF5A49}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iptceasy", "iptceasy\iptceasy.vcproj", "{6860BB9B-2053-46CD-9E2D-EEC199D68982}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taglist", "taglist\taglist.vcproj", "{DBD630FC-0DA9-41EB-925D-70654D01F6FA}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utiltest", "utiltest\utiltest.vcproj", "{495BC686-DF50-4250-B469-9C6B7B33A4B8}"
ProjectSection(ProjectDependencies) = postProject
{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "geotag", "geotag\geotag.vcproj", "{E3073076-4837-4DDB-89E5-5AC297C7481D}"
ProjectSection(ProjectDependencies) = postProject
- {831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
{6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A} = {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}
+ {07293CAC-00DA-493E-90C9-5D010C2B1B53} = {07293CAC-00DA-493E-90C9-5D010C2B1B53}
+ {831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
EndProjectSection
EndProject
Global
diff --git a/msvc2005/exiv2/exiv2.vcproj b/msvc2005/exiv2/exiv2.vcproj
index dbc72b88..13e99dac 100644
--- a/msvc2005/exiv2/exiv2.vcproj
+++ b/msvc2005/exiv2/exiv2.vcproj
@@ -1,18 +1,793 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/exiv2app.hpp b/src/exiv2app.hpp
index 31ff6d55..7339d268 100644
--- a/src/exiv2app.hpp
+++ b/src/exiv2app.hpp
@@ -46,7 +46,15 @@
//! Command identifiers
enum CmdId { invalidCmdId, add, set, del, reg };
//! Metadata identifiers
-enum MetadataId { invalidMetadataId, iptc, exif, xmp };
+// enum MetadataId { invalidMetadataId, iptc, exif, xmp };
+//! Metadata identifiers
+// mdNone=0, mdExif=1, mdIptc=2, mdComment=4, mdXmp=8
+enum MetadataId { invalidMetadataId = Exiv2::mdNone
+ , iptc = Exiv2::mdIptc
+ , exif = Exiv2::mdExif
+ , xmp = Exiv2::mdXmp
+ } ;
+
//! Structure for one parsed modification command
struct ModifyCmd {
//! C'tor
diff --git a/src/types.hpp b/src/types.hpp
index 529c9763..8bf258b3 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -74,7 +74,7 @@ typedef __int64 int64_t;
# define EXV_WIDEN(t) L ## t
#endif
-#ifdef __MINGW__
+#if defined(__MINGW__) || defined(_MSC_VER)
typedef unsigned char u_int8_t;
typedef unsigned short u_int16_t;
typedef unsigned int u_int32_t;
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index a09d70ef..b8dd32bf 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -263,7 +263,7 @@ source ./functions.source
copyTestFile $dataname
copyTestFile $diffname
runTest exiv2 -pa $filename | sort > $num-before.txt
- exiv2 -m $dataname $filename
+ runTest exiv2 -m $dataname $filename
runTest exiv2 -pa $filename | sort > $num-after.txt
diff $num-before.txt $num-after.txt > $num.txt
diff $num.txt $diffname