diff --git a/debian/changelog b/debian/changelog
index 082e8874..e1fed09e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ wine-staging (1.7.35) UNRELEASED; urgency=low
   * Add stub for KeWaitForMultipleObjects.
   * Add support for patchinstall.sh parameters '--no-patchlist' and '--no-autoconf'.
   * Add support for Gentoo epatch backend to patchinstall.sh.
+  * Fix compile warnings on x86_64 in several patchsets.
   * Automatically enable fallback method to apply patches when running from inside of a git subdirectory.
   * Synchronize CSMT patchset with https://github.com/stefand/wine.
   * Several improvements to make nvcuvid (CUDA video decoding) better compatible with x86_64.
diff --git a/patches/ws2_32-TransmitFile/0003-ws2_32-Implement-a-basic-synchronous-TransmitFile.patch b/patches/ws2_32-TransmitFile/0003-ws2_32-Implement-a-basic-synchronous-TransmitFile.patch
index 4c9baea1..da4a4ce1 100644
--- a/patches/ws2_32-TransmitFile/0003-ws2_32-Implement-a-basic-synchronous-TransmitFile.patch
+++ b/patches/ws2_32-TransmitFile/0003-ws2_32-Implement-a-basic-synchronous-TransmitFile.patch
@@ -1,18 +1,18 @@
-From 87a9e724ea4529250b5e194265fd81019b76eea9 Mon Sep 17 00:00:00 2001
+From 0f64d07b3c3a28427b75cfa39b60274d9995dbc8 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 16 Jan 2014 18:24:27 -0700
 Subject: ws2_32: Implement a basic synchronous TransmitFile.
 
 ---
- dlls/ws2_32/socket.c     |   66 +++++++++++++++++++++++++++++++++++++++++-
- dlls/ws2_32/tests/sock.c |   71 +++++++++++++++++++++++++++++++++++++++++++++-
+ dlls/ws2_32/socket.c     | 66 +++++++++++++++++++++++++++++++++++++++++++-
+ dlls/ws2_32/tests/sock.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 135 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
-index 597b248..322c5ed 100644
+index f09de26..41026fd 100644
 --- a/dlls/ws2_32/socket.c
 +++ b/dlls/ws2_32/socket.c
-@@ -2485,6 +2485,65 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW
+@@ -2487,6 +2487,65 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW
  }
  
  /***********************************************************************
@@ -78,7 +78,7 @@ index 597b248..322c5ed 100644
   *     TransmitFile
   */
  static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD total_bytes, DWORD bytes_per_send,
-@@ -2494,7 +2553,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD total_bytes, DWOR
+@@ -2496,7 +2555,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD total_bytes, DWOR
      unsigned int uaddrlen = sizeof(uaddr);
      int fd;
  
@@ -87,7 +87,7 @@ index 597b248..322c5ed 100644
                                                       flags );
  
      fd = get_sock_fd( s, 0, NULL );
-@@ -2513,6 +2572,11 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD total_bytes, DWOR
+@@ -2515,6 +2574,11 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD total_bytes, DWOR
      if (flags)
          FIXME("Flags are not currently supported (0x%x).\n", flags);
  
@@ -100,10 +100,10 @@ index 597b248..322c5ed 100644
      return FALSE;
  }
 diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
-index dc393e6..2312f50 100644
+index 93d6849..8a560f7 100644
 --- a/dlls/ws2_32/tests/sock.c
 +++ b/dlls/ws2_32/tests/sock.c
-@@ -6491,15 +6491,45 @@ end:
+@@ -6905,15 +6905,45 @@ end:
          closesocket(connector2);
  }
  
@@ -149,7 +149,7 @@ index dc393e6..2312f50 100644
      int iret, len;
      BOOL bret;
  
-@@ -6577,7 +6607,46 @@ static void test_TransmitFile(void)
+@@ -6991,7 +7021,46 @@ static void test_TransmitFile(void)
  
      /* Test TransmitFile with no possible buffer */
      bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, 0);
@@ -168,7 +168,7 @@ index dc393e6..2312f50 100644
 +    iret = recv(dest, buf, sizeof(buf), 0);
 +    ok(iret == sizeof(header_msg)+sizeof(footer_msg)+2,
 +       "Returned an unexpected buffer from TransmitFile (%d != %d).\n", iret,
-+       sizeof(header_msg)+sizeof(footer_msg)+2);
++       (int)(sizeof(header_msg)+sizeof(footer_msg)+2));
 +    ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)+1) == 0,
 +       "TransmitFile header buffer did not match!\n");
 +    ok(memcmp(&buf[sizeof(header_msg)+1], &footer_msg[0], sizeof(footer_msg)+1) == 0,
@@ -198,5 +198,5 @@ index dc393e6..2312f50 100644
      /* Test TransmitFile with a UDP datagram socket */
      closesocket(client);
 -- 
-1.7.9.5
+2.2.1