wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Józef Kucia : wined3d: Fix draw calls when first render target is NULL.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 53639b04ebd0a80b30dbd304489d59b88710d58c URL: https://source.winehq.org/git/wine.git/?a=commit;h=53639b04ebd0a80b30dbd304… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 1 19:36:54 2018 +0100 wined3d: Fix draw calls when first render target is NULL. In Direct3D 10+, the render target at index 0 can be set to NULL. 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 | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c73e4d1..c9efad0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3168,6 +3168,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat { DWORD rt_mask = find_draw_buffers_mask(context, state); const struct wined3d_fb_state *fb = state->fb; + DWORD color_location = 0; DWORD *cur_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -3184,18 +3185,20 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat memset(context->blit_targets, 0, sizeof(context->blit_targets)); for (i = 0; i < context->gl_info->limits.buffers; ++i) { - if (fb->render_targets[i]) - { - context->blit_targets[i].gl_view = fb->render_targets[i]->gl_view; - context->blit_targets[i].resource = fb->render_targets[i]->resource; - context->blit_targets[i].sub_resource_idx = fb->render_targets[i]->sub_resource_idx; - context->blit_targets[i].layer_count = fb->render_targets[i]->layer_count; - } + if (!fb->render_targets[i]) + continue; + + context->blit_targets[i].gl_view = fb->render_targets[i]->gl_view; + context->blit_targets[i].resource = fb->render_targets[i]->resource; + context->blit_targets[i].sub_resource_idx = fb->render_targets[i]->sub_resource_idx; + context->blit_targets[i].layer_count = fb->render_targets[i]->layer_count; + + if (!color_location) + color_location = fb->render_targets[i]->resource->draw_binding; } context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, wined3d_rendertarget_view_get_surface(fb->depth_stencil), - fb->render_targets[0] ? fb->render_targets[0]->resource->draw_binding : 0, - fb->depth_stencil ? fb->depth_stencil->resource->draw_binding : 0); + color_location, fb->depth_stencil ? fb->depth_stencil->resource->draw_binding : 0); } }

1 0

Józef Kucia : wined3d: Factor out get_viewport() function.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 544a7daaebcdd329517854b32c4f8f42374cde4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=544a7daaebcdd329517854b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 1 19:36:53 2018 +0100 wined3d: Factor out get_viewport() function. No attachment draw calls are always offscreen. 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/state.c | 89 +++++++++++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fd858c5..e3c39f6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4651,22 +4651,32 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine } } -static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void get_viewport(struct wined3d_context *context, const struct wined3d_state *state, + struct wined3d_viewport *viewport) { const struct wined3d_rendertarget_view *depth_stencil = state->fb->depth_stencil; const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; - const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_viewport vp = state->viewport; unsigned int width, height; - float y; + + *viewport = state->viewport; if (target) { - if (vp.width > target->width) - vp.width = target->width; - if (vp.height > target->height) - vp.height = target->height; + if (viewport->width > target->width) + viewport->width = target->width; + if (viewport->height > target->height) + viewport->height = target->height; + } + + /* + * Note: GL requires lower left, DirectX supplies upper left. This is + * reversed when using offscreen rendering. + */ + if (context->render_offscreen) + return; + if (target) + { wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); } else if (depth_stencil) @@ -4675,67 +4685,46 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine } else { - height = gl_info->limits.framebuffer_height; + FIXME("Could not get the height of render targets.\n"); + return; } - gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); + viewport->y = height - (viewport->y + viewport->height); +} + +static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_viewport vp; - /* Note: GL requires lower left, DirectX supplies upper left. This is - * reversed when using offscreen rendering. */ - y = context->render_offscreen ? vp.y : height - (vp.y + vp.height); + get_viewport(context, state, &vp); + + gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); if (gl_info->supported[ARB_VIEWPORT_ARRAY]) - GL_EXTCALL(glViewportIndexedf(0, vp.x, y, vp.width, vp.height)); + GL_EXTCALL(glViewportIndexedf(0, vp.x, vp.y, vp.width, vp.height)); else - gl_info->gl_ops.gl.p_glViewport(vp.x, y, vp.width, vp.height); + gl_info->gl_ops.gl.p_glViewport(vp.x, vp.y, vp.width, vp.height); checkGLcall("setting clip space and viewport"); } static void viewport_miscpart_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_rendertarget_view *depth_stencil = state->fb->depth_stencil; - const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; - /* See get_projection_matrix() in utils.c for a discussion about those - * values. */ + /* See get_projection_matrix() in utils.c for a discussion about those values. */ float pixel_center_offset = context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : -1.0f / 128.0f; const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_viewport vp = state->viewport; - unsigned int width, height; - - if (target) - { - if (vp.width > target->width) - vp.width = target->width; - if (vp.height > target->height) - vp.height = target->height; + struct wined3d_viewport vp; - wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); - } - else if (depth_stencil) - { - height = depth_stencil->height; - } - else - { - height = gl_info->limits.framebuffer_height; - } + get_viewport(context, state, &vp); + vp.x += pixel_center_offset; + vp.y += pixel_center_offset; gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); - if (context->render_offscreen) - { - GL_EXTCALL(glClipControl(GL_UPPER_LEFT, GL_ZERO_TO_ONE)); - GL_EXTCALL(glViewportIndexedf(0, vp.x + pixel_center_offset, vp.y + pixel_center_offset, - vp.width, vp.height)); - } - else - { - GL_EXTCALL(glClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE)); - GL_EXTCALL(glViewportIndexedf(0, vp.x + pixel_center_offset, - (height - (vp.y + vp.height)) + pixel_center_offset, vp.width, vp.height)); - } + GL_EXTCALL(glClipControl(context->render_offscreen ? GL_UPPER_LEFT : GL_LOWER_LEFT, GL_ZERO_TO_ONE)); + GL_EXTCALL(glViewportIndexedf(0, vp.x, vp.y, vp.width, vp.height)); checkGLcall("setting clip space and viewport"); }

1 0

Józef Kucia : wined3d: Implement draw calls with no attachments.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 7096e1e02d900bb47c819fde223ec91dd7dbb733 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7096e1e02d900bb47c819fde… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 1 19:36:52 2018 +0100 wined3d: Implement draw calls with no attachments. Supported when ARB_framebuffer_no_attachments is available. It was reported that no attachments framebuffers trigger GPU hangs in The Witcher 3 on some system configurations with radeonsi driver. MESA_EXTENSION_OVERRIDE=-GL_ARB_framebuffer_no_attachments can be used as a workaround until it's fixed. 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 | 35 ++++++++++++++++++++++++++++------- dlls/wined3d/directx.c | 13 +++++++++++++ dlls/wined3d/state.c | 13 ++++--------- dlls/wined3d/wined3d_private.h | 3 +++ 4 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 975a79c..c73e4d1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -700,8 +700,8 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, static void context_apply_fbo_entry(struct wined3d_context *context, GLenum target, struct fbo_entry *entry) { const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i; GLuint read_binding, draw_binding; + unsigned int i; if (entry->flags & WINED3D_FBO_ENTRY_FLAG_ATTACHED) { @@ -713,6 +713,16 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ draw_binding = context->fbo_draw_binding; context_bind_fbo(context, GL_FRAMEBUFFER, entry->id); + if (gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) + { + GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, + GL_FRAMEBUFFER_DEFAULT_WIDTH, gl_info->limits.framebuffer_width)); + GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, + GL_FRAMEBUFFER_DEFAULT_HEIGHT, gl_info->limits.framebuffer_height)); + GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_LAYERS, 1)); + GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_SAMPLES, 1)); + } + /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { @@ -2996,12 +3006,13 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine context_invalidate_state(context, STATE_FRAMEBUFFER); } -static BOOL context_validate_rt_config(UINT rt_count, struct wined3d_rendertarget_view * const *rts, +static BOOL have_framebuffer_attachment(unsigned int rt_count, struct wined3d_rendertarget_view * const *rts, const struct wined3d_rendertarget_view *ds) { unsigned int i; - if (ds) return TRUE; + if (ds) + return TRUE; for (i = 0; i < rt_count; ++i) { @@ -3009,7 +3020,6 @@ static BOOL context_validate_rt_config(UINT rt_count, struct wined3d_rendertarge return TRUE; } - WARN("Invalid render target config, need at least one attachment.\n"); return FALSE; } @@ -3026,8 +3036,11 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win if (isStateDirty(context, STATE_FRAMEBUFFER) || fb != state->fb || rt_count != gl_info->limits.buffers) { - if (!context_validate_rt_config(rt_count, rts, dsv)) + if (!have_framebuffer_attachment(rt_count, rts, dsv)) + { + WARN("Invalid render target config, need at least one attachment.\n"); return FALSE; + } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -3908,8 +3921,16 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, unsigned int i; WORD map; - if (!context_validate_rt_config(gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) - return FALSE; + if (!have_framebuffer_attachment(gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) + { + if (!gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) + { + FIXME("OpenGL implementation does not support framebuffers with no attachments.\n"); + return FALSE; + } + + context_set_render_offscreen(context, TRUE); + } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && isStateDirty(context, STATE_FRAMEBUFFER)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a95ded3..b73966a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3779,6 +3779,19 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.samples = gl_max; } + if (gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAMEBUFFER_WIDTH, &gl_max); + gl_info->limits.framebuffer_width = gl_max; + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAMEBUFFER_HEIGHT, &gl_max); + gl_info->limits.framebuffer_height = gl_max; + } + else + { + gl_info->limits.framebuffer_width = gl_info->limits.texture_size; + gl_info->limits.framebuffer_height = gl_info->limits.texture_size; + } + gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL] = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], MAX_GL_FRAGMENT_SAMPLERS); sampler_count = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 407ad62..fd858c5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4671,17 +4671,15 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine } else if (depth_stencil) { - width = depth_stencil->width; height = depth_stencil->height; } else { - FIXME("No attachments draw calls not supported.\n"); - return; + height = gl_info->limits.framebuffer_height; } gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); - checkGLcall("glDepthRange"); + /* Note: GL requires lower left, DirectX supplies upper left. This is * reversed when using offscreen rendering. */ y = context->render_offscreen ? vp.y : height - (vp.y + vp.height); @@ -4690,7 +4688,7 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine GL_EXTCALL(glViewportIndexedf(0, vp.x, y, vp.width, vp.height)); else gl_info->gl_ops.gl.p_glViewport(vp.x, y, vp.width, vp.height); - checkGLcall("glViewport"); + checkGLcall("setting clip space and viewport"); } static void viewport_miscpart_cc(struct wined3d_context *context, @@ -4717,17 +4715,14 @@ static void viewport_miscpart_cc(struct wined3d_context *context, } else if (depth_stencil) { - width = depth_stencil->width; height = depth_stencil->height; } else { - FIXME("No attachments draw calls not supported.\n"); - return; + height = gl_info->limits.framebuffer_height; } gl_info->gl_ops.gl.p_glDepthRange(vp.min_z, vp.max_z); - checkGLcall("glDepthRange"); if (context->render_offscreen) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f085f2d..1c4c3ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2533,6 +2533,9 @@ struct wined3d_gl_limits unsigned int texture_buffer_offset_alignment; + unsigned int framebuffer_width; + unsigned int framebuffer_height; + UINT glsl_varyings; UINT glsl_vs_float_constants; UINT glsl_ps_float_constants;

1 0

Józef Kucia : wined3d: Remove redundant if statement from device_init_swapchain_state().
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 4998cea0702107621f350b46c934ba07190bbaf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4998cea0702107621f350b46… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 1 19:36:51 2018 +0100 wined3d: Remove redundant if statement from device_init_swapchain_state(). 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/device.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 648e352..92dfa0c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -949,15 +949,12 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi BOOL ds_enable = swapchain->desc.enable_auto_depth_stencil; unsigned int i; - if (device->fb.render_targets) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) - { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); - } - if (device->back_buffer_view) - wined3d_device_set_rendertarget_view(device, 0, device->back_buffer_view, TRUE); + wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } + if (device->back_buffer_view) + wined3d_device_set_rendertarget_view(device, 0, device->back_buffer_view, TRUE); wined3d_device_set_depth_stencil_view(device, ds_enable ? device->auto_depth_stencil_view : NULL); }

1 0

Alexandre Julliard : kernel32: Move the mapping object functions to sync.c.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: c52e3ff24999ab93d837bc6af21152e647ef540a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c52e3ff24999ab93d837bc6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 10:51:31 2018 +0100 kernel32: Move the mapping object functions to sync.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_private.h | 3 - dlls/kernel32/sync.c | 141 +++++++++++++++++++++++++++++- dlls/kernel32/virtual.c | 190 ----------------------------------------- 3 files changed, 140 insertions(+), 194 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c52e3ff24999ab93d837…

1 0

Alexandre Julliard : kernel32: Add a helper function to fill object attributes in Create* functions.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 808693102e15025d1a08cbc2e27be7441e98aa75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=808693102e15025d1a08cbc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 10:41:12 2018 +0100 kernel32: Add a helper function to fill object attributes in Create* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 82 ++++++++++++++-------------------------------------- 1 file changed, 22 insertions(+), 60 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index fbe5c3b..c8dcdfc 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -81,6 +81,23 @@ HANDLE get_BaseNamedObjects_handle(void) return handle; } +static void get_create_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *nameW, + SECURITY_ATTRIBUTES *sa, const WCHAR *name ) +{ + attr->Length = sizeof(*attr); + attr->RootDirectory = 0; + attr->ObjectName = NULL; + attr->Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); + attr->SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; + attr->SecurityQualityOfService = NULL; + if (name) + { + RtlInitUnicodeString( nameW, name ); + attr->ObjectName = nameW; + attr->RootDirectory = get_BaseNamedObjects_handle(); + } +} + static BOOL get_open_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *nameW, BOOL inherit, const WCHAR *name ) { @@ -490,18 +507,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateEventExW( SECURITY_ATTRIBUTES *sa, LPCWSTR return 0; } - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + get_create_object_attributes( &attr, &nameW, sa, name ); status = NtCreateEvent( &ret, access, &attr, (flags & CREATE_EVENT_MANUAL_RESET) ? NotificationEvent : SynchronizationEvent, @@ -643,18 +649,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateMutexExW( SECURITY_ATTRIBUTES *sa, LPCWSTR OBJECT_ATTRIBUTES attr; NTSTATUS status; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + get_create_object_attributes( &attr, &nameW, sa, name ); status = NtCreateMutant( &ret, access, &attr, (flags & CREATE_MUTEX_INITIAL_OWNER) != 0 ); if (status == STATUS_OBJECT_NAME_EXISTS) @@ -777,18 +772,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateSemaphoreExW( SECURITY_ATTRIBUTES *sa, LON OBJECT_ATTRIBUTES attr; NTSTATUS status; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + get_create_object_attributes( &attr, &nameW, sa, name ); status = NtCreateSemaphore( &ret, access, &attr, initial, max ); if (status == STATUS_OBJECT_NAME_EXISTS) @@ -866,18 +850,7 @@ HANDLE WINAPI CreateJobObjectW( LPSECURITY_ATTRIBUTES sa, LPCWSTR name ) OBJECT_ATTRIBUTES attr; NTSTATUS status; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + get_create_object_attributes( &attr, &nameW, sa, name ); status = NtCreateJobObject( &ret, JOB_OBJECT_ALL_ACCESS, &attr ); if (status == STATUS_OBJECT_NAME_EXISTS) @@ -1057,18 +1030,7 @@ HANDLE WINAPI CreateWaitableTimerExW( SECURITY_ATTRIBUTES *sa, LPCWSTR name, DWO UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + get_create_object_attributes( &attr, &nameW, sa, name ); status = NtCreateTimer( &handle, access, &attr, (flags & CREATE_WAITABLE_TIMER_MANUAL_RESET) ? NotificationTimer : SynchronizationTimer );

1 0

Alexandre Julliard : kernel32: Add a helper function to fill object attributes in Open* functions.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: a7aa192a78d02d28f2bbae919a3f5c726e4e9e60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7aa192a78d02d28f2bbae91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 10:40:41 2018 +0100 kernel32: Add a helper function to fill object attributes in Open* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 79 +++++++++++----------------------------------- dlls/kernel32/tests/sync.c | 40 +++++++++++++++++++++++ 2 files changed, 59 insertions(+), 60 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index d3d46b7..fbe5c3b 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -81,6 +81,20 @@ HANDLE get_BaseNamedObjects_handle(void) return handle; } +static BOOL get_open_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *nameW, + BOOL inherit, const WCHAR *name ) +{ + if (!name) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + RtlInitUnicodeString( nameW, name ); + InitializeObjectAttributes( attr, nameW, inherit ? OBJ_INHERIT : 0, + get_BaseNamedObjects_handle(), NULL ); + return TRUE; +} + /* helper for kernel32->ntdll timeout format conversion */ static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, DWORD timeout ) { @@ -530,18 +544,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenEventW( DWORD access, BOOL inherit, LPCWSTR if (!is_version_nt()) access = EVENT_ALL_ACCESS; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = inherit ? OBJ_INHERIT : 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; status = NtOpenEvent( &ret, access, &attr ); if (status != STATUS_SUCCESS) @@ -692,18 +695,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenMutexW( DWORD access, BOOL inherit, LPCWSTR if (!is_version_nt()) access = MUTEX_ALL_ACCESS; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = inherit ? OBJ_INHERIT : 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; status = NtOpenMutant( &ret, access, &attr ); if (status != STATUS_SUCCESS) @@ -837,18 +829,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenSemaphoreW( DWORD access, BOOL inherit, LPCW if (!is_version_nt()) access = SEMAPHORE_ALL_ACCESS; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = inherit ? OBJ_INHERIT : 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; status = NtOpenSemaphore( &ret, access, &attr ); if (status != STATUS_SUCCESS) @@ -933,18 +914,7 @@ HANDLE WINAPI OpenJobObjectW( DWORD access, BOOL inherit, LPCWSTR name ) OBJECT_ATTRIBUTES attr; NTSTATUS status; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = inherit ? OBJ_INHERIT : 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; status = NtOpenJobObject( &ret, access, &attr ); if (status != STATUS_SUCCESS) @@ -1140,18 +1110,7 @@ HANDLE WINAPI OpenWaitableTimerW( DWORD access, BOOL inherit, LPCWSTR name ) if (!is_version_nt()) access = TIMER_ALL_ACCESS; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = inherit ? OBJ_INHERIT : 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } + if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; status = NtOpenTimer(&handle, access, &attr); if (status != STATUS_SUCCESS) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 83ab534..f7be51e 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -265,6 +265,16 @@ todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); + hOpened = OpenMutexA(READ_CONTROL, FALSE, NULL); + ok(!hOpened, "OpenMutex succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + hOpened = OpenMutexW(READ_CONTROL, FALSE, NULL); + ok(!hOpened, "OpenMutex succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); hOpened = CreateMutexA(NULL, FALSE, "WineTestMutex"); ok(hOpened != NULL, "CreateMutex failed with error %d\n", GetLastError()); ok(GetLastError() == ERROR_ALREADY_EXISTS, "wrong error %u\n", GetLastError()); @@ -517,6 +527,16 @@ static void test_event(void) ok( !handle2, "OpenEvent succeeded\n"); ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + handle2 = OpenEventA( EVENT_ALL_ACCESS, FALSE, NULL ); + ok( !handle2, "OpenEvent succeeded\n"); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + handle2 = OpenEventW( EVENT_ALL_ACCESS, FALSE, NULL ); + ok( !handle2, "OpenEvent succeeded\n"); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + CloseHandle( handle ); /* resource notifications are events too */ @@ -586,6 +606,16 @@ static void test_semaphore(void) ok( !handle2, "OpenSemaphore succeeded\n"); ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + handle2 = OpenSemaphoreA( SEMAPHORE_ALL_ACCESS, FALSE, NULL ); + ok( !handle2, "OpenSemaphore succeeded\n"); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + handle2 = OpenSemaphoreW( SEMAPHORE_ALL_ACCESS, FALSE, NULL ); + ok( !handle2, "OpenSemaphore succeeded\n"); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + CloseHandle( handle ); } @@ -622,6 +652,16 @@ static void test_waitable_timer(void) ok( !handle2, "OpenWaitableTimer succeeded\n"); ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + handle2 = OpenWaitableTimerA( TIMER_ALL_ACCESS, FALSE, NULL ); + ok( !handle2, "OpenWaitableTimer failed with error %d\n", GetLastError()); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + handle2 = OpenWaitableTimerW( TIMER_ALL_ACCESS, FALSE, NULL ); + ok( !handle2, "OpenWaitableTimer failed with error %d\n", GetLastError()); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + CloseHandle( handle ); }

1 0

Alexandre Julliard : kernel32/tests: Remove some win9x workarounds.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: be8affc4bd92f16b6387150902c0f19c3336e1f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8affc4bd92f16b63871509… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 10:39:50 2018 +0100 kernel32/tests: Remove some win9x workarounds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 195 ++++++++++++++++----------------------------- 1 file changed, 67 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be8affc4bd92f16b6387…

1 0

Francois Gouget : testbot: Remove unneeded WineTestBot:: RecordGroups imports.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: tools Branch: master Commit: bec79d047b5ebf8ee895cfb9ba8bf785a858a92e URL: https://source.winehq.org/git/tools.git/?a=commit;h=bec79d047b5ebf8ee895cfb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 2 01:26:23 2018 +0100 testbot: Remove unneeded WineTestBot::RecordGroups imports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 1 - testbot/bin/WineRunReconfig.pl | 1 - testbot/bin/WineRunTask.pl | 1 - 3 files changed, 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e4295c8..90c261b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -45,7 +45,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; -use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4eefa17..77994a3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -45,7 +45,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; -use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 46b11f3..88c3b58 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -44,7 +44,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; -use WineTestBot::RecordGroups; use WineTestBot::Engine::Notify;

1 0

Francois Gouget : testbot/web: Reuse $self-> {Job} instead of reloading the Job everywhere.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: tools Branch: master Commit: 5f98526e32fefd953fe7095a55693ebaedff93e8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5f98526e32fefd953fe7095… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 2 01:25:38 2018 +0100 testbot/web: Reuse $self->{Job} instead of reloading the Job everywhere. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 7ca7889..923ef97 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -91,8 +91,7 @@ sub CanCancel($) { my ($self) = @_; - my $Job = CreateJobs()->GetItem($self->{JobId}); - my $Status = $Job->Status; + my $Status = $self->{Job}->Status; if ($Status ne "queued" && $Status ne "running") { return "Job already $Status"; @@ -105,7 +104,7 @@ sub CanCancel($) } my $CurrentUser = $Session->User; if (! $CurrentUser->HasRole("admin") && - $Job->User->GetKey() ne $CurrentUser->GetKey()) + $self->{Job}->User->GetKey() ne $CurrentUser->GetKey()) { return "You are not authorized to cancel this job"; } @@ -117,8 +116,7 @@ sub CanRestart($) { my ($self) = @_; - my $Job = CreateJobs()->GetItem($self->{JobId}); - my $Status = $Job->Status; + my $Status = $self->{Job}->Status; if ($Status ne "boterror" && $Status ne "canceled") { return "Not a failed / canceled Job"; @@ -131,7 +129,7 @@ sub CanRestart($) } my $CurrentUser = $Session->User; if (! $CurrentUser->HasRole("admin") && - $Job->User->GetKey() ne $CurrentUser->GetKey()) # FIXME: Admin only? + $self->{Job}->User->GetKey() ne $CurrentUser->GetKey()) # FIXME: Admin only? { return "You are not authorized to restart this job"; }

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018