February 2017 - Wine-Commits

Jacek Caban : uiautomationcore: Added UiaClientsAreListening stub.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 1cc93e3f05bce5ae9758fad44f69f44e1462d81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc93e3f05bce5ae9758fad44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 22 19:05:43 2017 +0100 uiautomationcore: Added UiaClientsAreListening stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 6e6180e..994d8e6 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -36,3 +36,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv) return TRUE; } + +/*********************************************************************** + * UiaClientsAreListening (uiautomationcore.@) + */ +BOOL WINAPI UiaClientsAreListening(void) +{ + FIXME("()\n"); + return FALSE; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 3df7425..3026001 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -52,7 +52,7 @@ @ stub TransformPattern_Resize @ stub TransformPattern_Rotate @ stub UiaAddEvent -@ stub UiaClientsAreListening +@ stdcall UiaClientsAreListening() @ stub UiaEventAddWindow @ stub UiaEventRemoveWindow @ stub UiaFind

1 0

Jacek Caban : server: Introduced new pipe_end struct containing common parts of pipe_client and pipe_server.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 89898675446ba7158e3ecc5b2dddc4d0c55bc46d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89898675446ba7158e3ecc5b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 22 14:51:06 2017 +0100 server: Introduced new pipe_end struct containing common parts of pipe_client and pipe_server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 99 ++++++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89898675446ba7158e3ec…

1 0

Jacek Caban : uiautomationcore: Added stub dll.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: aca0a27cedfde05414112a505f727df2e36c95b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca0a27cedfde05414112a505… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 22 19:05:33 2017 +0100 uiautomationcore: Added stub dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/uiautomationcore/Makefile.in | 4 ++ dlls/uiautomationcore/uia_main.c | 38 ++++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 93 +++++++++++++++++++++++++++++ 5 files changed, 138 insertions(+) diff --git a/configure b/configure index 255dcdc..a64a766 100755 --- a/configure +++ b/configure @@ -1420,6 +1420,7 @@ enable_tdi_sys enable_traffic enable_twain_32 enable_ucrtbase +enable_uiautomationcore enable_unicows enable_updspapi enable_url @@ -18345,6 +18346,7 @@ wine_fn_config_test dlls/twain_32/tests twain_32_test wine_fn_config_dll typelib.dll16 enable_win16 wine_fn_config_dll ucrtbase enable_ucrtbase implib wine_fn_config_test dlls/ucrtbase/tests ucrtbase_test +wine_fn_config_dll uiautomationcore enable_uiautomationcore wine_fn_config_dll unicows enable_unicows implib wine_fn_config_dll updspapi enable_updspapi wine_fn_config_dll url enable_url implib diff --git a/configure.ac b/configure.ac index 367851d..cdef9e6 100644 --- a/configure.ac +++ b/configure.ac @@ -3402,6 +3402,7 @@ WINE_CONFIG_TEST(dlls/twain_32/tests) WINE_CONFIG_DLL(typelib.dll16,enable_win16) WINE_CONFIG_DLL(ucrtbase,,[implib]) WINE_CONFIG_TEST(dlls/ucrtbase/tests) +WINE_CONFIG_DLL(uiautomationcore) WINE_CONFIG_DLL(unicows,,[implib]) WINE_CONFIG_DLL(updspapi) WINE_CONFIG_DLL(url,,[implib]) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in new file mode 100644 index 0000000..78d6254 --- /dev/null +++ b/dlls/uiautomationcore/Makefile.in @@ -0,0 +1,4 @@ +MODULE = uiautomationcore.dll + +C_SRCS = \ + uia_main.c diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c new file mode 100644 index 0000000..6e6180e --- /dev/null +++ b/dlls/uiautomationcore/uia_main.c @@ -0,0 +1,38 @@ +/* + * Copyright 2017 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "uiautomationcore.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec new file mode 100644 index 0000000..3df7425 --- /dev/null +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -0,0 +1,93 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub DockPattern_SetDockPosition +@ stub ExpandCollapsePattern_Collapse +@ stub ExpandCollapsePattern_Expand +@ stub GridPattern_GetItem +@ stub InvokePattern_Invoke +@ stub ItemContainerPattern_FindItemByProperty +@ stub LegacyIAccessiblePattern_DoDefaultAction +@ stub LegacyIAccessiblePattern_GetIAccessible +@ stub LegacyIAccessiblePattern_Select +@ stub LegacyIAccessiblePattern_SetValue +@ stub MultipleViewPattern_GetViewName +@ stub MultipleViewPattern_SetCurrentView +@ stub RangeValuePattern_SetValue +@ stub ScrollItemPattern_ScrollIntoView +@ stub ScrollPattern_Scroll +@ stub ScrollPattern_SetScrollPercent +@ stub SelectionItemPattern_AddToSelection +@ stub SelectionItemPattern_RemoveFromSelection +@ stub SelectionItemPattern_Select +@ stub SynchronizedInputPattern_Cancel +@ stub SynchronizedInputPattern_StartListening +@ stub TextPattern_GetSelection +@ stub TextPattern_GetVisibleRanges +@ stub TextPattern_RangeFromChild +@ stub TextPattern_RangeFromPoint +@ stub TextPattern_get_DocumentRange +@ stub TextPattern_get_SupportedTextSelection +@ stub TextRange_AddToSelection +@ stub TextRange_Clone +@ stub TextRange_Compare +@ stub TextRange_CompareEndpoints +@ stub TextRange_ExpandToEnclosingUnit +@ stub TextRange_FindAttribute +@ stub TextRange_FindText +@ stub TextRange_GetAttributeValue +@ stub TextRange_GetBoundingRectangles +@ stub TextRange_GetChildren +@ stub TextRange_GetEnclosingElement +@ stub TextRange_GetText +@ stub TextRange_Move +@ stub TextRange_MoveEndpointByRange +@ stub TextRange_MoveEndpointByUnit +@ stub TextRange_RemoveFromSelection +@ stub TextRange_ScrollIntoView +@ stub TextRange_Select +@ stub TogglePattern_Toggle +@ stub TransformPattern_Move +@ stub TransformPattern_Resize +@ stub TransformPattern_Rotate +@ stub UiaAddEvent +@ stub UiaClientsAreListening +@ stub UiaEventAddWindow +@ stub UiaEventRemoveWindow +@ stub UiaFind +@ stub UiaGetErrorDescription +@ stub UiaGetPatternProvider +@ stub UiaGetPropertyValue +@ stub UiaGetReservedMixedAttributeValue +@ stub UiaGetReservedNotSupportedValue +@ stub UiaGetRootNode +@ stub UiaGetRuntimeId +@ stub UiaGetUpdatedCache +@ stub UiaHPatternObjectFromVariant +@ stub UiaHTextRangeFromVariant +@ stub UiaHUiaNodeFromVariant +@ stub UiaHasServerSideProvider +@ stub UiaHostProviderFromHwnd +@ stub UiaLookupId +@ stub UiaNavigate +@ stub UiaNodeFromFocus +@ stub UiaNodeFromHandle +@ stub UiaNodeFromPoint +@ stub UiaNodeFromProvider +@ stub UiaNodeRelease +@ stub UiaPatternRelease +@ stub UiaRaiseAsyncContentLoadedEvent +@ stub UiaRaiseAutomationEvent +@ stub UiaRaiseAutomationPropertyChangedEvent +@ stub UiaRaiseStructureChangedEvent +@ stub UiaRegisterProviderCallback +@ stub UiaRemoveEvent +@ stub UiaReturnRawElementProvider +@ stub UiaSetFocus +@ stub UiaTextRangeRelease +@ stub ValuePattern_SetValue +@ stub VirtualizedItemPattern_Realize +@ stub WindowPattern_Close +@ stub WindowPattern_SetWindowVisualState +@ stub WindowPattern_WaitForInputIdle

1 0

Józef Kucia : wined3d: Implement compute shader resource binding.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 1f1efea0d3579aba10b6defe1082c9bc54a4539a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1efea0d3579aba10b6defe1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:36 2017 +0100 wined3d: Implement compute shader resource binding. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 103 +++++++++++++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 92c2819..076ebee 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3350,17 +3350,57 @@ static void context_load_shader_resources(struct wined3d_context *context, const } } -static void context_bind_shader_resources(struct wined3d_context *context, const struct wined3d_state *state) +static void context_bind_shader_resources(struct wined3d_context *context, + const struct wined3d_state *state, enum wined3d_shader_type shader_type, + unsigned int base_idx, unsigned int count) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_device *device = context->device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; + unsigned int shader_sampler_count, i; + const struct wined3d_shader *shader; struct wined3d_sampler *sampler; - struct wined3d_shader *shader; - unsigned int i, j, count; GLuint sampler_name; + if (!(shader = state->shader[shader_type])) + return; + + shader_sampler_count = shader->reg_maps.sampler_map.count; + if (shader_sampler_count > count) + FIXME("Shader %p needs %u samplers, but only %u are supported.\n", + shader, shader_sampler_count, count); + count = min(shader_sampler_count, count); + + for (i = 0; i < count; ++i) + { + entry = &shader->reg_maps.sampler_map.entries[i]; + + if (!(view = state->shader_resource_view[shader_type][entry->resource_idx])) + { + WARN("No resource view bound at index %u, %u.\n", shader_type, entry->resource_idx); + continue; + } + + if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) + sampler_name = device->default_sampler; + else if ((sampler = state->sampler[shader_type][entry->sampler_idx])) + sampler_name = sampler->name; + else + sampler_name = device->null_sampler; + + context_active_texture(context, gl_info, base_idx + entry->bind_idx); + GL_EXTCALL(glBindSampler(base_idx + entry->bind_idx, sampler_name)); + checkGLcall("glBindSampler"); + wined3d_shader_resource_view_bind(view, context); + } +} + +static void context_bind_graphics_shader_resources(struct wined3d_context *context, + const struct wined3d_state *state) +{ + unsigned int i; + static const struct { enum wined3d_shader_type type; @@ -3374,41 +3414,8 @@ static void context_bind_shader_resources(struct wined3d_context *context, const }; for (i = 0; i < ARRAY_SIZE(shader_types); ++i) - { - if (!(shader = state->shader[shader_types[i].type])) - continue; - - count = shader->reg_maps.sampler_map.count; - if (count > shader_types[i].count) - { - FIXME("Shader %p needs %u samplers, but only %u are supported.\n", - shader, count, shader_types[i].count); - count = shader_types[i].count; - } - - for (j = 0; j < count; ++j) - { - entry = &shader->reg_maps.sampler_map.entries[j]; - - if (!(view = state->shader_resource_view[shader_types[i].type][entry->resource_idx])) - { - WARN("No resource view bound at index %u, %u.\n", shader_types[i].type, entry->resource_idx); - continue; - } - - if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) - sampler_name = device->default_sampler; - else if ((sampler = state->sampler[shader_types[i].type][entry->sampler_idx])) - sampler_name = sampler->name; - else - sampler_name = device->null_sampler; - - context_active_texture(context, gl_info, shader_types[i].base_idx + entry->bind_idx); - GL_EXTCALL(glBindSampler(shader_types[i].base_idx + entry->bind_idx, sampler_name)); - checkGLcall("glBindSampler"); - wined3d_shader_resource_view_bind(view, context); - } - } + context_bind_shader_resources(context, state, shader_types[i].type, + shader_types[i].base_idx, shader_types[i].count); } static void context_load_unordered_access_resources(struct wined3d_context *context, @@ -3502,12 +3509,12 @@ BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct StateEntry *state_table = context->state_table; + const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_fb_state *fb = state->fb; unsigned int i; WORD map; - if (!context_validate_rt_config(context->gl_info->limits.buffers, - fb->render_targets, fb->depth_stencil)) + if (!context_validate_rt_config(gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) return FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && isStateDirty(context, STATE_FRAMEBUFFER)) @@ -3575,8 +3582,10 @@ BOOL context_apply_draw_state(struct wined3d_context *context, if (context->update_shader_resource_bindings) { - context_bind_shader_resources(context, state); + context_bind_graphics_shader_resources(context, state); context->update_shader_resource_bindings = 0; + if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) + context->update_compute_shader_resource_bindings = 1; } if (context->update_unordered_access_view_bindings) @@ -3603,6 +3612,7 @@ void context_apply_compute_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct StateEntry *state_table = context->state_table; + const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int state_id, i, j; context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); @@ -3625,6 +3635,17 @@ void context_apply_compute_state(struct wined3d_context *context, context->shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); } + if (context->update_compute_shader_resource_bindings) + { + unsigned int base_idx, count; + wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, + WINED3D_SHADER_TYPE_COMPUTE, &base_idx, &count); + context_bind_shader_resources(context, state, WINED3D_SHADER_TYPE_COMPUTE, base_idx, count); + context->update_compute_shader_resource_bindings = 0; + if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) + context->update_shader_resource_bindings = 1; + } + if (context->update_compute_unordered_access_view_bindings) { context_bind_unordered_access_views(context,

1 0

Józef Kucia : wined3d: Load sampler bindings for compute shaders.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 7d9b0a6e166eb1c021915129f5eea946f48d6216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9b0a6e166eb1c021915129f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:35 2017 +0100 wined3d: Load sampler bindings for compute shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 64 +++++++++++++++++++++++++----------------- dlls/wined3d/utils.c | 17 +++++++++++ dlls/wined3d/wined3d_private.h | 4 ++- 3 files changed, 59 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a8f7f86..44e1513 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -560,14 +560,41 @@ void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint pro /* Context activation is done by the caller. */ static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info, - struct shader_glsl_priv *priv, const DWORD *tex_unit_map, GLuint program_id) + struct shader_glsl_priv *priv, const char *prefix, unsigned int base_idx, + unsigned int count, const DWORD *tex_unit_map, GLuint program_id) { - unsigned int mapped_unit; struct wined3d_string_buffer *sampler_name = string_buffer_get(&priv->string_buffers); - const char *prefix; - unsigned int i, j; + unsigned int mapped_unit, i; GLint name_loc; + for (i = 0; i < count; ++i) + { + string_buffer_sprintf(sampler_name, "%s_sampler%u", prefix, i); + name_loc = GL_EXTCALL(glGetUniformLocation(program_id, sampler_name->buffer)); + if (name_loc == -1) + continue; + + mapped_unit = tex_unit_map ? tex_unit_map[base_idx + i] : base_idx + i; + if (mapped_unit == WINED3D_UNMAPPED_STAGE || mapped_unit >= gl_info->limits.combined_samplers) + { + ERR("Trying to load sampler %s on unsupported unit %u.\n", sampler_name->buffer, mapped_unit); + continue; + } + + TRACE("Loading sampler %s on unit %u.\n", sampler_name->buffer, mapped_unit); + GL_EXTCALL(glUniform1i(name_loc, mapped_unit)); + } + checkGLcall("Load sampler bindings"); + string_buffer_release(&priv->string_buffers, sampler_name); +} + +/* Context activation is done by the caller. */ +static void shader_glsl_load_graphics_samplers(const struct wined3d_gl_info *gl_info, + struct shader_glsl_priv *priv, const DWORD *tex_unit_map, GLuint program_id) +{ + const char *prefix; + unsigned int i; + static const struct { enum wined3d_shader_type type; @@ -583,27 +610,9 @@ static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info, for (i = 0; i < ARRAY_SIZE(sampler_info); ++i) { prefix = shader_glsl_get_prefix(sampler_info[i].type); - - for (j = 0; j < sampler_info[i].count; ++j) - { - string_buffer_sprintf(sampler_name, "%s_sampler%u", prefix, j); - name_loc = GL_EXTCALL(glGetUniformLocation(program_id, sampler_name->buffer)); - if (name_loc == -1) - continue; - - mapped_unit = tex_unit_map[sampler_info[i].base_idx + j]; - if (mapped_unit == WINED3D_UNMAPPED_STAGE || mapped_unit >= gl_info->limits.graphics_samplers) - { - ERR("Trying to load sampler %s on unsupported unit %u.\n", sampler_name->buffer, mapped_unit); - continue; - } - - TRACE("Loading sampler %s on unit %u.\n", sampler_name->buffer, mapped_unit); - GL_EXTCALL(glUniform1i(name_loc, mapped_unit)); - } + shader_glsl_load_samplers(gl_info, priv, prefix, + sampler_info[i].base_idx, sampler_info[i].count, tex_unit_map, program_id); } - checkGLcall("Load sampler bindings"); - string_buffer_release(&priv->string_buffers, sampler_name); } static void shader_glsl_load_icb(const struct wined3d_gl_info *gl_info, struct shader_glsl_priv *priv, @@ -8293,6 +8302,7 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int base_sampler_idx, sampler_count; struct glsl_shader_prog_link *entry = NULL; struct wined3d_shader *shader; struct glsl_program_key key; @@ -8351,6 +8361,10 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &shader->reg_maps); shader_glsl_load_icb(gl_info, priv, program_id, &shader->reg_maps); shader_glsl_load_images(gl_info, priv, program_id, &shader->reg_maps); + wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_COMPUTE, + &base_sampler_idx, &sampler_count); + shader_glsl_load_samplers(gl_info, priv, shader_glsl_get_prefix(WINED3D_SHADER_TYPE_COMPUTE), + base_sampler_idx, sampler_count, NULL, program_id); entry->constant_update_mask = 0; } @@ -8629,7 +8643,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const /* Texture unit mapping is set up to be the same each time the shader * program is used so we can hardcode the sampler uniform values. */ - shader_glsl_load_samplers(gl_info, priv, context->tex_unit_map, program_id); + shader_glsl_load_graphics_samplers(gl_info, priv, context->tex_unit_map, program_id); entry->constant_update_mask = 0; if (vshader) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 61f7a8a..b076783 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5943,3 +5943,20 @@ void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *g ERR("Unrecognized shader type %#x.\n", shader_type); *count = 0; } + +void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) +{ + if (shader_type != WINED3D_SHADER_TYPE_COMPUTE) + { + *base = *count = 0; + ERR("Unhandled shader type %#x.\n", shader_type); + return; + } + + if (gl_limits->combined_samplers == gl_limits->graphics_samplers) + *base = 0; + else + *base = gl_limits->graphics_samplers - 1; + *count = gl_limits->compute_samplers; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8217cb6..087e4d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2236,6 +2236,8 @@ struct wined3d_gl_limits UINT arb_ps_temps; }; +void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *gl_limits, enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; @@ -2568,7 +2570,7 @@ struct wined3d_state struct wined3d_rasterizer_state *rasterizer_state; }; -#define WINED3D_UNMAPPED_STAGE ~0U +#define WINED3D_UNMAPPED_STAGE ~0u /* Multithreaded flag. Removed from the public header to signal that * wined3d_device_create() ignores it. */

1 0

Jacek Caban : server: Pass existing async object to fd_queue_async.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: a3acdf117f0d7ffa37d26d76c25f5eb8ac7a892b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3acdf117f0d7ffa37d26d76c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 22 14:50:49 2017 +0100 server: Pass existing async object to fd_queue_async. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 5 ----- server/change.c | 5 +++-- server/device.c | 29 +++++++++-------------------- server/fd.c | 33 +++++++++++++-------------------- server/file.h | 3 +-- server/mailslot.c | 3 +-- server/named_pipe.c | 6 ++---- server/serial.c | 3 +-- 8 files changed, 30 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3acdf117f0d7ffa37d26…

1 0

Jacek Caban : server: Moved server-independent parts of pipe_server_flush into separated function.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: e50d49c17a3c9d51621a5781dda1a107bee0b949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50d49c17a3c9d51621a5781d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 22 14:51:17 2017 +0100 server: Moved server-independent parts of pipe_server_flush into separated function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 4a4769b..6861e0f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -548,23 +548,31 @@ static void check_flushed( void *arg ) } } +static obj_handle_t pipe_end_flush( struct pipe_end *pipe_end, struct async *async, int blocking ) +{ + obj_handle_t handle = 0; + + if (!fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT )) return 0; + + if (!blocking || (handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) + set_error( STATUS_PENDING ); + return handle; +} + static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async, int blocking ) { struct pipe_server *server = get_fd_user( fd ); - obj_handle_t handle = 0; + obj_handle_t handle; if (!server || server->state != ps_connected_server) return 0; if (!pipe_data_remaining( server )) return 0; - if (fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT )) - { - /* there's no unix way to be alerted when a pipe becomes empty, so resort to polling */ - if (!server->flush_poll) - server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); - if (blocking) handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); - set_error( STATUS_PENDING ); - } + handle = pipe_end_flush( &server->pipe_end, async, blocking ); + + /* there's no unix way to be alerted when a pipe becomes empty, so resort to polling */ + if (handle && !server->flush_poll) + server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); return handle; }

1 0

Józef Kucia : wined3d: Do not try to invalidate compute states for freshly created contexts.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: f5de7186aa5669982227acde39cc0324fa69e8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5de7186aa5669982227acde3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:27 2017 +0100 wined3d: Do not try to invalidate compute states for freshly created contexts. The context_invalidate_state() function doesn't handle compute states properly. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a58a905..67daded 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1828,11 +1828,11 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->d3d_info = d3d_info; ret->state_table = device->StateTable; - /* Mark all states dirty to force a proper initialization of the states - * on the first use of the context. */ + /* Mark all states dirty to force a proper initialization of the states on + * the first use of the context. Compute states do not need initialization. */ for (state = 0; state <= STATE_HIGHEST; ++state) { - if (ret->state_table[state].representative) + if (ret->state_table[state].representative && !STATE_IS_COMPUTE(state)) context_invalidate_state(ret, state); }

1 0

Piotr Caban : ucrtbase: Add __initialize_lconv_for_unsigned_char implementation.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 7b0a58f217db73e3664ca4f7d5adf492ce91d015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0a58f217db73e3664ca4f7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 22 14:37:45 2017 +0100 ucrtbase: Add __initialize_lconv_for_unsigned_char implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index 60c588b..12bbbe6 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl ___lc_locale_name_func() ucrtbase.___lc_locale_name_func @ cdecl ___mb_cur_max_func() ucrtbase.___mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) ucrtbase.___mb_cur_max_l_func -@ stub __initialize_lconv_for_unsigned_char +@ cdecl __initialize_lconv_for_unsigned_char() ucrtbase.__initialize_lconv_for_unsigned_char @ cdecl __pctype_func() ucrtbase.__pctype_func @ stub __pwctype_func @ cdecl _configthreadlocale(long) ucrtbase._configthreadlocale diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2f733c3..4bcd12e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -91,7 +91,7 @@ @ cdecl __dstbias() MSVCRT___p__dstbias @ cdecl __fpe_flt_rounds() @ cdecl __fpecode() -@ stub __initialize_lconv_for_unsigned_char +@ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ stub __intrinsic_setjmpex

1 0

Francois Gouget : webservices: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 304bd8e203fe36faefc243a0a544f4b0682174d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=304bd8e203fe36faefc243a0a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:24:57 2017 +0100 webservices: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their formatting and type names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices_private.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 3aafeb1..e6fdbb1 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -147,27 +147,27 @@ static inline BOOL is_valid_parent( const struct node *node ) return (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF); } -static inline void *heap_alloc( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, size ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc( void *mem, SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc( GetProcessHeap(), 0, mem, size ); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline void *heap_realloc_zero( void *mem, SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { - return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size ); + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } -static inline BOOL heap_free( void *mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); }

1 0