Rebase patches against upstream Wine.

patches/kernel32-GetFinalPathNameByHandle/0001-kernel32-Implement-GetFinalPathNameByHandle.patch

@@ -1,4 +1,4 @@
-From 2bde361904bbd2463c8de66941e725add7a239e3 Mon Sep 17 00:00:00 2001
+From ea5ae1b1a3c8654b83f7bcdccfd29fc644e7560e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 12 Aug 2014 20:24:14 +0200
 Subject: kernel32: Implement GetFinalPathNameByHandle.
@@ -6,9 +6,9 @@ Subject: kernel32: Implement GetFinalPathNameByHandle.
 ---
  .../api-ms-win-core-file-l1-2-0.spec               |   4 +-
  dlls/kernel32/file.c                               | 182 +++++++++++++++++++++
- dlls/kernel32/kernel32.spec                        |   2 +
+ dlls/kernel32/kernel32.spec                        |   4 +-
  include/fileapi.h                                  |   8 +
- 4 files changed, 194 insertions(+), 2 deletions(-)
+ 4 files changed, 194 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec
 index ebfd52e..cddf112 100644
@@ -217,18 +217,20 @@ index 006db1c..b3cc8c3 100644
 +}
 \ No newline at end of file
 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index c072780..d6955d3 100644
+index 3719505..a272535 100644
 --- a/dlls/kernel32/kernel32.spec
 +++ b/dlls/kernel32/kernel32.spec
-@@ -539,6 +539,8 @@
- @ stdcall GetFileAttributesW(wstr)
- @ stdcall GetFileInformationByHandle(long ptr)
- @ stdcall GetFileInformationByHandleEx(long long ptr long)
-+@ stdcall GetFinalPathNameByHandleA(long ptr long long)
-+@ stdcall GetFinalPathNameByHandleW(long ptr long long)
- @ stdcall GetFileSize(long ptr)
+@@ -682,8 +682,8 @@
  @ stdcall GetFileSizeEx(long ptr)
  @ stdcall GetFileTime(long ptr ptr ptr)
+ @ stdcall GetFileType(long)
+-# @ stub GetFinalPathNameByHandleA
+-# @ stub GetFinalPathNameByHandleW
++@ stdcall GetFinalPathNameByHandleA(long ptr long long)
++@ stdcall GetFinalPathNameByHandleW(long ptr long long)
+ @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long)
+ @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long)
+ @ stdcall GetFullPathNameA(str long ptr ptr)
 diff --git a/include/fileapi.h b/include/fileapi.h
 index 02bbbd4..0ccf9e9 100644
 --- a/include/fileapi.h
@@ -249,5 +251,5 @@ index 02bbbd4..0ccf9e9 100644
  }
  #endif
 -- 
-2.1.3
+2.2.1
 

patches/kernel32-GetNumaProcessorNode/0001-kernel32-Implement-GetNumaProcessorNode.patch

@@ -1,4 +1,4 @@
-From 2f474554aacbbf9980c1294fe26ac2fd77df85d5 Mon Sep 17 00:00:00 2001
+From 055d712c6ebe86e06c2792d2c33cf5b9c5960cf8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 18 Oct 2014 05:57:32 +0200
 Subject: kernel32: Implement GetNumaProcessorNode.
@@ -10,10 +10,11 @@ Subject: kernel32: Implement GetNumaProcessorNode.
  3 files changed, 30 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
-index 0ebf8f3..c389898 100644
+index f48fcf0..886e415 100644
 --- a/dlls/kernel32/cpu.c
 +++ b/dlls/kernel32/cpu.c
-@@ -230,2 +230,30 @@ BOOL WINAPI K32GetPerformanceInfo(PPERFORMANCE_INFORMATION info, DWORD size)
+@@ -291,3 +291,31 @@ err:
+     }
      return TRUE;
  }
 +
@@ -45,23 +46,23 @@ index 0ebf8f3..c389898 100644
 +    return FALSE;
 +}
 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index d08f90c..3de8e57 100644
+index a272535..da05859 100644
 --- a/dlls/kernel32/kernel32.spec
 +++ b/dlls/kernel32/kernel32.spec
-@@ -584,7 +584,7 @@
- @ stdcall GetNumaHighestNodeNumber(ptr)
+@@ -746,7 +746,7 @@
  @ stdcall GetNumaNodeProcessorMask(long ptr)
+ # @ stub GetNumaNodeProcessorMaskEx
  # @ stub GetNumaProcessorMap
 -# @ stub GetNumaProcessorNode
 +@ stdcall GetNumaProcessorNode(long ptr)
- @ stdcall GetNumberFormatA(long long str ptr ptr long)
- @ stdcall GetNumberFormatW(long long wstr ptr ptr long)
- @ stub GetNumberOfConsoleFonts
+ # @ stub GetNumaProcessorNodeEx
+ # @ stub GetNumaProximityNode
+ # @ stub GetNumaProximityNodeEx
 diff --git a/include/winbase.h b/include/winbase.h
-index edd6ad6..055dd00 100644
+index 0d8cede..28fb5ea 100644
 --- a/include/winbase.h
 +++ b/include/winbase.h
-@@ -1939,6 +1939,7 @@ WINBASEAPI BOOL        WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LP
+@@ -1953,6 +1953,7 @@ WINBASEAPI BOOL        WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LP
  #define                       GetNamedPipeHandleState WINELIB_NAME_AW(GetNamedPipeHandleState)
  WINBASEAPI BOOL        WINAPI GetNamedPipeInfo(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
  WINBASEAPI VOID        WINAPI GetNativeSystemInfo(LPSYSTEM_INFO);
@@ -70,5 +71,5 @@ index edd6ad6..055dd00 100644
  WINADVAPI  BOOL        WINAPI GetOldestEventLogRecord(HANDLE,PDWORD);
  WINBASEAPI BOOL        WINAPI GetOverlappedResult(HANDLE,LPOVERLAPPED,LPDWORD,BOOL);
 -- 
-1.9.1
+2.2.1
 

patches/wined3d-CSMT_Main/9999-IfDefined.patch

@@ -4479,7 +4479,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
              &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT)))
      {
          ERR("Failed to initialize device state, hr %#x.\n", hr);
-@@ -4927,6 +5654,7 @@
+@@ -4937,6 +5664,7 @@
      else
          return CallWindowProcA(proc, window, message, wparam, lparam);
  }
@@ -4487,7 +4487,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
  
  /* Context activation is done by the caller */
  struct wined3d_gl_bo *wined3d_device_get_bo(struct wined3d_device *device, UINT size, GLenum gl_usage,
-@@ -4980,3 +5708,4 @@
+@@ -4990,3 +5718,4 @@
  
      wined3d_device_destroy_bo(device, context, bo);
  }