From e0dde7349e9bce2928f3ad4866737c029b553709 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Thu, 28 Apr 2016 15:02:00 -0700
Subject: [PATCH] sys,dll,tst: ensure that project compiles for x86

---
 inc/winfsp/fsctl.h  |  2 +-
 src/dll/fsop.c      |  2 +-
 src/sys/volume.c    |  2 +-
 tst/memfs/memfs.cpp | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/inc/winfsp/fsctl.h b/inc/winfsp/fsctl.h
index 960c3670..3fc26327 100644
--- a/inc/winfsp/fsctl.h
+++ b/inc/winfsp/fsctl.h
@@ -311,7 +311,7 @@ typedef struct
     UINT64 Hint;
     struct
     {
-        UINT64 Information;
+        UINT32 Information;
         UINT32 Status;
     } IoStatus;
     union
diff --git a/src/dll/fsop.c b/src/dll/fsop.c
index ccfc8e1e..2ebdfb0a 100644
--- a/src/dll/fsop.c
+++ b/src/dll/fsop.c
@@ -304,7 +304,7 @@ static NTSTATUS FspFileSystemOpCreate_FileOpenTargetDirectory(FSP_FILE_SYSTEM *F
     UINT32 GrantedAccess;
     PVOID FileNode;
     FSP_FSCTL_FILE_INFO FileInfo;
-    UINT_PTR Information;
+    UINT32 Information;
 
     Result = FspAccessCheck(FileSystem, Request, TRUE, TRUE,
         Request->Req.Create.DesiredAccess, &GrantedAccess);
diff --git a/src/sys/volume.c b/src/sys/volume.c
index f0bfc6f4..39f056d2 100644
--- a/src/sys/volume.c
+++ b/src/sys/volume.c
@@ -693,7 +693,7 @@ NTSTATUS FspVolumeTransact(
         if (0 == ProcessIrp)
         {
             /* either IRP was canceled or a bogus Hint was provided */
-            DEBUGLOG("BOGUS(Kind=%d, Hint=%p)", Response->Kind, (PVOID)Response->Hint);
+            DEBUGLOG("BOGUS(Kind=%d, Hint=%p)", Response->Kind, (PVOID)(UINT_PTR)Response->Hint);
             Response = NextResponse;
             continue;
         }
diff --git a/tst/memfs/memfs.cpp b/tst/memfs/memfs.cpp
index 6fa5fbd7..f9ec47ff 100644
--- a/tst/memfs/memfs.cpp
+++ b/tst/memfs/memfs.cpp
@@ -396,7 +396,7 @@ static NTSTATUS Create(FSP_FILE_SYSTEM *FileSystem,
     FileNode->FileInfo.AllocationSize = AllocationSize;
     if (0 != FileNode->FileInfo.AllocationSize)
     {
-        FileNode->FileData = malloc(FileNode->FileInfo.AllocationSize);
+        FileNode->FileData = malloc((size_t)FileNode->FileInfo.AllocationSize);
         if (0 == FileNode->FileData)
         {
             MemfsFileNodeDelete(FileNode);
@@ -507,7 +507,7 @@ static NTSTATUS Read(FSP_FILE_SYSTEM *FileSystem,
     if (EndOffset > FileNode->FileInfo.FileSize)
         EndOffset = FileNode->FileInfo.FileSize;
 
-    memcpy(Buffer, (PUINT8)FileNode->FileData + Offset, EndOffset - Offset);
+    memcpy(Buffer, (PUINT8)FileNode->FileData + Offset, (size_t)(EndOffset - Offset));
 
     *PBytesTransferred = (ULONG)(EndOffset - Offset);
 
@@ -555,7 +555,7 @@ static NTSTATUS Write(FSP_FILE_SYSTEM *FileSystem,
             SetFileSize(FileSystem, Request, FileNode, EndOffset, FileInfo);
     }
 
-    memcpy((PUINT8)FileNode->FileData + Offset, Buffer, EndOffset - Offset);
+    memcpy((PUINT8)FileNode->FileData + Offset, Buffer, (size_t)(EndOffset - Offset));
 
     *PBytesTransferred = (ULONG)(EndOffset - Offset);
     *FileInfo = FileNode->FileInfo;
@@ -619,7 +619,7 @@ static NTSTATUS SetAllocationSize(FSP_FILE_SYSTEM *FileSystem,
         if (AllocationSize > Memfs->MaxFileSize)
             return STATUS_DISK_FULL;
 
-        FileData = realloc(FileNode->FileData, AllocationSize);
+        FileData = realloc(FileNode->FileData, (size_t)AllocationSize);
         if (0 == FileData)
             return STATUS_INSUFFICIENT_RESOURCES;
 
@@ -656,7 +656,7 @@ static NTSTATUS SetFileSize(FSP_FILE_SYSTEM *FileSystem,
 
         if (FileNode->FileInfo.FileSize < FileSize)
             memset((PUINT8)FileNode->FileData + FileNode->FileInfo.FileSize, 0,
-                FileSize - FileNode->FileInfo.FileSize);
+                (size_t)(FileSize - FileNode->FileInfo.FileSize));
         FileNode->FileInfo.FileSize = FileSize;
     }