samples update for //build

4 files changed, 8 insertions, 15 deletions

diff --git a/storage/sfloppy/src/floppy.c b/storage/sfloppy/src/floppy.c
index b35f7b6a..f4c9634d 100644
--- a/storage/sfloppy/src/floppy.c
+++ b/storage/sfloppy/src/floppy.c
@@ -1907,7 +1907,7 @@ Return Value:
 
     if ((pageData != NULL) &&
         (pageData->PageLength + 2 >=
-         offsetof(MODE_FLEXIBLE_DISK_PAGE, StartWritePrecom))) {
+         (UCHAR)offsetof(MODE_FLEXIBLE_DISK_PAGE, StartWritePrecom))) {
 
        //
        // Pull out the heads, cylinders, and sectors.
@@ -2152,7 +2152,7 @@ Return Value:
 
     if ((pageData == NULL) ||
         (pageData->PageLength + 2 <
-         offsetof(MODE_FLEXIBLE_DISK_PAGE, StartWritePrecom))) {
+         (UCHAR)offsetof(MODE_FLEXIBLE_DISK_PAGE, StartWritePrecom))) {
 
         ExFreePool(modeData);
         return(STATUS_INVALID_DEVICE_REQUEST);
diff --git a/storage/sfloppy/src/sfloppy.inf b/storage/sfloppy/src/sfloppy.inf
index 186db7bb..c7926d37 100644
--- a/storage/sfloppy/src/sfloppy.inf
+++ b/storage/sfloppy/src/sfloppy.inf
@@ -32,13 +32,6 @@ DefaultDestDir=12
 [Manufacturer]
 %GenManufacturer%=floppy_device,NTx86,NTia64,NTamd64
 
-[floppy_device]
-%sfloppy_devdesc%=sfloppy_install,GenSFloppy
-%sfloppy_devdesc%=sfloppy_install,SCSI\DiskMATSHITALS-120_COSM___04
-%sfloppy_devdesc%=sfloppy_install,SCSI\DiskCOMPAQ__LS-120_VER5___AB
-%sfloppy_devdesc%=sfloppy_install,SCSI\DiskCOMPAQ__LS-120_HIMA___01
-%sfloppy_devdesc%=sfloppy_install,SCSI\DiskMATSHITALS-120_VER5___00
-
 [floppy_device.NTx86]
 %sfloppy_devdesc%=sfloppy_install,GenSFloppy
 %sfloppy_devdesc%=sfloppy_install,SCSI\DiskMATSHITALS-120_COSM___04
diff --git a/storage/sfloppy/src/sfloppy.vcxproj b/storage/sfloppy/src/sfloppy.vcxproj
index a432f928..51ddc866 100644
--- a/storage/sfloppy/src/sfloppy.vcxproj
+++ b/storage/sfloppy/src/sfloppy.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{5D81B127-32DF-4942-8E61-C6A5A43C52C8}</ProjectGuid>
+    <ProjectGuid>{D0708482-EBB5-4AA4-A213-83C4E1997327}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <SupportsPackaging>false</SupportsPackaging>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{70BD061D-EA75-4D96-9296-D79A1887C7D3}</SampleGuid>
+    <SampleGuid>{FF40AD7B-43CA-4917-9BD5-1F66F696A48B}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/storage/sfloppy/src/sfloppy.vcxproj.Filters b/storage/sfloppy/src/sfloppy.vcxproj.Filters
index b7fed0d6..6e61336a 100644
--- a/storage/sfloppy/src/sfloppy.vcxproj.Filters
+++ b/storage/sfloppy/src/sfloppy.vcxproj.Filters
@@ -3,19 +3,19 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{8D3F32CD-4FD5-462D-A317-9B725AB465BC}</UniqueIdentifier>
+      <UniqueIdentifier>{72E51A2A-765E-4295-BC0C-8BA66207BCEE}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{892C7033-E808-47F9-80E6-F68B9B2970B9}</UniqueIdentifier>
+      <UniqueIdentifier>{A0E005F4-468E-41D1-B484-84ED829BCCEE}</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>{DB7B6F5B-7BB7-4A6C-9284-6BEDF6E46D99}</UniqueIdentifier>
+      <UniqueIdentifier>{94587BDC-6D5B-42D6-BCE5-BEC6E77511AE}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{465C4749-C790-46BF-9CEA-4C11509670EE}</UniqueIdentifier>
+      <UniqueIdentifier>{F24E2189-1E6D-44D7-AF6D-A39A4B8B8160}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>