4 files changed, 23 insertions, 26 deletions
diff --git a/storage/ramdisk/ramdisk.sln b/storage/ramdisk/ramdisk.sln
index b9097f75..a94adfd1 100644
--- a/storage/ramdisk/ramdisk.sln
+++ b/storage/ramdisk/ramdisk.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WdfRamdisk", "src\WdfRamdisk.vcxproj", "{FAEE8721-3E3F-4338-8E7B-1BE9FC028C15}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WdfRamdisk", "src\WdfRamdisk.vcxproj", "{8BD18F95-E980-494A-9058-F0DA28C0ECB9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FAEE8721-3E3F-4338-8E7B-1BE9FC028C15}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FAEE8721-3E3F-4338-8E7B-1BE9FC028C15}.Debug|Win32.Build.0 = Debug|Win32
-		{FAEE8721-3E3F-4338-8E7B-1BE9FC028C15}.Release|Win32.ActiveCfg = Release|Win32
-		{FAEE8721-3E3F-4338-8E7B-1BE9FC028C15}.Release|Win32.Build.0 = Release|Win32
-		{FAEE8721-3E3F-4338-8E7B-1BE9FC028C15}.Debug|x64.ActiveCfg = Debug|x64
-		{FAEE8721-3E3F-4338-8E7B-1BE9FC028C15}.Debug|x64.Build.0 = Debug|x64
-		{FAEE8721-3E3F-4338-8E7B-1BE9FC028C15}.Release|x64.ActiveCfg = Release|x64
-		{FAEE8721-3E3F-4338-8E7B-1BE9FC028C15}.Release|x64.Build.0 = Release|x64
+		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Debug|Win32.Build.0 = Debug|Win32
+		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Release|Win32.ActiveCfg = Release|Win32
+		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Release|Win32.Build.0 = Release|Win32
+		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Debug|x64.ActiveCfg = Debug|x64
+		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Debug|x64.Build.0 = Debug|x64
+		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Release|x64.ActiveCfg = Release|x64
+		{8BD18F95-E980-494A-9058-F0DA28C0ECB9}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/storage/ramdisk/src/WdfRamdisk.vcxproj b/storage/ramdisk/src/WdfRamdisk.vcxproj
index 64f70c23..655faf0f 100644
--- a/storage/ramdisk/src/WdfRamdisk.vcxproj
+++ b/storage/ramdisk/src/WdfRamdisk.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{FAEE8721-3E3F-4338-8E7B-1BE9FC028C15}</ProjectGuid>
+    <ProjectGuid>{8BD18F95-E980-494A-9058-F0DA28C0ECB9}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{987E33B7-1E8D-4015-A46C-08667083FC5F}</SampleGuid>
+    <SampleGuid>{E179004E-17AB-4904-B671-B3D996E2E00C}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -146,7 +146,6 @@
   <ItemGroup>
     <Inf Exclude="@(Inf)" Include="*.inf" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
diff --git a/storage/ramdisk/src/WdfRamdisk.vcxproj.Filters b/storage/ramdisk/src/WdfRamdisk.vcxproj.Filters
index 1e94b2f4..d4dc5230 100644
--- a/storage/ramdisk/src/WdfRamdisk.vcxproj.Filters
+++ b/storage/ramdisk/src/WdfRamdisk.vcxproj.Filters
@@ -3,25 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{D9F38118-6A63-448F-A1E6-428B134C40FF}</UniqueIdentifier>
+      <UniqueIdentifier>{B4C67F3E-3D06-47B0-A09C-4E0740919AF8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{13BF032A-5FDD-40A6-BA9C-3C48A3EF713E}</UniqueIdentifier>
+      <UniqueIdentifier>{74F7327B-A6C4-481F-998B-5D49FAC38D3D}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{301177B6-FDBA-46E7-BA20-E5AAE5CA0223}</UniqueIdentifier>
+      <UniqueIdentifier>{1E530CA0-70B5-4B7F-A753-F3CDA9804897}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{8D1F3AF6-FD7D-4065-8ADA-FFBF156120D3}</UniqueIdentifier>
+      <UniqueIdentifier>{7B63C0F9-A06F-453D-8701-3EA7C844F62D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include=".\Debug\\ramdisk.inf">
-      <Filter>Driver Files</Filter>
-    </FilesToPackage>
     <Inf Include=".\ramdisk.inx">
       <Filter>Driver Files</Filter>
     </Inf>
diff --git a/storage/ramdisk/src/ramdisk.inx b/storage/ramdisk/src/ramdisk.inx
index 40ad4b1b..85210823 100644
--- a/storage/ramdisk/src/ramdisk.inx
+++ b/storage/ramdisk/src/ramdisk.inx
@@ -11,7 +11,7 @@
 Signature="$WINDOWS NT$"
 Class=Sample
 ClassGuid={78A1C341-4539-11d3-B88D-00C04FAD5171}
-Provider=%MSFT%
+Provider=%ProviderString%
 DriverVer=11/14/1999,5.00.2183.1
 CatalogFile=KmdfSamples.cat
 
@@ -35,7 +35,7 @@ WdfRamdisk.sys
 WdfRamdisk.sys=1
 
 [Manufacturer]
-%MSFT% = DiskDevice,NT$ARCH$
+%ManufacturerString% = DiskDevice,NT$ARCH$
 
 ; For XP and later
 [DiskDevice.NT$ARCH$]
@@ -87,11 +87,12 @@ KmdfLibraryVersion = $KMDFVERSION$
 
 
 [Strings]
-MSFT            = "Microsoft"
-ClassName       = "Sample Device"
-DiskDevDesc     = "WDF Sample RAM disk Driver"
-DiskServiceDesc = "Ramdisk Driver"
-InstDisk        = "Ramdisk Install Disk"
+ProviderString     = "TODO-Set-Provider"
+ManufacturerString = "TODO-Set-Manufacturer"
+ClassName          = "Sample Device"
+DiskDevDesc        = "WDF Sample RAM disk Driver"
+DiskServiceDesc    = "Ramdisk Driver"
+InstDisk           = "Ramdisk Install Disk"
 ;*******************************************
 ;Handy macro substitutions (non-localizable)
 SPSVCINST_ASSOCSERVICE = 0x00000002