Address PR feedback

dotnet · Sep 4, 2019 · c16900c · c16900c
1 parent 2857de1
commit c16900c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/src/Common/src/Interop/Windows/Kernel32/Interop.ReadFile_Bool_SafeHandle_IntPtr.cs b/src/Common/src/Interop/Windows/Kernel32/Interop.ReadFile_Bool_SafeHandle_IntPtr.cs
diff --git a/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj
@@ -15,8 +15,8 @@
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
       <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.ReadFile_Bool_SafeHandle_IntPtr.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.ReadFile_Bool_SafeHandle_IntPtr.cs</Link>
+    <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs">
+      <Link>Common\CoreLib\Interop\Windows\kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs</Link>
     </Compile>
     <Compile Include="System\Reflection\Internal\Utilities\PinnedObject.cs" />
     <Compile Include="System\Reflection\Internal\Utilities\CriticalDisposableObject.cs" Condition="'$(TargetGroup)' != 'netstandard1.1'" />

diff --git a/...tem.Reflection.Metadata/src/System/Reflection/Internal/Utilities/FileStreamReadLightUp.cs b/...tem.Reflection.Metadata/src/System/Reflection/Internal/Utilities/FileStreamReadLightUp.cs
@@ -53,7 +53,7 @@ internal static unsafe bool TryReadFile(Stream stream, byte* buffer, long start,
                 return false;
             }
 
-            bool result = false;
+            int result = 0;
             int bytesRead = 0;
 
             try
@@ -66,7 +66,7 @@ internal static unsafe bool TryReadFile(Stream stream, byte* buffer, long start,
                 return false;
             }
 
-            if (!result || bytesRead != size)
+            if (result == 0 || bytesRead != size)
             {
                 // We used to throw here, but this is where we land if the FileStream was
                 // opened with useAsync: true, which is currently the default on .NET Core.