Rebase against bb16263fe1974851f495435fef9a3d57fa2d4aa9.

patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch

@@ -1,4 +1,4 @@
-From 5fc643183617eae4c5975f4d32058cd512ffdf00 Mon Sep 17 00:00:00 2001
+From 90856468376648dbf9788d8184c71dd0fb0c8940 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 4 Feb 2017 16:20:37 +0100
 Subject: kernel32: Implement some processor group functions.
@@ -88,7 +88,7 @@ index 2e0e79f8e8d..5bba2ed26c3 100644
 +    return system_info.NumberOfProcessors;
  }
 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index 1a11af579f4..567442ef138 100644
+index cf27aea766e..63acc6877df 100644
 --- a/dlls/kernel32/kernel32.spec
 +++ b/dlls/kernel32/kernel32.spec
 @@ -716,8 +716,8 @@
@@ -103,7 +103,7 @@ index 1a11af579f4..567442ef138 100644
  @ stdcall GetModuleFileNameW(long ptr long)
  @ stdcall GetModuleHandleA(str)
 diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
-index c480a278c98..e95473bfa08 100644
+index ca51a417b7c..2d9ac110247 100644
 --- a/dlls/kernel32/tests/process.c
 +++ b/dlls/kernel32/tests/process.c
 @@ -91,6 +91,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void);
@@ -122,7 +122,7 @@ index c480a278c98..e95473bfa08 100644
 
      return TRUE;
  }
-@@ -3357,6 +3359,26 @@ static void test_ProcThreadAttributeList(void)
+@@ -3593,6 +3595,26 @@ static void test_ProcThreadAttributeList(void)
      pDeleteProcThreadAttributeList(&list);
  }
 
@@ -149,19 +149,19 @@ index c480a278c98..e95473bfa08 100644
  START_TEST(process)
  {
      HANDLE job;
-@@ -3431,6 +3453,7 @@ START_TEST(process)
+@@ -3667,6 +3689,7 @@ START_TEST(process)
      test_GetNumaProcessorNode();
      test_session_info();
      test_GetLogicalProcessorInformationEx();
 +    test_GetActiveProcessorCount();
      test_largepages();
      test_ProcThreadAttributeList();
-
+     test_SuspendProcessState();
 diff --git a/include/winnt.h b/include/winnt.h
-index 450499c1299..a615e4a6022 100644
+index 25fdab4942d..63216b9ddad 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -5855,6 +5855,8 @@ typedef struct _GROUP_AFFINITY
+@@ -5895,6 +5895,8 @@ typedef struct _GROUP_AFFINITY
      WORD Reserved[3];
  } GROUP_AFFINITY, *PGROUP_AFFINITY;
 
@@ -171,5 +171,5 @@ index 450499c1299..a615e4a6022 100644
  {
      WORD Group;
 -- 
-2.12.2
+2.14.1
 

patches/opengl32-glDebugMessageCallback/0002-opengl32-Add-wrappers-for-glDebugMessageCallback-to-.patch

@@ -1,4 +1,4 @@
-From 10830fe26e7b3828860e1ac24831f153ec1257cc Mon Sep 17 00:00:00 2001
+From 8d34e3ec8ce01e63d65469ab8064c1fde6a289b3 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Fri, 12 Feb 2016 02:39:07 +0100
 Subject: opengl32: Add wrappers for glDebugMessageCallback to handle calling
@@ -13,10 +13,10 @@ Subject: opengl32: Add wrappers for glDebugMessageCallback to handle calling
  5 files changed, 110 insertions(+), 18 deletions(-)
 
 diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
-index 45e3f720ea6..c79934727bc 100755
+index 44d58ec7bba..10fca6d724f 100755
 --- a/dlls/opengl32/make_opengl
 +++ b/dlls/opengl32/make_opengl
-@@ -239,6 +239,11 @@ sub GenerateThunk($$$$)
+@@ -243,6 +243,11 @@ sub GenerateThunk($$$)
      return "" if $name eq "glDebugEntry";
      return "" if $name eq "glGetIntegerv";
      return "" if $name eq "glGetString";
@@ -27,12 +27,12 @@ index 45e3f720ea6..c79934727bc 100755
 +
      return "" if $func_ref->[2] && $func_ref->[2]->[0] =~ /WGL_/;
 
-     # If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-)
+     $ret .= ConvertType($func_ref->[0]) . " WINAPI $name( ";
 diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c
-index 2a3b4355173..e216ec42e30 100644
+index a8d267793e0..1f99991f1f3 100644
 --- a/dlls/opengl32/opengl_ext.c
 +++ b/dlls/opengl32/opengl_ext.c
-@@ -1954,24 +1954,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) {
+@@ -1990,24 +1990,6 @@ static void WINAPI glCurrentPaletteMatrixARB( GLint index ) {
    funcs->ext.p_glCurrentPaletteMatrixARB( index );
  }
 
@@ -71,7 +71,7 @@ index 4f1791a6436..8bffba05023 100644
 +
  #endif /* __DLLS_OPENGL32_OPENGL_EXT_H */
 diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c
-index 5d3a2455051..6b67850c5ee 100644
+index fd68a994153..f6845aabfef 100644
 --- a/dlls/opengl32/tests/opengl.c
 +++ b/dlls/opengl32/tests/opengl.c
 @@ -71,6 +71,11 @@ static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB);
@@ -138,7 +138,7 @@ index 5d3a2455051..6b67850c5ee 100644
  static void test_setpixelformat(HDC winhdc)
  {
      int res = 0;
-@@ -1785,6 +1828,7 @@ START_TEST(opengl)
+@@ -1810,6 +1853,7 @@ START_TEST(opengl)
          }
 
          test_choosepixelformat();
@@ -147,7 +147,7 @@ index 5d3a2455051..6b67850c5ee 100644
          test_destroy(hdc);
          test_sharelists(hdc);
 diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
-index dafafb66507..48d7a28f245 100644
+index dacf0b38d49..271d29405bc 100644
 --- a/dlls/opengl32/wgl.c
 +++ b/dlls/opengl32/wgl.c
 @@ -63,6 +63,9 @@ struct opengl_context
@@ -160,7 +160,7 @@ index dafafb66507..48d7a28f245 100644
      GLubyte            *extensions;    /* extension string */
      GLuint             *disabled_exts; /* indices of disabled extensions */
      struct wgl_context *drv_ctx;       /* driver context */
-@@ -1938,6 +1941,60 @@ const GLubyte * WINAPI glGetString( GLenum name )
+@@ -1943,6 +1946,60 @@ const GLubyte * WINAPI glGetString( GLenum name )
      return ret;
  }
 
@@ -222,5 +222,5 @@ index dafafb66507..48d7a28f245 100644
   *           OpenGL initialisation routine
   */
 -- 
-2.13.1
+2.14.1
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "218286bb87f8a38a48b4717247e578e02f6a051f"
+	echo "bb16263fe1974851f495435fef9a3d57fa2d4aa9"
 }
 
 # Show version information