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

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_load_renderbuffer().
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 42a9563e43453f497846f2952c06dea80f86e1e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a9563e43453f497846f295… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 11:14:40 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_load_renderbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 15 ++++++++------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1824a98..4bcd94a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2324,17 +2324,18 @@ BOOL surface_load_texture(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -BOOL surface_load_renderbuffer(struct wined3d_surface *surface, +BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) { - struct wined3d_texture *texture = surface->container; - unsigned int level = surface_get_sub_resource_idx(surface) % texture->level_count; + unsigned int level = sub_resource_idx % texture->level_count; const RECT rect = {0, 0, wined3d_texture_get_level_width(texture, level), wined3d_texture_get_level_height(texture, level)}; - DWORD locations = surface_get_sub_resource(surface)->locations; - DWORD src_location; + struct wined3d_texture_sub_resource *sub_resource; + DWORD src_location, locations; + sub_resource = &texture->sub_resources[sub_resource_idx]; + locations = sub_resource->locations; if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", @@ -2351,8 +2352,8 @@ BOOL surface_load_renderbuffer(struct wined3d_surface *surface, else /* surface_blt_fbo will load the source location if necessary. */ src_location = WINED3D_LOCATION_TEXTURE_RGB; - surface_blt_fbo(texture->resource.device, context, WINED3D_TEXF_POINT, - surface, src_location, &rect, surface, dst_location, &rect); + surface_blt_fbo(texture->resource.device, context, WINED3D_TEXF_POINT, sub_resource->u.surface, + src_location, &rect, sub_resource->u.surface, dst_location, &rect); return TRUE; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9add4a3..eb04a46 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1810,7 +1810,7 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: - return surface_load_renderbuffer(surface, context, location); + return texture2d_load_renderbuffer(texture, sub_resource_idx, context, location); case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d2addfb..5003cc5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3236,6 +3236,8 @@ static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wi BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context) DECLSPEC_HIDDEN; +BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; @@ -3344,8 +3346,6 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; -BOOL surface_load_renderbuffer(struct wined3d_surface *surface, - struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx,

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_load_texture().
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 92008ec4cfe362e60b1991022af9e198b030e227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92008ec4cfe362e60b199102… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 11:14:41 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- dlls/wined3d/texture.c | 5 +---- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4bcd94a..f2a4a72 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2153,13 +2153,11 @@ BOOL texture2d_load_drawable(struct wined3d_texture *texture, return TRUE; } -BOOL surface_load_texture(struct wined3d_surface *surface, +BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, BOOL srgb) { unsigned int width, height, level, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_texture *texture = surface->container; struct wined3d_device *device = texture->resource.device; const struct wined3d_color_key_conversion *conversion; struct wined3d_texture_sub_resource *sub_resource; @@ -2171,13 +2169,13 @@ BOOL surface_load_texture(struct wined3d_surface *surface, BOOL depth; depth = texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL; - sub_resource = surface_get_sub_resource(surface); + sub_resource = &texture->sub_resources[sub_resource_idx]; if (!depth && wined3d_settings.offscreen_rendering_mode != ORM_FBO && wined3d_resource_is_offscreen(&texture->resource) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { - surface_load_fb_texture(surface, srgb, context); + surface_load_fb_texture(sub_resource->u.surface, srgb, context); return TRUE; } @@ -2194,11 +2192,13 @@ BOOL surface_load_texture(struct wined3d_surface *surface, &texture->resource, WINED3D_LOCATION_TEXTURE_SRGB)) { if (srgb) - surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, - &src_rect, surface, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect); + surface_blt_fbo(device, context, WINED3D_TEXF_POINT, + sub_resource->u.surface, WINED3D_LOCATION_TEXTURE_RGB, &src_rect, + sub_resource->u.surface, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect); else - surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_SRGB, - &src_rect, surface, WINED3D_LOCATION_TEXTURE_RGB, &src_rect); + surface_blt_fbo(device, context, WINED3D_TEXF_POINT, + sub_resource->u.surface, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect, + sub_resource->u.surface, WINED3D_LOCATION_TEXTURE_RGB, &src_rect); return TRUE; } @@ -2212,8 +2212,8 @@ BOOL surface_load_texture(struct wined3d_surface *surface, if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, &texture->resource, src_location, &texture->resource, dst_location)) - surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, - &src_rect, surface, dst_location, &src_rect); + surface_blt_fbo(device, context, WINED3D_TEXF_POINT, sub_resource->u.surface, + src_location, &src_rect, sub_resource->u.surface, dst_location, &src_rect); return TRUE; } @@ -2225,7 +2225,7 @@ BOOL surface_load_texture(struct wined3d_surface *surface, if ((sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | texture->resource.map_binding)) == WINED3D_LOCATION_TEXTURE_RGB) { - FIXME_(d3d_perf)("Downloading RGB surface %p to reload it as sRGB.\n", surface); + FIXME_(d3d_perf)("Downloading RGB texture %p, %u to reload it as sRGB.\n", texture, sub_resource_idx); wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); } } @@ -2234,7 +2234,7 @@ BOOL surface_load_texture(struct wined3d_surface *surface, if ((sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | texture->resource.map_binding)) == WINED3D_LOCATION_TEXTURE_SRGB) { - FIXME_(d3d_perf)("Downloading sRGB surface %p to reload it as RGB.\n", surface); + FIXME_(d3d_perf)("Downloading sRGB texture %p, %u to reload it as RGB.\n", texture, sub_resource_idx); wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); } } @@ -2259,7 +2259,7 @@ BOOL surface_load_texture(struct wined3d_surface *surface, * getting called. */ if ((format.conv_byte_count || conversion) && texture->sub_resources[sub_resource_idx].buffer_object) { - TRACE("Removing the pbo attached to surface %p.\n", surface); + TRACE("Removing the pbo attached to texture %p, %u.\n", texture, sub_resource_idx); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM); wined3d_texture_set_map_binding(texture, WINED3D_LOCATION_SYSMEM); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eb04a46..0abf5ad 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1792,12 +1792,9 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { - struct wined3d_surface *surface; - TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", texture, sub_resource_idx, context, wined3d_debug_location(location)); - surface = texture->sub_resources[sub_resource_idx].u.surface; switch (location) { case WINED3D_LOCATION_USER_MEMORY: @@ -1814,7 +1811,7 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: - return surface_load_texture(surface, context, + return texture2d_load_texture(texture, sub_resource_idx, context, location == WINED3D_LOCATION_TEXTURE_SRGB); default: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5003cc5..2b56543 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3240,6 +3240,8 @@ BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int s struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; +BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; @@ -3346,8 +3348,6 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; -BOOL surface_load_texture(struct wined3d_surface *surface, - struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb,

1 0

Henri Verbeet : wined3d: Pass boxes instead of rectangles to wined3d_surface_blt().
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 433ac881ddca0e9b02975efa7d599d369e2866cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=433ac881ddca0e9b02975efa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 11:14:42 2018 +0330 wined3d: Pass boxes instead of rectangles to wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++----- dlls/wined3d/surface.c | 36 +++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9f3ff46..6e0ecd1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2050,17 +2050,14 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * { struct wined3d_surface *dst_surface, *src_surface; struct wined3d_texture *dst_texture, *src_texture; - RECT dst_rect, src_rect; dst_texture = texture_from_resource(op->dst_resource); src_texture = texture_from_resource(op->src_resource); dst_surface = dst_texture->sub_resources[op->dst_sub_resource_idx].u.surface; src_surface = src_texture->sub_resources[op->src_sub_resource_idx].u.surface; - SetRect(&dst_rect, op->dst_box.left, op->dst_box.top, op->dst_box.right, op->dst_box.bottom); - SetRect(&src_rect, op->src_box.left, op->src_box.top, op->src_box.right, op->src_box.bottom); - if (FAILED(wined3d_surface_blt(dst_surface, &dst_rect, src_surface, - &src_rect, op->flags, &op->fx, op->filter))) + if (FAILED(wined3d_surface_blt(dst_surface, &op->dst_box, src_surface, + &op->src_box, op->flags, &op->fx, op->filter))) FIXME("Blit failed.\n"); } else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_3D) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f2a4a72..23b7fa3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3696,12 +3696,10 @@ struct wined3d_blitter *wined3d_cpu_blitter_create(void) return blitter; } -HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, +HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wined3d_box *dst_box, + struct wined3d_surface *src_surface, const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { - struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1}; - struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1}; unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); struct wined3d_texture_sub_resource *src_sub_resource, *dst_sub_resource; @@ -3715,14 +3713,15 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst struct wined3d_context *context; enum wined3d_blit_op blit_op; BOOL scale, convert, resolve; + RECT src_rect, dst_rect; static const DWORD simple_blit = WINED3D_BLT_SRC_CKEY | WINED3D_BLT_SRC_CKEY_OVERRIDE | WINED3D_BLT_ALPHA_TEST | WINED3D_BLT_RAW; - TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", - dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), + TRACE("dst_surface %p, dst_box %s, src_surface %p, src_box %s, flags %#x, fx %p, filter %s.\n", + dst_surface, debug_box(dst_box), src_surface, debug_box(src_box), flags, fx, debug_d3dtexturefiltertype(filter)); TRACE("Usage is %s.\n", debug_d3dusage(dst_texture->resource.usage)); @@ -3737,6 +3736,9 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst fx->src_color_key.color_space_high_value); } + SetRect(&src_rect, src_box->left, src_box->top, src_box->right, src_box->bottom); + SetRect(&dst_rect, dst_box->left, dst_box->top, dst_box->right, dst_box->bottom); + if (!fx || !(fx->fx)) flags &= ~WINED3D_BLT_FX; @@ -3777,8 +3779,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst goto fallback; } - scale = src_rect->right - src_rect->left != dst_rect->right - dst_rect->left - || src_rect->bottom - src_rect->top != dst_rect->bottom - dst_rect->top; + scale = src_box->right - src_box->left != dst_box->right - dst_box->left + || src_box->bottom - src_box->top != dst_box->bottom - dst_box->top; convert = src_texture->resource.format->id != dst_texture->resource.format->id; resolve = src_texture->resource.multisample_type != dst_texture->resource.multisample_type; @@ -3799,8 +3801,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_DEPTH_BLIT, context, - src_surface, src_texture->resource.draw_binding, src_rect, - dst_surface, dst_location, dst_rect, NULL, filter); + src_surface, src_texture->resource.draw_binding, &src_rect, + dst_surface, dst_location, &dst_rect, NULL, filter); context_release(context); wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, valid_locations); @@ -3854,9 +3856,9 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst TRACE("Not doing upload because the destination format needs conversion.\n"); else { - POINT dst_point = {dst_rect->left, dst_rect->top}; + POINT dst_point = {dst_box->left, dst_box->top}; - if (SUCCEEDED(surface_upload_from_surface(dst_surface, &dst_point, src_surface, src_rect))) + if (SUCCEEDED(surface_upload_from_surface(dst_surface, &dst_point, src_surface, &src_rect))) { if (!wined3d_resource_is_offscreen(&dst_texture->resource)) { @@ -3903,8 +3905,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context, - src_surface, src_texture->resource.draw_binding, src_rect, - dst_surface, dst_location, dst_rect, colour_key, filter); + src_surface, src_texture->resource.draw_binding, &src_rect, + dst_surface, dst_location, &dst_rect, colour_key, filter); context_release(context); wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, valid_locations); @@ -3914,10 +3916,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst fallback: /* Special cases for render targets. */ - if (SUCCEEDED(surface_blt_special(dst_surface, dst_rect, src_surface, src_rect, flags, fx, filter))) + if (SUCCEEDED(surface_blt_special(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter))) return WINED3D_OK; cpu: - return surface_cpu_blt(dst_texture, dst_sub_resource_idx, &dst_box, - src_texture, src_sub_resource_idx, &src_box, flags, fx, filter); + return surface_cpu_blt(dst_texture, dst_sub_resource_idx, dst_box, + src_texture, src_sub_resource_idx, src_box, flags, fx, filter); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b56543..853f9e2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3343,8 +3343,8 @@ static inline struct wined3d_texture_sub_resource *surface_get_sub_resource(stru return &surface->container->sub_resources[surface_get_sub_resource_idx(surface)]; } -HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, +HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wined3d_box *dst_box, + struct wined3d_surface *src_surface, const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_depth_blt_fbo().
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 243e2ddfde7a9a7d9e3577f42b96ed5244abac41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=243e2ddfde7a9a7d9e3577f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 11:14:43 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_depth_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 23b7fa3..3bf72e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -259,24 +259,20 @@ static BOOL texture2d_is_full_rect(const struct wined3d_texture *texture, unsign return TRUE; } -static void surface_depth_blt_fbo(const struct wined3d_device *device, - struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, - struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) +static void texture2d_depth_blt_fbo(const struct wined3d_device *device, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, + const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + DWORD dst_location, const RECT *dst_rect) { - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); - struct wined3d_texture *dst_texture = dst_surface->container; - struct wined3d_texture *src_texture = src_surface->container; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; DWORD src_mask, dst_mask; GLbitfield gl_mask; - TRACE("device %p\n", device); - TRACE("src_surface %p, src_location %s, src_rect %s,\n", - src_surface, wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect)); - TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n", - dst_surface, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); + TRACE("device %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s.\n", device, + src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), wine_dbgstr_rect(src_rect), + dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect)); src_mask = src_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); dst_mask = dst_texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -320,10 +316,12 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, gl_info = context->gl_info; - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, src_location); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, + src_texture->sub_resources[src_sub_resource_idx].u.surface, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, dst_location); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, + dst_texture->sub_resources[dst_sub_resource_idx].u.surface, dst_location); context_set_draw_buffer(context, GL_NONE); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -2418,7 +2416,9 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (blit_op == WINED3D_BLIT_OP_DEPTH_BLIT) { TRACE("Depth/stencil blit.\n"); - surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect); + texture2d_depth_blt_fbo(device, src_surface->container, surface_get_sub_resource_idx(src_surface), + src_location, src_rect, dst_surface->container, surface_get_sub_resource_idx(dst_surface), + dst_location, dst_rect); return dst_location; }

1 0

Andrey Gusev : ninput: Add stub dll.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 6b984a40c4ff0923793105b64cda96aeb2acdd3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b984a40c4ff0923793105b6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Mar 6 18:55:06 2018 +0200 ninput: Add stub dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ninput/Makefile.in | 4 ++++ dlls/ninput/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/ninput/ninput.spec | 24 ++++++++++++++++++++++++ 5 files changed, 72 insertions(+) diff --git a/configure b/configure index b4cfc38..c1516af 100755 --- a/configure +++ b/configure @@ -1403,6 +1403,7 @@ enable_netapi32 enable_netcfgx enable_netprofm enable_newdev +enable_ninput enable_normaliz enable_npmshtml enable_npptools @@ -18818,6 +18819,7 @@ wine_fn_config_makefile dlls/netcfgx/tests enable_tests wine_fn_config_makefile dlls/netprofm enable_netprofm wine_fn_config_makefile dlls/netprofm/tests enable_tests wine_fn_config_makefile dlls/newdev enable_newdev +wine_fn_config_makefile dlls/ninput enable_ninput wine_fn_config_makefile dlls/normaliz enable_normaliz wine_fn_config_makefile dlls/npmshtml enable_npmshtml wine_fn_config_makefile dlls/npptools enable_npptools diff --git a/configure.ac b/configure.ac index 702267e..b6b66fa 100644 --- a/configure.ac +++ b/configure.ac @@ -3470,6 +3470,7 @@ WINE_CONFIG_MAKEFILE(dlls/netcfgx/tests) WINE_CONFIG_MAKEFILE(dlls/netprofm) WINE_CONFIG_MAKEFILE(dlls/netprofm/tests) WINE_CONFIG_MAKEFILE(dlls/newdev) +WINE_CONFIG_MAKEFILE(dlls/ninput) WINE_CONFIG_MAKEFILE(dlls/normaliz) WINE_CONFIG_MAKEFILE(dlls/npmshtml) WINE_CONFIG_MAKEFILE(dlls/npptools) diff --git a/dlls/ninput/Makefile.in b/dlls/ninput/Makefile.in new file mode 100644 index 0000000..3d3cc7f --- /dev/null +++ b/dlls/ninput/Makefile.in @@ -0,0 +1,4 @@ +MODULE = ninput.dll + +C_SRCS = \ + main.c diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c new file mode 100644 index 0000000..0f23128 --- /dev/null +++ b/dlls/ninput/main.c @@ -0,0 +1,41 @@ +/* + * Copyright 2018 Andrey Gusev + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ninput); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} diff --git a/dlls/ninput/ninput.spec b/dlls/ninput/ninput.spec new file mode 100644 index 0000000..372beb2 --- /dev/null +++ b/dlls/ninput/ninput.spec @@ -0,0 +1,24 @@ +@ stub DefaultInputHandler +@ stub AddPointerInteractionContext +@ stub BufferPointerPacketsInteractionContext +@ stub CreateInteractionContext +@ stub DestroyInteractionContext +@ stub GetCrossSlideParameterInteractionContext +@ stub GetInertiaParameterInteractionContext +@ stub GetInteractionConfigurationInteractionContext +@ stub GetMouseWheelParameterInteractionContext +@ stub GetPropertyInteractionContext +@ stub GetStateInteractionContext +@ stub ProcessBufferedPacketsInteractionContext +@ stub ProcessInertiaInteractionContext +@ stub ProcessPointerFramesInteractionContext +@ stub RegisterOutputCallbackInteractionContext +@ stub RemovePointerInteractionContext +@ stub ResetInteractionContext +@ stub SetCrossSlideParametersInteractionContext +@ stub SetInertiaParameterInteractionContext +@ stub SetInteractionConfigurationInteractionContext +@ stub SetMouseWheelParameterInteractionContext +@ stub SetPivotInteractionContext +@ stub SetPropertyInteractionContext +@ stub StopInteractionContext

1 0

Francois Gouget : testbot/web: Simplify JobDetailsPage::GeneratePage().
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: tools Branch: master Commit: a18eff576ab47fb50cc5ac43af79323f760e5a94 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a18eff576ab47fb50cc5ac4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 7 13:31:33 2018 +0100 testbot/web: Simplify JobDetailsPage::GeneratePage(). The JobDetailsPage collection contains StepTasks, not Jobs! But there is no need to inspect the Status of each of the Job's Tasks to know whether it's worth reloading the page: they are all summarized in the Job Status. So just check if the Job is still running. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 923ef97..c8ecb4c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -219,13 +219,9 @@ sub GeneratePage($) { my ($self) = @_; - foreach my $Job (@{$self->{Collection}->GetItems()}) + if ($self->{Job}->Status =~ /^(queued|running)$/) { - if ($Job->Status eq "queued" || $Job->Status eq "running") - { - $self->{Request}->headers_out->add("Refresh", "30"); - last; - } + $self->{Request}->headers_out->add("Refresh", "30"); } $self->SUPER::GeneratePage();

1 0

Francois Gouget : testbot/JobDetails: Clarify what the $Item objects are.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: tools Branch: master Commit: e40afe84f0b2db718fe9e130552d4326014ba68c URL: https://source.winehq.org/git/tools.git/?a=commit;h=e40afe84f0b2db718fe9e13… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 7 13:31:49 2018 +0100 testbot/JobDetails: Clarify what the $Item objects are. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c8ecb4c..10a0d7c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -237,11 +237,11 @@ sub GenerateBody($) my $Keys = $self->SortKeys(undef, $self->{Collection}->GetKeys()); foreach my $Key (@$Keys) { - my $Item = $self->{Collection}->GetItem($Key); - my $TaskDir = $Item->GetTaskDir(); - my $VM = $Item->VM; + my $StepTask = $self->{Collection}->GetItem($Key); + my $TaskDir = $StepTask->GetTaskDir(); + my $VM = $StepTask->VM; print "<h2><a name='k", $self->escapeHTML($Key), "'></a>" , - $self->escapeHTML($Item->GetTitle()), "</h2>\n"; + $self->escapeHTML($StepTask->GetTitle()), "</h2>\n"; print "<details><summary>", $self->CGI->escapeHTML($VM->Description || $VM->Name), "</summary>", @@ -254,8 +254,8 @@ sub GenerateBody($) my $ErrName = "$TaskDir/err"; print "<div class='TaskMoreInfoLinks'>\n"; # FIXME: Disable live screenshots for now - if (0 && $Item->Status eq "running" && - ($Item->Type eq "single" || $Item->Type eq "suite")) + if (0 && $StepTask->Status eq "running" && + ($StepTask->Type eq "single" || $StepTask->Type eq "suite")) { if (defined($self->GetParam($ScreenshotParamName))) { @@ -279,8 +279,8 @@ sub GenerateBody($) if (defined($self->GetParam($ScreenshotParamName))) { my $URI = "/Screenshot.pl?JobKey=" . uri_escape($self->{JobId}) . - "&StepKey=" . uri_escape($Item->StepNo) . - "&TaskKey=" . uri_escape($Item->TaskNo); + "&StepKey=" . uri_escape($StepTask->StepNo) . + "&TaskKey=" . uri_escape($StepTask->TaskNo); print "<div class='Screenshot'><img src='" . $self->CGI->escapeHTML($URI) . "' alt='Screenshot' /></div>\n"; } @@ -406,8 +406,8 @@ sub GenerateBody($) else { print $HasLogEntries ? "No " . - ($Item->Type eq "single" || - $Item->Type eq "suite" ? "test" : "build") . + ($StepTask->Type eq "single" || + $StepTask->Type eq "suite" ? "test" : "build") . " failures found" : "Empty log"; } } @@ -435,11 +435,11 @@ sub GenerateBody($) } close ERRFILE; } - elsif ($Item->Status eq "canceled") + elsif ($StepTask->Status eq "canceled") { print "<p>No log, task was canceled</p>\n"; } - elsif ($Item->Status eq "skipped") + elsif ($StepTask->Status eq "skipped") { print "<p>No log, task skipped</p>\n"; } @@ -453,36 +453,36 @@ sub GenerateBody($) sub GenerateDataCell($$$$$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "VM") { - print "<td><a href='#k", $self->escapeHTML($Item->GetKey()), "'>"; - print $self->escapeHTML($self->GetDisplayValue($CollectionBlock, $Item, + print "<td><a href='#k", $self->escapeHTML($StepTask->GetKey()), "'>"; + print $self->escapeHTML($self->GetDisplayValue($CollectionBlock, $StepTask, $PropertyDescriptor)); print "</a></td>\n"; } elsif ($PropertyName eq "FileName") { - my $FileName = $Item->GetStepDir() ."/". $Item->FileName; + my $FileName = $StepTask->GetStepDir() ."/". $StepTask->FileName; if (-r $FileName) { my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . - "&StepKey=" . uri_escape($Item->StepNo); + "&StepKey=" . uri_escape($StepTask->StepNo); print "<td><a href='" . $self->escapeHTML($URI) . "'>"; - print $self->escapeHTML($self->GetDisplayValue($CollectionBlock, $Item, + print $self->escapeHTML($self->GetDisplayValue($CollectionBlock, $StepTask, $PropertyDescriptor)); print "</a></td>\n"; } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); } } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); } }

1 0

Francois Gouget : testbot: Treat directories and files the same when using rmtree().
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: tools Branch: master Commit: 19586b07b6dbe9207faf680261e3c92713126b45 URL: https://source.winehq.org/git/tools.git/?a=commit;h=19586b07b6dbe9207faf680… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 7 13:32:12 2018 +0100 testbot: Treat directories and files the same when using rmtree(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index d8a9650..41f88d9 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -242,8 +242,7 @@ if (opendir(my $dh, "$DataDir/staging")) { if ($Age >= $JobPurgeDays + 7) { - if ((-d $FileName and !rmtree($FileName)) or - !unlink($FileName)) + if (!rmtree($FileName)) { LogMsg "Could not delete '$FileName': $!\n"; }

1 0

Julian Rüger : German translation for release 3.3
by Jeremy Newman 07 Mar '18

07 Mar '18

Module: website Branch: master Commit: 17da8645ede61afbdbad4961fcd90571de75263d URL: https://source.winehq.org/git/website.git/?a=commit;h=17da8645ede61afbdbad4… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Mar 7 15:49:55 2018 +0100 German translation for release 3.3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018030201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2018030201.xml b/news/de/2018030201.xml new file mode 100644 index 0000000..c3fb9b7 --- /dev/null +++ b/news/de/2018030201.xml @@ -0,0 +1,17 @@ +<news> +<date>2. März 2018</date> +<title>Wine 3.3 freigegeben</title> +<body> +<p> Die Entwicklungsversion 3.3 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/3.3">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Anfänge von Vulkan-Unterstützung.</li> + <li>Der Direct3D Multi-Threaded-Command-Stream ist nun standardmäßig aktiv.</li> + <li>Multisample-Texturen sind ebenfalls standardmäßig aktiv.</li> + <li>Unterstützung von Game-Controllern durch SDL.</li> + <li>Laden von reinen CIL .Net-Anwendungen wird unterstützt.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.3.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Austin English : ntoskrnl.exe: Add PsSetCreateProcessNotifyRoutineEx stub.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 9566c50a1eec40b84ecaa63821d526efd0d3fe32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9566c50a1eec40b84ecaa638… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 1 16:02:38 2018 -0600 ntoskrnl.exe: Add PsSetCreateProcessNotifyRoutineEx stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/ntddk.h | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4342902..10f69ba 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -68,6 +68,7 @@ typedef struct _KSERVICE_TABLE_DESCRIPTOR KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); +typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE_EX)(PEPROCESS,HANDLE,PPS_CREATE_NOTIFY_INFO); typedef void (WINAPI *PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', @@ -2389,6 +2390,16 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine( PCREATE_PROCESS_NOTIFY_ROUTINE /*********************************************************************** + * PsSetCreateProcessNotifyRoutineEx (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx( PCREATE_PROCESS_NOTIFY_ROUTINE_EX callback, BOOLEAN remove ) +{ + FIXME( "stub: %p %d\n", callback, remove ); + return STATUS_SUCCESS; +} + + +/*********************************************************************** * PsSetCreateThreadNotifyRoutine (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7f43704..ebf1705 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -912,6 +912,7 @@ @ stub PsRevertToSelf @ stub PsSetContextThread @ stdcall PsSetCreateProcessNotifyRoutine(ptr long) +@ stdcall PsSetCreateProcessNotifyRoutineEx(ptr long) @ stdcall PsSetCreateThreadNotifyRoutine(ptr) @ stub PsSetJobUIRestrictionsClass @ stub PsSetLegoNotifyRoutine diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 6aae257..5c124ca 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -186,6 +186,24 @@ typedef struct _RTL_AVL_TABLE { void *TableContext; } RTL_AVL_TABLE, *PRTL_AVL_TABLE; +typedef struct _PS_CREATE_NOTIFY_INFO { + SIZE_T Size; + union { + ULONG Flags; + struct { + ULONG FileOpenNameAvailable :1; + ULONG IsSubsystemProcess :1; + ULONG Reserved :30; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + HANDLE ParentProcessId; + CLIENT_ID CreatingThreadId; + struct _FILE_OBJECT *FileObject; + PCUNICODE_STRING ImageFileName; + PCUNICODE_STRING CommandLine; + NTSTATUS CreationStatus; +} PS_CREATE_NOTIFY_INFO, *PPS_CREATE_NOTIFY_INFO; + typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO);

1 0