Updated for "Windows 10 Anniversary Update" (Version 1607)

1 files changed, 15 insertions, 2 deletions

diff --git a/filesys/cdfs/fsctrl.c b/filesys/cdfs/fsctrl.c
index 8ff03dbd..8a113f04 100644
--- a/filesys/cdfs/fsctrl.c
+++ b/filesys/cdfs/fsctrl.c
@@ -641,6 +641,7 @@ Return Value:
 
 #ifdef CDFS_TELEMETRY_DATA
     GUID VolumeGuid;
+    GUID VolumeCorrelationId = { 0 };
 #endif
 
     PAGED_CODE();
@@ -898,6 +899,19 @@ Return Value:
             RtlCopyMemory( &CdTelemetryData.VolumeGuid, &VolumeGuid, sizeof(GUID) );
         }
 
+        //
+        // Initialize the correlation ID.
+        //
+
+        if (NT_SUCCESS( FsRtlVolumeDeviceToCorrelationId( Vcb->TargetDeviceObject, &VolumeCorrelationId ) )) {
+
+            //
+            // Stash a copy away in the VCB.
+            //
+
+            RtlCopyMemory( &Vcb->VolumeCorrelationId, &VolumeCorrelationId, sizeof( GUID ) );
+        }
+
 #endif // CDFS_TELEMETRY_DATA
 
         // Lock object is acquired and released using internal state
@@ -1229,8 +1243,7 @@ Return Value:
     // Send Telemetry
     //
 
-    RtlCopyMemory( &VolumeGuid, &CdTelemetryData.VolumeGuid, sizeof(GUID) );
-    CdTelemetryMountSafe(&VolumeGuid, STATUS_SUCCESS, Vcb);
+    CdTelemetryMountSafe( &VolumeCorrelationId, STATUS_SUCCESS, Vcb );
 
 #endif