March 2018 - Wine-Devel - list.winehq.org

[PATCH 5/7] wined3d: Pass a texture and sub-resource index to context_apply_fbo_state_blit().
by Henri Verbeet March 12, 2018

March 12, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/context.c | 20 ++++++++++---------- dlls/wined3d/surface.c | 17 +++++++++-------- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 23f4d04732c..0a9b078a648 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7865,7 +7865,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl TRACE("Destination surface %p is offscreen.\n", dst_surface); buffer = GL_COLOR_ATTACHMENT0; } - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL, dst_location); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, + &dst_texture->resource, surface_get_sub_resource_idx(dst_surface), NULL, 0, dst_location); context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9558fed3d3a..3ba80683276 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -774,22 +774,23 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ /* Context activation is done by the caller. */ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, - struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) + struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, + struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) { struct wined3d_rendertarget_info ds_info = {{0}}; memset(context->blit_targets, 0, sizeof(context->blit_targets)); - if (render_target) + if (rt) { - context->blit_targets[0].resource = &render_target->container->resource; - context->blit_targets[0].sub_resource_idx = surface_get_sub_resource_idx(render_target); + context->blit_targets[0].resource = rt; + context->blit_targets[0].sub_resource_idx = rt_sub_resource_idx; context->blit_targets[0].layer_count = 1; } - if (depth_stencil) + if (ds) { - ds_info.resource = &depth_stencil->container->resource; - ds_info.sub_resource_idx = surface_get_sub_resource_idx(depth_stencil); + ds_info.resource = ds; + ds_info.sub_resource_idx = ds_sub_resource_idx; ds_info.layer_count = 1; } @@ -2954,7 +2955,6 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *conte void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) { struct wined3d_texture *rt = context->current_rt.texture; - struct wined3d_surface *surface; DWORD rt_mask, *cur_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -2963,8 +2963,8 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine { wined3d_texture_load(rt, context, FALSE); - surface = rt->sub_resources[context->current_rt.sub_resource_idx].u.surface; - context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, surface, NULL, rt->resource.draw_binding); + context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, &rt->resource, + context->current_rt.sub_resource_idx, NULL, 0, rt->resource.draw_binding); if (rt->resource.format->id != WINED3DFMT_NULL) rt_mask = 1; else diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b830447578b..58f39d047af 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -316,12 +316,12 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, gl_info = context->gl_info; - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, - src_texture->sub_resources[src_sub_resource_idx].u.surface, src_location); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, 0, + &src_texture->resource, src_sub_resource_idx, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, - dst_texture->sub_resources[dst_sub_resource_idx].u.surface, dst_location); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, 0, + &dst_texture->resource, dst_sub_resource_idx, dst_location); context_set_draw_buffer(context, GL_NONE); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -464,7 +464,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 } context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, - src_texture->sub_resources[src_sub_resource_idx].u.surface, NULL, src_location); + &src_texture->resource, src_sub_resource_idx, NULL, 0, src_location); gl_info->gl_ops.gl.p_glReadBuffer(buffer); checkGLcall("glReadBuffer()"); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); @@ -484,7 +484,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 } context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, - dst_texture->sub_resources[dst_sub_resource_idx].u.surface, NULL, dst_location); + &dst_texture->resource, dst_sub_resource_idx, NULL, 0, dst_location); context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -1376,7 +1376,7 @@ static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, uns if (src_location != texture->resource.draw_binding) { context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, - texture->sub_resources[sub_resource_idx].u.surface, NULL, src_location); + &texture->resource, sub_resource_idx, NULL, 0, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } @@ -2807,7 +2807,8 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit TRACE("Destination surface %p is offscreen.\n", dst_surface); buffer = GL_COLOR_ATTACHMENT0; } - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL, dst_location); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, + dst_resource, surface_get_sub_resource_idx(dst_surface), NULL, 0, dst_location); context_set_draw_buffer(context, buffer); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76a809cf40a..4e2d18a998b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2135,7 +2135,8 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; 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; + struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, + struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 4/7] wined3d: Pass the depth/stencil view as wined3d_rendertarget_info structure to context_apply_fbo_state().
by Henri Verbeet March 12, 2018

March 12, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 58 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6c635f5b0d2..9558fed3d3a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -743,8 +743,8 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ /* Context activation is done by the caller. */ static void context_apply_fbo_state(struct wined3d_context *context, GLenum target, - struct wined3d_rendertarget_info *render_targets, struct wined3d_surface *depth_stencil, - DWORD color_location, DWORD ds_location) + const struct wined3d_rendertarget_info *render_targets, + const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { struct fbo_entry *entry, *entry2; @@ -766,16 +766,8 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ } else { - struct wined3d_rendertarget_info ds = {{0}}; - - if (depth_stencil) - { - ds.resource = &depth_stencil->container->resource; - ds.sub_resource_idx = surface_get_sub_resource_idx(depth_stencil); - ds.layer_count = 1; - } context->current_fbo = context_find_fbo_entry(context, target, - render_targets, &ds, color_location, ds_location); + render_targets, depth_stencil, color_location, ds_location); context_apply_fbo_entry(context, target, context->current_fbo); } } @@ -784,6 +776,8 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) { + struct wined3d_rendertarget_info ds_info = {{0}}; + memset(context->blit_targets, 0, sizeof(context->blit_targets)); if (render_target) { @@ -791,7 +785,15 @@ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target context->blit_targets[0].sub_resource_idx = surface_get_sub_resource_idx(render_target); context->blit_targets[0].layer_count = 1; } - context_apply_fbo_state(context, target, context->blit_targets, depth_stencil, location, location); + + if (depth_stencil) + { + ds_info.resource = &depth_stencil->container->resource; + ds_info.sub_resource_idx = surface_get_sub_resource_idx(depth_stencil); + ds_info.layer_count = 1; + } + + context_apply_fbo_state(context, target, context->blit_targets, &ds_info, location, location); } /* Context activation is done by the caller. */ @@ -3035,6 +3037,8 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + struct wined3d_rendertarget_info ds_info = {{0}}; + context_validate_onscreen_formats(context, dsv); if (!rt_count || wined3d_resource_is_offscreen(rts[0]->resource)) @@ -3052,14 +3056,22 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win if (rts[i] && rts[i]->format->id != WINED3DFMT_NULL) rt_mask |= (1u << i); } - context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, - wined3d_rendertarget_view_get_surface(dsv), + + if (dsv) + { + ds_info.gl_view = dsv->gl_view; + ds_info.resource = dsv->resource; + ds_info.sub_resource_idx = dsv->sub_resource_idx; + ds_info.layer_count = dsv->layer_count; + } + + context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, &ds_info, rt_count ? rts[0]->resource->draw_binding : 0, dsv ? dsv->resource->draw_binding : 0); } else { - context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, + context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, &ds_info, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); rt_mask = context_generate_rt_mask_from_resource(rts[0]->resource); } @@ -3164,9 +3176,11 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + struct wined3d_rendertarget_info ds_info = {{0}}; + if (!context->render_offscreen) { - context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, + context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, &ds_info, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); } else @@ -3187,8 +3201,16 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat 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), + + if (fb->depth_stencil) + { + ds_info.gl_view = fb->depth_stencil->gl_view; + ds_info.resource = fb->depth_stencil->resource; + ds_info.sub_resource_idx = fb->depth_stencil->sub_resource_idx; + ds_info.layer_count = fb->depth_stencil->layer_count; + } + + context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, &ds_info, color_location, fb->depth_stencil ? fb->depth_stencil->resource->draw_binding : 0); } } -- 2.11.0

1 0

[PATCH 3/7] wined3d: Pass a texture and sub-resource index to context_restore().
by Henri Verbeet March 12, 2018

March 12, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 +++----- dlls/wined3d/surface.c | 20 +++++++++++--------- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 60bf52ba129..6c635f5b0d2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1585,14 +1585,12 @@ void context_release(struct wined3d_context *context) /* This is used when a context for render target A is active, but a separate context is * needed to access the WGL framebuffer for render target B. Re-acquire a context for rt * A to avoid breaking caller code. */ -void context_restore(struct wined3d_context *context, struct wined3d_surface *restore) +void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) { - if (context->current_rt.texture != restore->container - || context->current_rt.sub_resource_idx != surface_get_sub_resource_idx(restore)) + if (context->current_rt.texture != texture || context->current_rt.sub_resource_idx != sub_resource_idx) { context_release(context); - context = context_acquire(restore->container->resource.device, - restore->container, surface_get_sub_resource_idx(restore)); + context = context_acquire(texture->resource.device, texture, sub_resource_idx); } context_release(context); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e98541c429f..b830447578b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -507,7 +507,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 gl_info->gl_ops.gl.p_glFlush(); if (restore_texture) - context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); + context_restore(context, restore_texture, restore_idx); } static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl_info *gl_info, @@ -1471,7 +1471,7 @@ error: } if (restore_texture) - context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); + context_restore(context, restore_texture, restore_idx); } /* Read the framebuffer contents into a texture. Note that this function @@ -1518,7 +1518,7 @@ void texture2d_load_fb_texture(struct wined3d_texture *texture, checkGLcall("glCopyTexSubImage2D"); if (restore_texture) - context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); + context_restore(context, restore_texture, restore_idx); } /* Does a direct frame buffer -> texture copy. Stretching is done with single @@ -2106,9 +2106,10 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context) { - struct wined3d_surface *restore_rt = NULL; + struct wined3d_texture *restore_texture; struct wined3d_surface *surface; struct wined3d_device *device; + unsigned int restore_idx; unsigned int level; RECT r; @@ -2129,11 +2130,12 @@ BOOL texture2d_load_drawable(struct wined3d_texture *texture, device = texture->resource.device; surface = texture->sub_resources[sub_resource_idx].u.surface; - restore_rt = context_get_rt_surface(context); - if (restore_rt != surface) + restore_texture = context->current_rt.texture; + restore_idx = context->current_rt.sub_resource_idx; + if (restore_texture != texture || restore_idx != sub_resource_idx) context = context_acquire(device, texture, sub_resource_idx); else - restore_rt = NULL; + restore_texture = NULL; level = sub_resource_idx % texture->level_count; SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), @@ -2144,8 +2146,8 @@ BOOL texture2d_load_drawable(struct wined3d_texture *texture, surface, WINED3D_LOCATION_DRAWABLE, &r, NULL, WINED3D_TEXF_POINT); - if (restore_rt) - context_restore(context, restore_rt); + if (restore_texture) + context_restore(context, restore_texture, restore_idx); return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3d669aba08..76a809cf40a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2170,7 +2170,8 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device, void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, enum wined3d_resource_type type) DECLSPEC_HIDDEN; -void context_restore(struct wined3d_context *context, struct wined3d_surface *restore) DECLSPEC_HIDDEN; +void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, + unsigned int sub_resource_idx) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/7] wined3d: Recognise AMD RC410 and RV380.
by Henri Verbeet March 12, 2018

March 12, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8bda9c4d6d2..8a5289b62ab 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2210,9 +2210,7 @@ cards_intel[] = {"830M", CARD_INTEL_830M}, }, /* 20101109 - These are never returned by current Gallium radeon - * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. - * - * These are returned but not handled: RC410, RV380. */ + * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. */ cards_amd_mesa[] = { /* Polaris 10/11 */ @@ -2290,10 +2288,12 @@ cards_amd_mesa[] = {"RS482", CARD_AMD_RADEON_XPRESS_200M}, {"RS480", CARD_AMD_RADEON_XPRESS_200M}, {"RS400", CARD_AMD_RADEON_XPRESS_200M}, + {"RC410", CARD_AMD_RADEON_XPRESS_200M}, /* R300 */ {"R360", CARD_AMD_RADEON_9500}, {"R350", CARD_AMD_RADEON_9500}, {"R300", CARD_AMD_RADEON_9500}, + {"RV380", CARD_AMD_RADEON_9500}, {"RV370", CARD_AMD_RADEON_9500}, {"RV360", CARD_AMD_RADEON_9500}, {"RV351", CARD_AMD_RADEON_9500}, -- 2.11.0

1 0

[PATCH 1/7] wined3d: Restore the correct sub resource in texture2d_load_fb_texture().
by Henri Verbeet March 12, 2018

March 12, 2018

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fa25b037481..e98541c429f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1518,7 +1518,7 @@ void texture2d_load_fb_texture(struct wined3d_texture *texture, checkGLcall("glCopyTexSubImage2D"); if (restore_texture) - context_restore(context, restore_texture->sub_resources[sub_resource_idx].u.surface); + context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); } /* Does a direct frame buffer -> texture copy. Stretching is done with single -- 2.11.0

1 0

explorer.exe
by Abhishek Kumar March 12, 2018

March 12, 2018

Is copy paste operation working on desktop or not? What is function of paste as link,New link? Please guide me implementing those.

1 0

explorer.exe
by Abhishek Kumar March 11, 2018

March 11, 2018

Hi > > when i click on properties in background menu, nothing happens .Any idea > to implement this. > Output in terminal > > *BackgroundMenu_InvokeCommand launch item properties dialog* > . > Please reply soon as possible. > Abhishek >

1 0

[PATCH] ntdll: Match NtAllocateUuids signature to Windows 2000 instead of NT4
by Alex Henrie March 11, 2018

March 11, 2018

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=35910 Patch from Wine Staging with minor modifications. The switch from 3 arguments to 4 is publicly documented at http://ultradefrag.sourceforge.net/doc/man/Windows%20NT(2000)%20Native%20AP… If we can only support one version of the function, it makes a lot more sense to support the 2000+ version instead of the NT4 version. dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/om.c | 9 +++------ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 60711f8b46..81a8c95ce1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -111,7 +111,7 @@ @ stdcall NtAlertThread(long) @ stdcall NtAllocateLocallyUniqueId(ptr) # @ stub NtAllocateUserPhysicalPages -@ stdcall NtAllocateUuids(ptr ptr ptr) +@ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) @ stdcall NtAreMappedFilesTheSame(ptr ptr) @ stdcall NtAssignProcessToJobObject(long long) @@ -1042,7 +1042,7 @@ @ stdcall -private ZwAlertThread(long) NtAlertThread @ stdcall -private ZwAllocateLocallyUniqueId(ptr) NtAllocateLocallyUniqueId # @ stub ZwAllocateUserPhysicalPages -@ stdcall -private ZwAllocateUuids(ptr ptr ptr) NtAllocateUuids +@ stdcall -private ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @ stdcall -private ZwAllocateVirtualMemory(long ptr long ptr long long) NtAllocateVirtualMemory @ stdcall -private ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame @ stdcall -private ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 1279f2bb4c..febe5bd81d 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -688,13 +688,10 @@ NTSTATUS WINAPI NtQuerySymbolicLinkObject( HANDLE handle, PUNICODE_STRING target /****************************************************************************** * NtAllocateUuids [NTDLL.@] */ -NTSTATUS WINAPI NtAllocateUuids( - PULARGE_INTEGER Time, - PULONG Range, - PULONG Sequence) +NTSTATUS WINAPI NtAllocateUuids( ULARGE_INTEGER *time, ULONG *delta, ULONG *sequence, UCHAR *seed ) { - FIXME("(%p,%p,%p), stub.\n", Time, Range, Sequence); - return 0; + FIXME("(%p,%p,%p,%p), stub.\n", time, delta, sequence, seed); + return STATUS_SUCCESS; } /************************************************************************** diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ebf1705729..947d7156e5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -740,7 +740,7 @@ @ stdcall NtAddAtom(ptr long ptr) @ stdcall NtAdjustPrivilegesToken(long long ptr long ptr ptr) @ stdcall NtAllocateLocallyUniqueId(ptr) -@ stdcall NtAllocateUuids(ptr ptr ptr) +@ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) @ stub NtBuildNumber @ stdcall NtClose(long) diff --git a/include/winternl.h b/include/winternl.h index 1ffdfe90b1..7a301a19c2 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2281,7 +2281,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEG NTSYSAPI NTSTATUS WINAPI NtAlertResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); -NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG,SIZE_T*,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID); NTSYSAPI NTSTATUS WINAPI NtAssignProcessToJobObject(HANDLE,HANDLE); -- 2.16.2

1 0

[PATCH] kernel32/tests: Fix permission check.
by Zebediah Figura March 11, 2018

March 11, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/profile.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 64ffc17..c5c7702 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -956,6 +956,7 @@ static void test_WritePrivateProfileString(void) LPCSTR data; CHAR path[MAX_PATH]; CHAR temp[MAX_PATH]; + HANDLE file; SetLastError(0xdeadbeef); ret = WritePrivateProfileStringW(NULL, NULL, NULL, NULL); @@ -1069,12 +1070,14 @@ static void test_WritePrivateProfileString(void) "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); /* Relative paths are relative to X:\\%WINDIR% */ - GetWindowsDirectoryA(temp, MAX_PATH); - GetTempFileNameA(temp, "win", 1, path); - if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) + GetWindowsDirectoryA(path, MAX_PATH); + strcat(path, "\\win1.tmp"); + file = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) skip("Not allowed to create a file in the Windows directory\n"); else { + CloseHandle(file); DeleteFileA(path); data = "[App]\r\n" -- 2.7.4

1 0

[Patch 6/6] include: Add RtlCreateRegistryKey to wdm.h
by Stefan Leichter March 11, 2018

March 11, 2018

Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- include/ddk/wdm.h | 2 ++ 1 file changed, 2 insertions(+)

1 0