2 files changed, 17 insertions, 0 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/inc/verutil.h b/src/libs/dutil/WixToolset.DUtil/inc/verutil.h
index 4fdaa522..cab18be7 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/verutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/verutil.h
@@ -28,6 +28,10 @@ typedef struct _VERUTIL_VERSION
     VERUTIL_VERSION_RELEASE_LABEL* rgReleaseLabels;
     SIZE_T cchMetadataOffset;
     BOOL fInvalid;
+    BOOL fHasMajor;
+    BOOL fHasMinor;
+    BOOL fHasPatch;
+    BOOL fHasRevision;
 } VERUTIL_VERSION;
 
 /*******************************************************************
diff --git a/src/libs/dutil/WixToolset.DUtil/verutil.cpp b/src/libs/dutil/WixToolset.DUtil/verutil.cpp
index 30b979b1..276441b5 100644
--- a/src/libs/dutil/WixToolset.DUtil/verutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/verutil.cpp
@@ -196,9 +196,13 @@ DAPI_(HRESULT) VerCopyVersion(
 
     pCopy->chPrefix = pSource->chPrefix;
     pCopy->dwMajor = pSource->dwMajor;
+    pCopy->fHasMajor = pSource->fHasMajor;
     pCopy->dwMinor = pSource->dwMinor;
+    pCopy->fHasMinor = pSource->fHasMinor;
     pCopy->dwPatch = pSource->dwPatch;
+    pCopy->fHasPatch = pSource->fHasPatch;
     pCopy->dwRevision = pSource->dwRevision;
+    pCopy->fHasRevision = pSource->fHasRevision;
 
     if (pSource->cReleaseLabels)
     {
@@ -370,15 +374,19 @@ DAPI_(HRESULT) VerParseVersion(
         {
         case 0:
             pVersion->dwMajor = uPart;
+            pVersion->fHasMajor = TRUE;
             break;
         case 1:
             pVersion->dwMinor = uPart;
+            pVersion->fHasMinor = TRUE;
             break;
         case 2:
             pVersion->dwPatch = uPart;
+            pVersion->fHasPatch = TRUE;
             break;
         case 3:
             pVersion->dwRevision = uPart;
+            pVersion->fHasRevision = TRUE;
             break;
         }
 
@@ -549,6 +557,11 @@ DAPI_(HRESULT) VerVersionFromQword(
     pVersion->dwPatch = (WORD)(qwVersion >> 16 & 0xffff);
     pVersion->dwRevision = (WORD)(qwVersion & 0xffff);
 
+    pVersion->fHasMajor = TRUE;
+    pVersion->fHasMinor = TRUE;
+    pVersion->fHasPatch = TRUE;
+    pVersion->fHasRevision = TRUE;
+
     hr = StrAllocFormatted(&pVersion->sczVersion, L"%lu.%lu.%lu.%lu", pVersion->dwMajor, pVersion->dwMinor, pVersion->dwPatch, pVersion->dwRevision);
     ExitOnFailure(hr, "Failed to allocate and format the version string.");