diff --git a/build/VStudio/installer/Product.wxs b/build/VStudio/installer/Product.wxs
index c8ea5e16..bc59a973 100644
--- a/build/VStudio/installer/Product.wxs
+++ b/build/VStudio/installer/Product.wxs
@@ -208,6 +208,9 @@
                 <Component Id="C.winfsp.h">
                     <File Name="winfsp.h" KeyPath="yes" />
                 </Component>
+                <Component Id="C.winfsp.hpp">
+                    <File Name="winfsp.hpp" KeyPath="yes" />
+                </Component>
             </Directory>
             <Directory Id="INCDIR.fuse" Name="fuse">
                 <Component Id="C.fuse.h">
@@ -278,6 +281,20 @@
                     <File Name="passthrough.vcxproj.filters" KeyPath="yes" />
                 </Component>
             </Directory>
+            <Directory Id="SMPDIR.passthrough_cpp" Name="passthrough-cpp">
+                <Component Id="C.passthrough_cpp.cpp">
+                    <File Name="passthrough-cpp.cpp" KeyPath="yes" />
+                </Component>
+                <Component Id="C.passthrough_cpp.sln">
+                    <File Name="passthrough-cpp.sln" KeyPath="yes" />
+                </Component>
+                <Component Id="C.passthrough_cpp.vcxproj">
+                    <File Name="passthrough-cpp.vcxproj" KeyPath="yes" />
+                </Component>
+                <Component Id="C.passthrough_cpp.vcxproj.filters">
+                    <File Name="passthrough-cpp.vcxproj.filters" KeyPath="yes" />
+                </Component>
+            </Directory>
             <Directory Id="SMPDIR.passthrough_fuse" Name="passthrough-fuse">
                 <Component Id="C.passthrough_fuse.c">
                     <File Name="passthrough-fuse.c" KeyPath="yes" />
@@ -357,6 +374,7 @@
         <ComponentGroup Id="C.WinFsp.inc">
             <ComponentRef Id="C.fsctl.h" />
             <ComponentRef Id="C.winfsp.h" />
+            <ComponentRef Id="C.winfsp.hpp" />
             <ComponentRef Id="C.fuse.h" />
             <ComponentRef Id="C.fuse_common.h" />
             <ComponentRef Id="C.fuse_opt.h" />
@@ -378,6 +396,10 @@
             <ComponentRef Id="C.passthrough.sln" />
             <ComponentRef Id="C.passthrough.vcxproj" />
             <ComponentRef Id="C.passthrough.vcxproj.filters" />
+            <ComponentRef Id="C.passthrough_cpp.cpp" />
+            <ComponentRef Id="C.passthrough_cpp.sln" />
+            <ComponentRef Id="C.passthrough_cpp.vcxproj" />
+            <ComponentRef Id="C.passthrough_cpp.vcxproj.filters" />
             <ComponentRef Id="C.passthrough_fuse.c" />
             <ComponentRef Id="C.passthrough_fuse.winposix.c" />
             <ComponentRef Id="C.passthrough_fuse.winposix.h" />
diff --git a/tools/run-tests.bat b/tools/run-tests.bat
index 23dafa52..2598f485 100755
--- a/tools/run-tests.bat
+++ b/tools/run-tests.bat
@@ -60,6 +60,8 @@ set opt_tests=^
     ifstest-memfs-x86-disk ^
     sample-passthrough-x64 ^
     sample-passthrough-x86 ^
+    sample-passthrough-cpp-x64 ^
+    sample-passthrough-cpp-x86 ^
     sample-passthrough-fuse-x64 ^
     sample-passthrough-fuse-x86
 
@@ -491,6 +493,16 @@ call :__sample-passthrough x86
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
+:sample-passthrough-cpp-x64
+call :__sample-passthrough cpp-x64
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
+:sample-passthrough-cpp-x86
+call :__sample-passthrough cpp-x86
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
 :__sample-passthrough
 set SamplePassthroughExit=0
 call %ProjRoot%\tools\build-sample %Configuration% %1 passthrough "%TMP%\passthrough-%1"