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

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();
  }