Rebase against upstream wine, move ntdll-DllRedirects dependency from winecfg-Staging to wined3d-CSMT_Helper.

patches/Miscellaneous/0004-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch

@@ -1,4 +1,4 @@
-From f56694f318ce0134317b812ff32f6c35875c31b3 Mon Sep 17 00:00:00 2001
+From aa76ae0448583e87dbe7f374101eb5b20d55dea8 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Fri, 8 Aug 2014 19:33:14 -0600
 Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
@@ -12,10 +12,10 @@ Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
-index 117c8eb..3988628 100644
+index 0c10ffa..2f35992 100644
 --- a/dlls/d3d9/tests/visual.c
 +++ b/dlls/d3d9/tests/visual.c
-@@ -11163,7 +11163,7 @@ static void yuv_layout_test(void)
+@@ -11161,7 +11161,7 @@ static void yuv_layout_test(void)
      IDirect3D9 *d3d;
      D3DCOLOR color;
      DWORD ref_color;
@@ -38,10 +38,10 @@ index d2a61fa..bb7ac1c 100644
  
      if (servername && !(server = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY;
 diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
-index a4c02bf..909db53 100644
+index e32cb54..ddf972d 100644
 --- a/dlls/winealsa.drv/mmdevdrv.c
 +++ b/dlls/winealsa.drv/mmdevdrv.c
-@@ -353,7 +353,7 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha
+@@ -359,7 +359,7 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha
  {
      WCHAR *ret;
      const WCHAR *prefix;
@@ -51,13 +51,13 @@ index a4c02bf..909db53 100644
      static const WCHAR dashW[] = {' ','-',' ',0};
      static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1;
 diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
-index 34cc567..4f2a6c6 100644
+index f3e921c..fa64436 100644
 --- a/dlls/wined3d/glsl_shader.c
 +++ b/dlls/wined3d/glsl_shader.c
-@@ -5784,7 +5784,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
-     GLhandleARB vs_id = 0;
-     GLhandleARB gs_id = 0;
-     GLhandleARB ps_id = 0;
+@@ -5834,7 +5834,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
+     GLuint vs_id = 0;
+     GLuint gs_id = 0;
+     GLuint ps_id = 0;
 -    struct list *ps_list, *vs_list;
 +    struct list *ps_list = NULL, *vs_list = NULL;
  
@@ -77,5 +77,5 @@ index 54aab45..103422e 100644
      expand = get_make_variable( make, name );
      if (!expand) return NULL;
 -- 
-2.1.1
+2.2.1
 

patches/patchinstall.sh

@@ -815,13 +815,9 @@ patch_apply ()
 
 
 if test "$enable_winecfg_Staging" -eq 1; then
-	if test "$enable_ntdll_DllRedirects" -gt 1; then
-		abort "Patchset ntdll-DllRedirects disabled, but winecfg-Staging depends on that."
-	fi
 	if test "$enable_wined3d_CSMT_Main" -gt 1; then
 		abort "Patchset wined3d-CSMT_Main disabled, but winecfg-Staging depends on that."
 	fi
-	enable_ntdll_DllRedirects=1
 	enable_wined3d_CSMT_Main=1
 fi
 
@@ -836,10 +832,14 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
 	if test "$enable_makedep_PARENTSPEC" -gt 1; then
 		abort "Patchset makedep-PARENTSPEC disabled, but wined3d-CSMT_Helper depends on that."
 	fi
+	if test "$enable_ntdll_DllRedirects" -gt 1; then
+		abort "Patchset ntdll-DllRedirects disabled, but wined3d-CSMT_Helper depends on that."
+	fi
 	if test "$enable_wined3d_DXTn" -gt 1; then
 		abort "Patchset wined3d-DXTn disabled, but wined3d-CSMT_Helper depends on that."
 	fi
 	enable_makedep_PARENTSPEC=1
+	enable_ntdll_DllRedirects=1
 	enable_wined3d_DXTn=1
 fi
 

patches/winecfg-Staging/definition

@@ -1,2 +1 @@
 Depends: wined3d-CSMT_Main
-Depends: ntdll-DllRedirects

patches/wined3d-CSMT_Helper/definition

@@ -1,2 +1,3 @@
 Depends: wined3d-DXTn
 Depends: makedep-PARENTSPEC
+Depends: ntdll-DllRedirects

patches/wined3d-CSMT_Main/9999-IfDefined.patch

@@ -4495,7 +4495,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
 diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
 --- a/dlls/wined3d/glsl_shader.c
 +++ b/dlls/wined3d/glsl_shader.c
-@@ -949,8 +949,15 @@
+@@ -950,8 +950,15 @@
          const struct wined3d_shader_reg_maps *reg_maps, const struct shader_glsl_ctx_priv *ctx_priv)
  {
      const struct wined3d_shader_version *version = &reg_maps->shader_version;
@@ -4511,7 +4511,7 @@ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
      unsigned int i, extra_constants_needed = 0;
      const struct wined3d_shader_lconst *lconst;
      const char *prefix;
-@@ -1188,7 +1195,11 @@
+@@ -1189,7 +1196,11 @@
          {
              UINT in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input);
  
@@ -4523,7 +4523,7 @@ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
                  shader_addline(buffer, "varying vec4 %s_link[%u];\n", prefix, in_count);
              shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count);
          }
-@@ -1229,6 +1240,7 @@
+@@ -1230,6 +1241,7 @@
              }
              else
              {
@@ -4531,7 +4531,7 @@ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
                  /* This happens because we do not have proper tracking of the
                   * constant registers that are actually used, only the max
                   * limit of the shader version.
-@@ -1237,6 +1249,23 @@
+@@ -1238,6 +1250,23 @@
                   * it and just create the uniform.
                   */
                  FIXME("Cannot find a free uniform for vpos correction params\n");
@@ -9521,7 +9521,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
 diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
 --- a/dlls/wined3d/directx.c
 +++ b/dlls/wined3d/directx.c
-@@ -5208,9 +5208,15 @@
+@@ -5333,9 +5333,15 @@
      DebugBreak();
  }