diff --git a/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.props b/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.props
new file mode 100644
index 00000000..41e4baae
--- /dev/null
+++ b/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.props
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+ 100
+
+ $(SystemDrive)\WinDDK\7600.16385.1
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework@InstallRoot)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework@InstallRoot)
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)
+
+ v4.0
+ v3.5
+
+ $(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);
+ $(WDKInstallDir)\inc\api;$(WDKInstallDir)\inc\crt;$(WDKInstallDir)\inc\api\crt\stl70;$(WDKInstallDir)\inc\mfc42;$(WDKInstallDir)\inc\ddk;$(WDKInstallDir)\inc\api\dao360;
+ $(WDKInstallDir)\lib\wxp\i386;$(WDKInstallDir)\lib\Crt\i386;$(WDKInstallDir)\lib\Mfc\i386;$(WDKInstallDir)\lib\ATL\i386
+ $(VCInstallDir)atlmfc\src\mfc;$(VCInstallDir)atlmfc\src\mfcm;$(VCInstallDir)atlmfc\src\atl;$(VCInstallDir)crt\src;
+ $(ExecutablePath)
+
+
+
+
+ msvcrt_winxp.obj;%(AdditionalDependencies)
+
+
+ true
+
+
+ true
+
+
+ true
+ true
+ false
+
+
+
+
+
diff --git a/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.targets b/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.targets
new file mode 100644
index 00000000..f68a78bc
--- /dev/null
+++ b/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.targets
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
diff --git a/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.props b/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.props
new file mode 100644
index 00000000..7f72f8e2
--- /dev/null
+++ b/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.props
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+ 100
+
+ $(SystemDrive)\WinDDK\7600.16385.1
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework@InstallRoot)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework@InstallRoot)
+
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)
+ $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)
+
+ v4.0
+ v3.5
+
+ $(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(FrameworkSDKDir)\lib\win64;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);
+ $(WDKInstallDir)\inc\api;$(WDKInstallDir)\inc\crt;$(WDKInstallDir)\inc\api\crt\stl70;$(WDKInstallDir)\inc\mfc42;$(WDKInstallDir)\inc\ddk;$(WDKInstallDir)\inc\api\dao360;
+ $(WDKInstallDir)\lib\wnet\amd64;$(WDKInstallDir)\lib\Crt\amd64;$(WDKInstallDir)\lib\Mfc\amd64;$(WDKInstallDir)\lib\ATL\amd64;
+ $(VCInstallDir)atlmfc\src\mfc;$(VCInstallDir)atlmfc\src\mfcm;$(VCInstallDir)atlmfc\src\atl;$(VCInstallDir)crt\src;
+ $(VCInstallDir)bin\AMD64;$(VCInstallDir)VCPackages;$(WindowsSdkDir)bin\NETFX 4.0 Tools\x64;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin\x64;$(WindowsSdkDir)bin\win64\x64;$(WindowsSdkDir)bin;$(MSBuildToolsPath);$(PATH);
+
+
+
+
+ msvcrt_win2003.obj;%(AdditionalDependencies)
+
+
+ true
+
+
+ true
+
+
+ true
+ true
+ false
+
+
+
+
+
diff --git a/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.targets b/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.targets
new file mode 100644
index 00000000..fa6651e1
--- /dev/null
+++ b/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.targets
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
diff --git a/win32/wdkpt/vs2010/wdkpt.aip b/win32/wdkpt/vs2010/wdkpt.aip
new file mode 100644
index 00000000..93c78967
--- /dev/null
+++ b/win32/wdkpt/vs2010/wdkpt.aip
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win32/wdkpt/Microsoft.Cpp.Win32.WDK7.props b/win32/wdkpt/vs2012/Microsoft.Cpp.Win32.WDK7.props
similarity index 100%
rename from win32/wdkpt/Microsoft.Cpp.Win32.WDK7.props
rename to win32/wdkpt/vs2012/Microsoft.Cpp.Win32.WDK7.props
diff --git a/win32/wdkpt/Microsoft.Cpp.Win32.WDK7.targets b/win32/wdkpt/vs2012/Microsoft.Cpp.Win32.WDK7.targets
similarity index 100%
rename from win32/wdkpt/Microsoft.Cpp.Win32.WDK7.targets
rename to win32/wdkpt/vs2012/Microsoft.Cpp.Win32.WDK7.targets
diff --git a/win32/wdkpt/Microsoft.Cpp.x64.WDK7.props b/win32/wdkpt/vs2012/Microsoft.Cpp.x64.WDK7.props
similarity index 100%
rename from win32/wdkpt/Microsoft.Cpp.x64.WDK7.props
rename to win32/wdkpt/vs2012/Microsoft.Cpp.x64.WDK7.props
diff --git a/win32/wdkpt/Microsoft.Cpp.x64.WDK7.targets b/win32/wdkpt/vs2012/Microsoft.Cpp.x64.WDK7.targets
similarity index 100%
rename from win32/wdkpt/Microsoft.Cpp.x64.WDK7.targets
rename to win32/wdkpt/vs2012/Microsoft.Cpp.x64.WDK7.targets
diff --git a/win32/wdkpt/wdkpt.aip b/win32/wdkpt/vs2012/wdkpt.aip
similarity index 100%
rename from win32/wdkpt/wdkpt.aip
rename to win32/wdkpt/vs2012/wdkpt.aip