diff --git a/patches/server-Shared_Memory/0003-user32-Get-rid-of-wineserver-call-for-GetInputState.patch b/patches/server-Shared_Memory/0003-user32-Get-rid-of-wineserver-call-for-GetInputState.patch index e5f0fd90..7e09a26f 100644 --- a/patches/server-Shared_Memory/0003-user32-Get-rid-of-wineserver-call-for-GetInputState.patch +++ b/patches/server-Shared_Memory/0003-user32-Get-rid-of-wineserver-call-for-GetInputState.patch @@ -1,4 +1,4 @@ -From 8a1c06c34baa7e2d2b6f0186932d86c0a9597824 Mon Sep 17 00:00:00 2001 +From dc483d01e1493b319aecd409ce4e65223c18b5bd Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 19 Mar 2015 01:32:51 +0100 Subject: user32: Get rid of wineserver call for GetInputState. @@ -10,10 +10,10 @@ Subject: user32: Get rid of wineserver call for GetInputState. 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c -index b07c147..ace4fb8 100644 +index 130aacc..4cf6b61 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c -@@ -444,17 +444,29 @@ DWORD WINAPI GetQueueStatus( UINT flags ) +@@ -454,17 +454,29 @@ DWORD WINAPI GetQueueStatus( UINT flags ) */ BOOL WINAPI GetInputState(void) { @@ -32,7 +32,7 @@ index b07c147..ace4fb8 100644 + SERVER_START_REQ( get_queue_status ) { - req->clear = 0; + req->clear_bits = 0; wine_server_call( req ); - ret = reply->wake_bits & (QS_KEY | QS_MOUSEBUTTON); + ret = reply->wake_bits; @@ -45,7 +45,7 @@ index b07c147..ace4fb8 100644 } diff --git a/server/protocol.def b/server/protocol.def -index 91ba01d..7d077d7 100644 +index ea2e231..4872251 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -76,7 +76,7 @@ typedef struct @@ -58,10 +58,10 @@ index 91ba01d..7d077d7 100644 /* debug event data */ diff --git a/server/queue.c b/server/queue.c -index 3a321cd..fff5eb8 100644 +index c318fc3..3a1d2b7 100644 --- a/server/queue.c +++ b/server/queue.c -@@ -117,6 +117,7 @@ struct thread_input +@@ -118,6 +118,7 @@ struct thread_input struct msg_queue { struct object obj; /* object header */ @@ -69,7 +69,7 @@ index 3a321cd..fff5eb8 100644 struct fd *fd; /* optional file descriptor to poll */ unsigned int wake_bits; /* wakeup bits */ unsigned int wake_mask; /* wakeup mask */ -@@ -278,6 +279,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ +@@ -282,6 +283,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ if ((queue = alloc_object( &msg_queue_ops ))) { queue->fd = NULL; @@ -77,7 +77,7 @@ index 3a321cd..fff5eb8 100644 queue->wake_bits = 0; queue->wake_mask = 0; queue->changed_bits = 0; -@@ -309,6 +311,7 @@ void free_msg_queue( struct thread *thread ) +@@ -315,6 +317,7 @@ void free_msg_queue( struct thread *thread ) { remove_thread_hooks( thread ); if (!thread->queue) return; @@ -85,7 +85,7 @@ index 3a321cd..fff5eb8 100644 release_object( thread->queue ); thread->queue = NULL; } -@@ -419,11 +422,21 @@ static inline int is_signaled( struct msg_queue *queue ) +@@ -427,11 +430,21 @@ static inline int is_signaled( struct msg_queue *queue ) return ((queue->wake_bits & queue->wake_mask) || (queue->changed_bits & queue->changed_mask)); } @@ -107,7 +107,7 @@ index 3a321cd..fff5eb8 100644 if (is_signaled( queue )) wake_up( &queue->obj, 0 ); } -@@ -432,6 +445,7 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits +@@ -440,6 +453,7 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits { queue->wake_bits &= ~bits; queue->changed_bits &= ~bits; @@ -116,5 +116,5 @@ index 3a321cd..fff5eb8 100644 /* check whether msg is a keyboard message */ -- -2.3.2 +2.3.5 diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index cc742a60..87bba561 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -1184,7 +1184,7 @@ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c -@@ -706,7 +706,11 @@ +@@ -707,7 +707,11 @@ { const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct arb_ps_compiled_shader *gl_shader = priv->compiled_fprog; @@ -1196,7 +1196,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader /* Load DirectX 9 float constants for pixel shader */ priv->highest_dirty_ps_const = shader_arb_load_constantsF(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB, -@@ -4711,7 +4715,11 @@ +@@ -4665,7 +4669,11 @@ } else { @@ -1208,7 +1208,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); } -@@ -7884,7 +7892,11 @@ +@@ -7779,7 +7787,11 @@ /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -1220,7 +1220,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)) { -@@ -7914,6 +7926,7 @@ +@@ -7809,6 +7821,7 @@ /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info); @@ -1228,7 +1228,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 -@@ -7925,6 +7938,17 @@ +@@ -7820,6 +7833,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); @@ -4512,7 +4512,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 -@@ -1085,8 +1085,15 @@ +@@ -1080,8 +1080,15 @@ const struct wined3d_shader_reg_maps *reg_maps, const struct shader_glsl_ctx_priv *ctx_priv) { const struct wined3d_shader_version *version = ®_maps->shader_version; @@ -4528,7 +4528,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; -@@ -1327,7 +1334,11 @@ +@@ -1322,7 +1329,11 @@ { UINT in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); @@ -4540,7 +4540,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); } -@@ -1368,6 +1379,7 @@ +@@ -1363,6 +1374,7 @@ } else { @@ -4548,7 +4548,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. -@@ -1376,6 +1388,23 @@ +@@ -1371,6 +1383,23 @@ * it and just create the uniform. */ FIXME("Cannot find a free uniform for vpos correction params\n");