Rebase against b0140f8ee22ad0f4a627f396b760e4a7833e474a.

2025-01-28 22:04:43 -08:00 · 2016-01-26 17:41:51 +01:00 · 2016-01-26 17:41:51 +01:00 · 8b24f43d5e
commit 8b24f43d5e
parent 8d7e0791fe
3 changed files with 79 additions and 59 deletions
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "d575e0afe304d0096f8014f7f411bf28c126cc0b"
+	echo "b0140f8ee22ad0f4a627f396b760e4a7833e474a"
 }

 # Show version information
@ -5510,7 +5510,7 @@ fi
 # |   *	rpcrt4-Pipe_Transport, server-Desktop_Refcount, kernel32-Named_Pipe
 # |
 # | Modified files:
-# |   *	server/named_pipe.c, server/object.c
+# |   *	dlls/ntdll/tests/om.c, server/named_pipe.c, server/object.c
 # |
 if test "$enable_server_Pipe_ObjectName" -eq 1; then
 	patch_apply server-Pipe_ObjectName/0001-server-Link-named-pipes-to-their-device.patch
--- a/patches/server-Pipe_ObjectName/0002-server-Store-a-reference-to-the-parent-object-for-pi.patch
+++ b/patches/server-Pipe_ObjectName/0002-server-Store-a-reference-to-the-parent-object-for-pi.patch
@ -1,13 +1,33 @@
-From 3a5501c1595dd32c25c9df6acb377aa92037b49f Mon Sep 17 00:00:00 2001
+From a584e5646fb07dc21a2748ffa37b7c6461ff67f0 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 17 Aug 2015 01:11:47 +0200
 Subject: server: Store a reference to the parent object for pipe servers. (v2)

 ---
- server/named_pipe.c | 11 +++++++----
- server/object.c     | 31 ++++++++++++++++++++++---------
- 2 files changed, 29 insertions(+), 13 deletions(-)
+ dlls/ntdll/tests/om.c |  3 ---
+ server/named_pipe.c   | 11 +++++++----
+ server/object.c       | 31 ++++++++++++++++++++++---------
+ 3 files changed, 29 insertions(+), 16 deletions(-)

+diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
+index b957128..1b50d92 100644
+--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
+@@ -1084,14 +1084,11 @@ static void test_query_object(void)
+     status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len );
+     ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status );
+     str = (UNICODE_STRING *)buffer;
+-    todo_wine
+     ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len );
+     str = (UNICODE_STRING *)buffer;
+     expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR);
+-    todo_wine
+     ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */
+         "unexpected len %u\n", len );
+-    todo_wine
+     ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_pipe") * sizeof(WCHAR),
+         "name too short %s\n", wine_dbgstr_w(str->Buffer) );
+     trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len );
 diff --git a/server/named_pipe.c b/server/named_pipe.c
 index 49b3f62..36a5c78 100644
 --- a/server/named_pipe.c
--- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch
+++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
@ -70,7 +70,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
             shader_arb_ps_local_constants(compiled, context, state, rt_height);
         }
 
-@@ -7855,7 +7863,11 @@
+@@ -7856,7 +7864,11 @@
 
     /* Now load the surface */
     if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
@ -82,7 +82,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
             == WINED3D_LOCATION_DRAWABLE
             && !wined3d_resource_is_offscreen(&src_surface->container->resource))
     {
-@@ -7893,6 +7905,7 @@
+@@ -7894,6 +7906,7 @@
     /* Leave the opengl state valid for blitting */
     arbfp_blit_unset(context->gl_info);
 
@ -90,7 +90,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
     if (wined3d_settings.cs_multithreaded)
         context->gl_info->gl_ops.gl.p_glFinish();
     else if (wined3d_settings.strict_draw_ordering
-@@ -7904,6 +7917,17 @@
+@@ -7905,6 +7918,17 @@
 
     wined3d_resource_validate_location(&dst_surface->resource, dst_surface->container->resource.draw_binding);
     wined3d_resource_invalidate_location(&dst_surface->resource, ~dst_surface->container->resource.draw_binding);
@ -3726,7 +3726,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
 diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
 --- a/dlls/wined3d/directx.c
 +++ b/dlls/wined3d/directx.c
-@@ -5557,9 +5557,15 @@
+@@ -5559,9 +5559,15 @@
     DebugBreak();
 }
 
@ -4680,7 +4680,7 @@ diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c
 diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
 --- a/dlls/wined3d/shader.c
 +++ b/dlls/wined3d/shader.c
-@@ -1904,7 +1904,11 @@
+@@ -1906,7 +1906,11 @@
     }
 }
 
@ -4692,7 +4692,7 @@ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
 {
     HeapFree(GetProcessHeap(), 0, shader->output_signature.elements);
     HeapFree(GetProcessHeap(), 0, shader->input_signature.elements);
-@@ -2163,10 +2167,16 @@
+@@ -2165,10 +2169,16 @@
 
     if (!refcount)
     {
@ -4709,7 +4709,7 @@ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
     }
 
     return refcount;
-@@ -2449,7 +2459,11 @@
+@@ -2451,7 +2461,11 @@
     memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */
     if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE])
     {
@ -8349,7 +8349,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
 diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
 --- a/dlls/wined3d/utils.c
 +++ b/dlls/wined3d/utils.c
-@@ -3765,7 +3765,11 @@
+@@ -3777,7 +3777,11 @@
         float y_offset = context->render_offscreen
                 ? (center_offset - (2.0f * y) - h) / h
                 : (center_offset - (2.0f * y) - h) / -h;
@ -8361,7 +8361,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
                 state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE;
         float z_scale = zenable ? 2.0f : 0.0f;
         float z_offset = zenable ? -1.0f : 0.0f;
-@@ -3888,6 +3892,7 @@
+@@ -3900,6 +3904,7 @@
                 /* case WINED3D_TTFF_COUNT1: Won't ever get here. */
                 case WINED3D_TTFF_COUNT2:
                     mat._13 = mat._23 = mat._33 = mat._43 = 0.0f;
@ -8369,7 +8369,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
                 /* OpenGL divides the first 3 vertex coord by the 4th by default,
                 * which is essentially the same as D3DTTFF_PROJECTED. Make sure that
                 * the 4th coord evaluates to 1.0 to eliminate that.
-@@ -3900,6 +3905,20 @@
+@@ -3912,6 +3917,20 @@
                 * A more serious problem occurs if the app passes 4 coordinates in, and the
                 * 4th is != 1.0(opengl default). This would have to be fixed in draw_strided_slow
                 * or a replacement shader. */
@ -8390,7 +8390,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
                 default:
                     mat._14 = mat._24 = mat._34 = 0.0f; mat._44 = 1.0f;
             }
-@@ -4357,7 +4376,11 @@
+@@ -4369,7 +4388,11 @@
     unsigned int i;
     DWORD ttff;
     DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2;
@ -9226,7 +9226,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 };
 
 extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN;
-@@ -1038,9 +1068,14 @@
+@@ -1039,9 +1069,14 @@
     WORD use_map; /* MAX_ATTRIBS, 16 */
 };
 
@ -9241,7 +9241,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN;
 
 #define eps 1e-8f
-@@ -1128,8 +1163,10 @@
+@@ -1129,8 +1164,10 @@
     struct list entry;
     GLuint id;
     struct wined3d_context *context;
@ -9252,7 +9252,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 };
 
 union wined3d_gl_query_object
-@@ -1165,6 +1202,7 @@
+@@ -1166,6 +1203,7 @@
     struct list entry;
     GLuint id;
     struct wined3d_context *context;
@ -9260,7 +9260,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
     UINT64 timestamp;
 };
 
-@@ -1200,6 +1238,12 @@
+@@ -1201,6 +1239,12 @@
     for (i = 0; i < min(dst->rt_size, src->rt_size); i++)
         dst->render_targets[i] = src->render_targets[i];
 }
@ -9273,7 +9273,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
 struct wined3d_context
 {
-@@ -1215,7 +1259,9 @@
+@@ -1216,7 +1260,9 @@
     DWORD                   dirtyArray[STATE_HIGHEST + 1]; /* Won't get bigger than that, a state is never marked dirty 2 times */
     DWORD                   numDirtyEntries;
     DWORD isStateDirty[STATE_HIGHEST / (sizeof(DWORD) * CHAR_BIT) + 1]; /* Bitmap to find out quickly if a state is dirty */
@ -9283,7 +9283,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
     struct wined3d_swapchain *swapchain;
     struct wined3d_surface *current_rt;
-@@ -1313,8 +1359,17 @@
+@@ -1314,8 +1360,17 @@
     GLfloat                 fog_coord_value;
     GLfloat                 color[4], fogstart, fogend, fogcolor[4];
     GLuint                  dummy_arbfp_prog;
@ -9301,7 +9301,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 };
 
 typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id);
-@@ -1457,8 +1512,12 @@
+@@ -1458,8 +1513,12 @@
 void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN;
 BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device,
         UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN;
@ -9314,7 +9314,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,
         struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN;
 void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info,
-@@ -2041,7 +2100,11 @@
+@@ -2042,7 +2101,11 @@
 struct wined3d_state
 {
     DWORD flags;
@ -9326,7 +9326,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
     struct wined3d_vertex_declaration *vertex_declaration;
     struct wined3d_stream_output stream_output[MAX_STREAM_OUT];
-@@ -2086,6 +2149,7 @@
+@@ -2087,6 +2150,7 @@
     DWORD render_states[WINEHIGHEST_RENDER_STATE + 1];
 };
 
@ -9334,7 +9334,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 struct wined3d_gl_bo
 {
     GLuint name;
-@@ -2094,6 +2158,7 @@
+@@ -2095,6 +2159,7 @@
     UINT size;
 };
 
@ -9342,7 +9342,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 #define WINED3D_UNMAPPED_STAGE ~0U
 
 /* Multithreaded flag. Removed from the public header to signal that
-@@ -2149,11 +2214,23 @@
+@@ -2150,11 +2215,23 @@
     struct wined3d_rendertarget_view *back_buffer_view;
     struct wined3d_swapchain **swapchains;
     UINT swapchain_count;
@ -9366,7 +9366,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
     /* For rendering to a texture using glCopyTexImage */
     GLuint                  depth_blt_texture;
-@@ -2164,6 +2241,9 @@
+@@ -2165,6 +2242,9 @@
     UINT                    xScreenSpace;
     UINT                    yScreenSpace;
     UINT                    cursorWidth, cursorHeight;
@ -9376,7 +9376,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
     HCURSOR                 hardwareCursor;
 
     /* The Wine logo texture */
-@@ -2198,6 +2278,7 @@
+@@ -2199,6 +2279,7 @@
         UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN;
 void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
 void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@ -9384,7 +9384,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN;
 void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) DECLSPEC_HIDDEN;
 void device_exec_update_texture(struct wined3d_context *context, struct wined3d_texture *src_texture,
-@@ -2210,6 +2291,11 @@
+@@ -2211,6 +2292,11 @@
 void device_create_default_sampler(struct wined3d_device *device);
 void device_delete_opengl_contexts_cs(struct wined3d_device *device,
         struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
@ -9396,7 +9396,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
 static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)
 {
-@@ -2229,9 +2315,11 @@
+@@ -2230,9 +2316,11 @@
     HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx,
             struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
     HRESULT (*resource_sub_resource_unmap)(struct wined3d_resource *resource, unsigned int sub_resource_idx);
@ -9408,7 +9408,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 };
 
 struct wined3d_resource
-@@ -2256,6 +2344,7 @@
+@@ -2257,6 +2345,7 @@
     UINT depth;
     UINT size;
     DWORD priority;
@ -9416,7 +9416,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
     void *heap_memory, *map_heap_memory, *user_memory, *bitmap_data;
     UINT custom_row_pitch, custom_slice_pitch;
     struct wined3d_gl_bo *buffer, *map_buffer;
-@@ -2263,6 +2352,10 @@
+@@ -2264,6 +2353,10 @@
     DWORD locations;
     LONG access_fence;
     BOOL unmap_dirtify;
@ -9427,7 +9427,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
     void *parent;
     const struct wined3d_parent_ops *parent_ops;
-@@ -2287,6 +2380,7 @@
+@@ -2288,6 +2381,7 @@
         void *parent, const struct wined3d_parent_ops *parent_ops,
         const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN;
 void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@ -9435,7 +9435,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 DWORD wined3d_resource_access_from_location(DWORD location) DECLSPEC_HIDDEN;
 BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
 void wined3d_resource_changed(struct wined3d_resource *resource,
-@@ -2335,6 +2429,15 @@
+@@ -2336,6 +2430,15 @@
 {
     while(InterlockedCompareExchange(&resource->access_fence, 0, 0));
 }
@ -9451,7 +9451,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
 /* Tests show that the start address of resources is 32 byte aligned */
 #define RESOURCE_ALIGNMENT 16
-@@ -2419,7 +2522,9 @@
+@@ -2420,7 +2523,9 @@
 
 void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture,
         const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;
@ -9461,7 +9461,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 void wined3d_texture_bind(struct wined3d_texture *texture,
         struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN;
 void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture,
-@@ -2451,8 +2556,15 @@
+@@ -2452,8 +2557,15 @@
     struct wined3d_resource resource;
     struct wined3d_texture *container;
 
@ -9477,7 +9477,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 };
 
 static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource)
-@@ -2460,6 +2572,7 @@
+@@ -2461,6 +2573,7 @@
     return CONTAINING_RECORD(resource, struct wined3d_volume, resource);
 }
 
@ -9485,7 +9485,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc,
         unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN;
 void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN;
-@@ -2475,6 +2588,27 @@
+@@ -2476,6 +2589,27 @@
 struct wined3d_surface_dib
 {
     HBITMAP DIBsection;
@ -9513,7 +9513,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
     UINT bitmap_size;
 };
 
-@@ -2500,7 +2634,11 @@
+@@ -2501,7 +2635,11 @@
 struct wined3d_surface_ops
 {
     HRESULT (*surface_private_setup)(struct wined3d_surface *surface);
@ -9525,7 +9525,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 };
 
 struct wined3d_surface
-@@ -2508,12 +2646,26 @@
+@@ -2509,12 +2647,26 @@
     struct wined3d_resource resource;
     const struct wined3d_surface_ops *surface_ops;
     struct wined3d_texture *container;
@ -9552,7 +9552,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
     GLuint rb_multisample;
     GLuint rb_resolved;
     GLenum texture_target;
-@@ -2557,11 +2709,22 @@
+@@ -2558,11 +2710,22 @@
 GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN;
 void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context,
         unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN;
@ -9575,7 +9575,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN;
 void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context,
         DWORD location) DECLSPEC_HIDDEN;
-@@ -2573,6 +2736,7 @@
+@@ -2574,6 +2737,7 @@
         const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) DECLSPEC_HIDDEN;
 HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point,
         struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN;
@ -9583,7 +9583,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc,
         GLenum target, unsigned int level, unsigned int layer, DWORD flags,
         struct wined3d_surface **surface) DECLSPEC_HIDDEN;
-@@ -2587,6 +2751,17 @@
+@@ -2588,6 +2752,17 @@
 void wined3d_surface_cleanup_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN;
 void wined3d_surface_getdc_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN;
 void wined3d_surface_releasedc_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN;
@ -9601,7 +9601,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
 void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context,
         const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;
-@@ -2607,8 +2782,10 @@
+@@ -2608,8 +2783,10 @@
     GLuint name;
 };
 
@ -9612,7 +9612,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 struct wined3d_vertex_declaration_element
 {
     const struct wined3d_format *format;
-@@ -2637,8 +2814,10 @@
+@@ -2638,8 +2815,10 @@
     BOOL half_float_conv_needed;
 };
 
@ -9623,7 +9623,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 struct wined3d_saved_states
 {
     DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1];
-@@ -2706,6 +2885,7 @@
+@@ -2707,6 +2886,7 @@
 void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN;
 
 void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN;
@ -9631,7 +9631,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 HRESULT state_init(struct wined3d_state *state, const struct wined3d_gl_info *gl_info,
         const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN;
 void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN;
-@@ -2756,6 +2936,32 @@
+@@ -2757,6 +2937,32 @@
 void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN;
 void wined3d_cs_switch_onscreen_ds(struct wined3d_cs *cs, struct wined3d_context *context,
         struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN;
@ -9664,7 +9664,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
 void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects,
         DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN;
-@@ -2805,6 +3011,7 @@
+@@ -2806,6 +3012,7 @@
 void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs,
         struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;
@ -9672,7 +9672,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 void wined3d_cs_emit_set_consts_f(struct wined3d_cs *cs, UINT start_register, const float *constants,
         UINT vector4f_count, enum wined3d_shader_type type) DECLSPEC_HIDDEN;
 void wined3d_cs_emit_set_consts_b(struct wined3d_cs *cs, UINT start_register,
-@@ -2868,6 +3075,7 @@
+@@ -2869,6 +3076,7 @@
 void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource,
         unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch,
         unsigned int depth_pitch) DECLSPEC_HIDDEN;
@ -9680,7 +9680,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
 /* Direct3D terminology with little modifications. We do not have an issued state
  * because only the driver knows about it, but we have a created state because d3d
-@@ -2882,8 +3090,12 @@
+@@ -2883,8 +3091,12 @@
 struct wined3d_query_ops
 {
     HRESULT (*query_get_data)(struct wined3d_query *query, void *data, DWORD data_size, DWORD flags);
@ -9693,7 +9693,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 };
 
 struct wined3d_query
-@@ -2897,12 +3109,16 @@
+@@ -2898,12 +3110,16 @@
     enum wined3d_query_type type;
     DWORD data_size;
     void                     *extendedData;
@ -9710,7 +9710,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
 /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other
  * fixed function semantics as D3DCOLOR or FLOAT16 */
-@@ -2929,7 +3145,9 @@
+@@ -2930,7 +3146,9 @@
     GLenum buffer_object_usage;
     GLenum buffer_type_hint;
     DWORD flags;
@ -9720,7 +9720,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
     void *map_ptr;
 
     struct wined3d_map_range *maps;
-@@ -2954,11 +3172,15 @@
+@@ -2955,11 +3173,15 @@
 BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN;
 void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context,
         const struct wined3d_state *state) DECLSPEC_HIDDEN;
@ -9736,7 +9736,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer,
         const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN;
 
-@@ -2999,8 +3221,10 @@
+@@ -3000,8 +3222,10 @@
     return surface_from_resource(resource);
 }
 
@ -9747,7 +9747,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 struct wined3d_shader_resource_view
 {
     LONG refcount;
-@@ -3013,8 +3237,12 @@
+@@ -3014,8 +3238,12 @@
 struct wined3d_swapchain_ops
 {
     void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect,
@ -9760,7 +9760,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 };
 
 struct wined3d_swapchain
-@@ -3053,8 +3281,10 @@
+@@ -3054,8 +3282,10 @@
 void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
 HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
 void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
@ -9771,7 +9771,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
 
 /*****************************************************************************
  * Utility function prototypes
-@@ -3258,7 +3488,9 @@
+@@ -3259,7 +3489,9 @@
 void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer,
         const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) DECLSPEC_HIDDEN;
 BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) DECLSPEC_HIDDEN;