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

[PATCH] winemac: Fix z-ordering between two child (owned) windows of the same parent (owner).
by Ken Thomases May 21, 2018

May 21, 2018

The window being ordered was first put in the correct place and then was moved to the other end of the children list by the loop that was intended to adjust the windows strictly between the window and the ancestor. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b94b774..e37e071 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1590,14 +1590,17 @@ - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)a [ancestor orderWindow:orderingMode relativeTo:[ancestorOfOther windowNumber]]; } - for (child = self; - (parent = (WineWindow*)child.parentWindow); - child = parent) + if (!ancestorOfOther || ancestor != self) { - if ([parent isKindOfClass:[WineWindow class]]) - [parent order:-orderingMode childWindow:child relativeTo:nil]; - if (parent == ancestor) - break; + for (child = self; + (parent = (WineWindow*)child.parentWindow); + child = parent) + { + if ([parent isKindOfClass:[WineWindow class]]) + [parent order:-orderingMode childWindow:child relativeTo:nil]; + if (parent == ancestor) + break; + } } [self checkWineDisplayLink]; -- 2.10.2

1 0

[PATCH 1/3] wined3d: Add unimplemented flags parameter to wined3d_device_copy_sub_resource_region.
by Pablo Martin May 21, 2018

May 21, 2018

Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> --- Prepares wined3d_device_copy_sub_resource_region so the flags parameter can be sent from CopySubresourceRegion1 in the next patch. After this series is done and I'm sure about the way we want to do this, I will prepare a similar one for adding flags to wined3d_device_update_sub_resource for UpdateSubresource1. Some remarks: - touches on d3d11, d3d9, ddraw modules, but I set 'wined3d:' in the subject since the patch is about one modification in wined3d that needs small adaptations in other places. Please let me know if this is not the best way. - I named the parameter in wined3d_device_update_sub_resource 'flags', but it might be better to call it 'copy_flags'. Tested on Ubuntu 17.10. dlls/d3d11/device.c | 4 ++-- dlls/d3d9/device.c | 2 +- dlls/ddraw/executebuffer.c | 2 +- dlls/wined3d/device.c | 9 ++++++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c930248e54..495ddc139f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1021,7 +1021,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); wined3d_mutex_lock(); wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, - dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL); + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL, 0); wined3d_mutex_unlock(); } @@ -4514,7 +4514,7 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); wined3d_mutex_lock(); wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, - dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL); + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL, 0); wined3d_mutex_unlock(); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e3562c7c57..2f3ad2880d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1536,7 +1536,7 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), - src->sub_resource_idx, &src_box); + src->sub_resource_idx, &src_box, 0); if (SUCCEEDED(hr) && dst->texture) d3d9_texture_flag_auto_gen_mipmap(dst->texture); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b20b9eda71..2ba29a7ed7 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -345,7 +345,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_buffer_get_resource(buffer->dst_vertex_buffer), 0, ci->wDest * sizeof(D3DTLVERTEX), 0, 0, - wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, &box); + wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, &box, 0); break; default: diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c853b43440..97f9049379 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4154,14 +4154,17 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, - unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags) { struct wined3d_box dst_box, b; TRACE("device %p, dst_resource %p, dst_sub_resource_idx %u, dst_x %u, dst_y %u, dst_z %u, " - "src_resource %p, src_sub_resource_idx %u, src_box %s.\n", + "src_resource %p, src_sub_resource_idx %u, src_box %s, flags %#x.\n", device, dst_resource, dst_sub_resource_idx, dst_x, dst_y, dst_z, - src_resource, src_sub_resource_idx, debug_box(src_box)); + src_resource, src_sub_resource_idx, debug_box(src_box), flags); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); if (src_resource == dst_resource && src_sub_resource_idx == dst_sub_resource_idx) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bf29e206b5..7a8cf20381 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -40,7 +40,7 @@ @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) @ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @ cdecl wined3d_device_copy_resource(ptr ptr ptr) -@ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr) +@ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) @ cdecl wined3d_device_copy_uav_counter(ptr ptr long ptr) @ cdecl wined3d_device_create(ptr long long ptr long long ptr ptr) @ cdecl wined3d_device_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 15e14e5c5f..3393014baf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2214,7 +2214,7 @@ void __cdecl wined3d_device_copy_resource(struct wined3d_device *device, HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *device, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, - unsigned int src_sub_resource_idx, const struct wined3d_box *src_box); + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags); void __cdecl wined3d_device_copy_uav_counter(struct wined3d_device *device, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, -- 2.14.1

3 6

[PATCH] wined3d: Implement wined3d_pause for MSVC.
by Thomas Faber May 21, 2018

May 21, 2018

Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> --- dlls/wined3d/wined3d_private.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e344a5f0f3..976ab6ffd3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -367,8 +367,12 @@ static inline unsigned int wined3d_popcount(unsigned int x) static inline void wined3d_pause(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if defined(__i386__) || defined(__x86_64__) +#if defined(__GNUC__) __asm__ __volatile__( "rep;nop" : : : "memory" ); +#elif defined(_MSC_VER) + _mm_pause(); +#endif #endif } -- 2.16.1.windows.2

2 3

[PATCH 2/2] wined3d: Only create the ARBfp blitter if creating the GLSL blitter failed.
by Henri Verbeet May 21, 2018

May 21, 2018

Since the GLSL blitter can do everything the ARBfp one can. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 11 +++++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c853b43440b..8257efdf0ef 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1042,8 +1042,8 @@ static void wined3d_device_create_primary_opengl_context_cs(void *object) return; } wined3d_ffp_blitter_create(&device->blitter, &device->adapter->gl_info); - wined3d_arbfp_blitter_create(&device->blitter, device); - wined3d_glsl_blitter_create(&device->blitter, device); + if (!wined3d_glsl_blitter_create(&device->blitter, device)) + wined3d_arbfp_blitter_create(&device->blitter, device); wined3d_fbo_blitter_create(&device->blitter, &device->adapter->gl_info); wined3d_raw_blitter_create(&device->blitter, &device->adapter->gl_info); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e4339064e28..0d0e25a4775 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13157,21 +13157,22 @@ static const struct wined3d_blitter_ops glsl_blitter_ops = glsl_blitter_blit, }; -void wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct wined3d_device *device) +struct wined3d_blitter *wined3d_glsl_blitter_create(struct wined3d_blitter **next, + const struct wined3d_device *device) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_glsl_blitter *blitter; if (device->shader_backend != &glsl_shader_backend) - return; + return NULL; if (!gl_info->supported[ARB_VERTEX_SHADER] || !gl_info->supported[ARB_FRAGMENT_SHADER]) - return; + return NULL; if (!(blitter = heap_alloc(sizeof(*blitter)))) { ERR("Failed to allocate blitter.\n"); - return; + return NULL; } TRACE("Created blitter %p.\n", blitter); @@ -13182,4 +13183,6 @@ void wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct win wine_rb_init(&blitter->programs, glsl_blitter_args_compare); blitter->palette_texture = 0; *next = &blitter->blitter; + + return *next; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 26979b3226e..f2c4cd669cf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2143,7 +2143,7 @@ void wined3d_fbo_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_ffp_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void wined3d_glsl_blitter_create(struct wined3d_blitter **next, +struct wined3d_blitter *wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_raw_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/2] wined3d: Implement YUV blits in the GLSL blitter.
by Henri Verbeet May 21, 2018

May 21, 2018

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 353 +++++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/utils.c | 9 +- 2 files changed, 333 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6f23cf8a403..e4339064e28 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12417,6 +12417,300 @@ static void glsl_blitter_generate_p8_shader(struct wined3d_string_buffer *buffer shader_addline(buffer, "}\n"); } +static void gen_packed_yuv_read(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const struct glsl_blitter_args *args, + const char *tex_type) +{ + enum complex_fixup complex_fixup = get_complex_fixup(args->fixup); + char chroma, luminance; + const char *tex; + + /* The YUY2 and UYVY formats contain two pixels packed into a 32 bit + * macropixel, giving effectively 16 bits per pixel. The color consists of + * a luminance(Y) and two chroma(U and V) values. Each macropixel has two + * luminance values, one for each single pixel it contains, and one U and + * one V value shared between both pixels. + * + * The data is loaded into an A8L8 texture. With YUY2, the luminance + * component contains the luminance and alpha the chroma. With UYVY it is + * vice versa. Thus take the format into account when generating the read + * swizzles + * + * Reading the Y value is straightforward - just sample the texture. The + * hardware takes care of filtering in the horizontal and vertical + * direction. + * + * Reading the U and V values is harder. We have to avoid filtering + * horizontally, because that would mix the U and V values of one pixel or + * two adjacent pixels. Thus floor the texture coordinate and add 0.5 to + * get an unfiltered read, regardless of the filtering setting. Vertical + * filtering works automatically though - the U and V values of two rows + * are mixed nicely. + * + * Apart of avoiding filtering issues, the code has to know which value it + * just read, and where it can find the other one. To determine this, it + * checks if it sampled an even or odd pixel, and shifts the 2nd read + * accordingly. + * + * Handling horizontal filtering of U and V values requires reading a 2nd + * pair of pixels, extracting U and V and mixing them. This is not + * implemented yet. + * + * An alternative implementation idea is to load the texture as A8R8G8B8 + * texture, with width / 2. This way one read gives all 3 values, finding + * U and V is easy in an unfiltered situation. Finding the luminance on + * the other hand requires finding out if it is an odd or even pixel. The + * real drawback of this approach is filtering. This would have to be + * emulated completely in the shader, reading up two 2 packed pixels in up + * to 2 rows and interpolating both horizontally and vertically. Beyond + * that it would require adjustments to the texture handling code to deal + * with the width scaling. */ + + if (complex_fixup == COMPLEX_FIXUP_UYVY) + { + chroma = 'x'; + luminance = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? 'w' : 'y'; + } + else + { + chroma = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? 'w' : 'y'; + luminance = 'x'; + } + + tex = needs_legacy_glsl_syntax(gl_info) ? tex_type : ""; + + /* First we have to read the chroma values. This means we need at least + * two pixels (no filtering), or 4 pixels (with filtering). To get the + * unmodified chroma, we have to rid ourselves of the filtering when we + * sample the texture. */ + shader_addline(buffer, " texcoord.xy = out_texcoord.xy;\n"); + /* We must not allow filtering between pixel x and x+1, this would mix U + * and V. Vertical filtering is ok. However, bear in mind that the pixel + * center is at 0.5, so add 0.5. */ + shader_addline(buffer, " texcoord.x = (floor(texcoord.x * size.x) + 0.5) / size.x;\n"); + shader_addline(buffer, " luminance = texture%s(sampler, texcoord.xy).%c;\n", tex, chroma); + + /* Multiply the x coordinate by 0.5 and get the fraction. This gives 0.25 + * and 0.75 for the even and odd pixels respectively. */ + /* Put the value into either of the chroma values. */ + shader_addline(buffer, " bool even = fract(texcoord.x * size.x * 0.5) < 0.5;\n"); + shader_addline(buffer, " if (even)\n"); + shader_addline(buffer, " chroma.y = luminance;\n"); + shader_addline(buffer, " else\n"); + shader_addline(buffer, " chroma.x = luminance;\n"); + + /* Sample pixel 2. If we read an even pixel, sample the pixel right to the + * current one. Otherwise, sample the left pixel. */ + shader_addline(buffer, " texcoord.x += even ? 1.0 / size.x : -1.0 / size.x;\n"); + shader_addline(buffer, " luminance = texture%s(sampler, texcoord.xy).%c;\n", tex, chroma); + + /* Put the value into the other chroma. */ + shader_addline(buffer, " if (even)\n"); + shader_addline(buffer, " chroma.x = luminance;\n"); + shader_addline(buffer, " else\n"); + shader_addline(buffer, " chroma.y = luminance;\n"); + + /* TODO: If filtering is enabled, sample a 2nd pair of pixels left or right of + * the current one and lerp the two U and V values. */ + + /* This gives the correctly filtered luminance value. */ + shader_addline(buffer, " luminance = texture%s(sampler, out_texcoord.xy).%c;\n", tex, luminance); +} + +static void gen_yv12_read(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const char *tex_type) +{ + char component = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? 'w' : 'x'; + const char *tex = needs_legacy_glsl_syntax(gl_info) ? tex_type : ""; + + /* YV12 surfaces contain a WxH sized luminance plane, followed by a + * (W/2)x(H/2) V and a (W/2)x(H/2) U plane, each with 8 bit per pixel. So + * the effective bitdepth is 12 bits per pixel. Since the U and V planes + * have only half the pitch of the luminance plane, the packing into the + * gl texture is a bit unfortunate. If the whole texture is interpreted as + * luminance data it looks approximately like this: + * + * +----------------------------------+---- + * | | + * | | + * | | + * | | + * | | 2 + * | LUMINANCE | - + * | | 3 + * | | + * | | + * | | + * | | + * +----------------+-----------------+---- + * | | | + * | V even rows | V odd rows | + * | | | 1 + * +----------------+------------------ - + * | | | 3 + * | U even rows | U odd rows | + * | | | + * +----------------+-----------------+---- + * | | | + * | 0.5 | 0.5 | + * + * So it appears as if there are 4 chroma images, but in fact the odd rows + * in the chroma images are in the same row as the even ones. So it is + * kinda tricky to read. */ + + /* First sample the chroma values. */ + shader_addline(buffer, " texcoord.xy = out_texcoord.xy;\n"); + /* The chroma planes have only half the width. */ + shader_addline(buffer, " texcoord.x *= 0.5;\n"); + + /* The first value is between 2/3 and 5/6 of the texture's height, so + * scale+bias the coordinate. Also read the right side of the image when + * reading odd lines. + * + * Don't forget to clamp the y values in into the range, otherwise we'll + * get filtering bleeding. */ + + /* Read odd lines from the right side (add 0.5 to the x coordinate). */ + shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.5 + 1.0 / 6.0) >= 0.5)\n"); + shader_addline(buffer, " texcoord.x += 0.5;\n"); + + /* Clamp, keep the half pixel origin in mind. */ + shader_addline(buffer, " texcoord.y = clamp(2.0 / 3.0 + texcoord.y / 6.0, " + "2.0 / 3.0 + 0.5 / size.y, 5.0 / 6.0 - 0.5 / size.y);\n"); + + shader_addline(buffer, " chroma.x = texture%s(sampler, texcoord.xy).%c;\n", tex, component); + + /* The other chroma value is 1/6th of the texture lower, from 5/6th to + * 6/6th No need to clamp because we're just reusing the already clamped + * value from above. */ + shader_addline(buffer, " texcoord.y += 1.0 / 6.0;\n"); + shader_addline(buffer, " chroma.y = texture%s(sampler, texcoord.xy).%c;\n", tex, component); + + /* Sample the luminance value. It is in the top 2/3rd of the texture, so + * scale the y coordinate. Clamp the y coordinate to prevent the chroma + * values from bleeding into the sampled luminance values due to + * filtering. */ + shader_addline(buffer, " texcoord.xy = out_texcoord.xy;\n"); + /* Multiply the y coordinate by 2/3 and clamp it. */ + shader_addline(buffer, " texcoord.y = min(texcoord.y * 2.0 / 3.0, 2.0 / 3.0 - 0.5 / size.y);\n"); + shader_addline(buffer, " luminance = texture%s(sampler, texcoord.xy).%c;\n", tex, component); +} + +static void gen_nv12_read(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const char *tex_type) +{ + char component = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? 'w' : 'x'; + const char *tex = needs_legacy_glsl_syntax(gl_info) ? tex_type : ""; + + /* NV12 surfaces contain a WxH sized luminance plane, followed by a + * (W/2)x(H/2) sized plane where each component is an UV pair. So the + * effective bitdepth is 12 bits per pixel. If the whole texture is + * interpreted as luminance data it looks approximately like this: + * + * +----------------------------------+---- + * | | + * | | + * | | + * | | + * | | 2 + * | LUMINANCE | - + * | | 3 + * | | + * | | + * | | + * | | + * +----------------------------------+---- + * |UVUVUVUVUVUVUVUVUVUVUVUVUVUVUVUVUV| + * |UVUVUVUVUVUVUVUVUVUVUVUVUVUVUVUVUV| + * | | 1 + * | | - + * | | 3 + * | | + * | | + * +----------------------------------+---- */ + + /* First sample the chroma values. */ + shader_addline(buffer, " texcoord.xy = out_texcoord.xy;\n"); + /* We only have half the number of chroma pixels. */ + shader_addline(buffer, " texcoord.x *= 0.5;\n"); + shader_addline(buffer, " texcoord.y = (texcoord.y + 2.0) / 3.0;\n"); + + /* We must not allow filtering horizontally, this would mix U and V. + * Vertical filtering is ok. However, bear in mind that the pixel center + * is at 0.5, so add 0.5. */ + + /* Convert to non-normalised coordinates so we can find the individual + * pixel. */ + shader_addline(buffer, " texcoord.x = floor(texcoord.x * size.x);\n"); + /* Multiply by 2 since chroma components are stored in UV pixel pairs, add + * 0.5 to hit the center of the pixel. Then convert back to normalised + * coordinates. */ + shader_addline(buffer, " texcoord.x = (texcoord.x * 2.0 + 0.5) / size.x;\n"); + /* Clamp, keep the half pixel origin in mind. */ + shader_addline(buffer, " texcoord.y = max(texcoord.y, 2.0 / 3.0 + 0.5 / size.y);\n"); + + shader_addline(buffer, " chroma.y = texture%s(sampler, texcoord.xy).%c;\n", tex, component); + /* Add 1.0 / size.x to sample the adjacent texel. */ + shader_addline(buffer, " texcoord.x += 1.0 / size.x;\n"); + shader_addline(buffer, " chroma.x = texture%s(sampler, texcoord.xy).%c;\n", tex, component); + + /* Sample the luminance value. It is in the top 2/3rd of the texture, so + * scale the y coordinate. Clamp the y coordinate to prevent the chroma + * values from bleeding into the sampled luminance values due to + * filtering. */ + shader_addline(buffer, " texcoord.xy = out_texcoord.xy;\n"); + /* Multiply the y coordinate by 2/3 and clamp it. */ + shader_addline(buffer, " texcoord.y = min(texcoord.y * 2.0 / 3.0, 2.0 / 3.0 - 0.5 / size.y);\n"); + shader_addline(buffer, " luminance = texture%s(sampler, texcoord.xy).%c;\n", tex, component); +} + +static void glsl_blitter_generate_yuv_shader(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const struct glsl_blitter_args *args, + const char *output, const char *tex_type, const char *swizzle) +{ + enum complex_fixup complex_fixup = get_complex_fixup(args->fixup); + + shader_addline(buffer, "const vec4 yuv_coef = vec4(1.403, -0.344, -0.714, 1.770);\n"); + shader_addline(buffer, "float luminance;\n"); + shader_addline(buffer, "vec2 texcoord;\n"); + shader_addline(buffer, "vec2 chroma;\n"); + shader_addline(buffer, "uniform vec2 size;\n"); + + shader_addline(buffer, "\nvoid main()\n{\n"); + + switch (complex_fixup) + { + case COMPLEX_FIXUP_UYVY: + case COMPLEX_FIXUP_YUY2: + gen_packed_yuv_read(buffer, gl_info, args, tex_type); + break; + + case COMPLEX_FIXUP_YV12: + gen_yv12_read(buffer, gl_info, tex_type); + break; + + case COMPLEX_FIXUP_NV12: + gen_nv12_read(buffer, gl_info, tex_type); + break; + + default: + FIXME("Unsupported fixup %#x.\n", complex_fixup); + string_buffer_free(buffer); + return; + } + + /* Calculate the final result. Formula is taken from + * http://www.fourcc.org/fccyvrgb.php. Note that the chroma + * ranges from -0.5 to 0.5. */ + shader_addline(buffer, "\n chroma.xy -= 0.5;\n"); + + shader_addline(buffer, " %s.x = luminance + chroma.x * yuv_coef.x;\n", output); + shader_addline(buffer, " %s.y = luminance + chroma.y * yuv_coef.y + chroma.x * yuv_coef.z;\n", output); + shader_addline(buffer, " %s.z = luminance + chroma.y * yuv_coef.w;\n", output); + + shader_addline(buffer, "}\n"); +} + static void glsl_blitter_generate_plain_shader(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info, const struct glsl_blitter_args *args, const char *output, const char *tex_type, const char *swizzle) @@ -12501,10 +12795,20 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter output = string_buffer_get(&blitter->string_buffers); string_buffer_sprintf(output, "%s[0]", get_fragment_output(gl_info)); - if (complex_fixup == COMPLEX_FIXUP_P8) - glsl_blitter_generate_p8_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); - else - glsl_blitter_generate_plain_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); + switch (complex_fixup) + { + case COMPLEX_FIXUP_P8: + glsl_blitter_generate_p8_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); + break; + case COMPLEX_FIXUP_YUY2: + case COMPLEX_FIXUP_UYVY: + case COMPLEX_FIXUP_YV12: + case COMPLEX_FIXUP_NV12: + glsl_blitter_generate_yuv_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); + break; + case COMPLEX_FIXUP_NONE: + glsl_blitter_generate_plain_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); + } string_buffer_release(&blitter->string_buffers, output); @@ -12580,7 +12884,6 @@ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl { const struct wined3d_gl_info *gl_info = context->gl_info; struct glsl_blitter_program *program; - enum complex_fixup complex_fixup; struct glsl_blitter_args args; struct wine_rb_entry *entry; @@ -12588,13 +12891,6 @@ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl args.texture_type = texture->target; args.fixup = texture->resource.format->color_fixup; - complex_fixup = get_complex_fixup(args.fixup); - if (complex_fixup && complex_fixup != COMPLEX_FIXUP_P8) - { - FIXME("Complex fixup %#x not supported.\n", complex_fixup); - return NULL; - } - if ((entry = wine_rb_get(&blitter->programs, &args))) return WINE_RB_ENTRY_VALUE(entry, struct glsl_blitter_program, entry); @@ -12631,7 +12927,6 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi const struct wined3d_resource *dst_resource = &dst_texture->resource; const struct wined3d_format *src_format = src_resource->format; const struct wined3d_format *dst_format = dst_resource->format; - enum complex_fixup complex_fixup = COMPLEX_FIXUP_NONE; BOOL decompress; if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) @@ -12671,16 +12966,6 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi return FALSE; } - if (is_complex_fixup(src_format->color_fixup)) - { - complex_fixup = get_complex_fixup(src_format->color_fixup); - if (complex_fixup != COMPLEX_FIXUP_P8) - { - TRACE("Complex source fixup %#x not supported.\n", complex_fixup); - return FALSE; - } - } - if (!is_identity_fixup(dst_format->color_fixup) && (dst_format->id != src_format->id || dst_location != WINED3D_LOCATION_DRAWABLE)) { @@ -12705,6 +12990,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli struct glsl_blitter_program *program; struct wined3d_blitter *next; unsigned int src_level; + GLint location; RECT s, d; TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " @@ -12822,8 +13108,25 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli return dst_location; } GL_EXTCALL(glUseProgram(program->id)); - if (get_complex_fixup(program->args.fixup) == COMPLEX_FIXUP_P8) - glsl_blitter_upload_palette(glsl_blitter, context, src_texture); + switch (get_complex_fixup(program->args.fixup)) + { + case COMPLEX_FIXUP_P8: + glsl_blitter_upload_palette(glsl_blitter, context, src_texture); + break; + + case COMPLEX_FIXUP_YUY2: + case COMPLEX_FIXUP_UYVY: + case COMPLEX_FIXUP_YV12: + case COMPLEX_FIXUP_NV12: + src_level = src_sub_resource_idx % src_texture->level_count; + location = GL_EXTCALL(glGetUniformLocation(program->id, "size")); + GL_EXTCALL(glUniform2f(location, wined3d_texture_get_level_pow2_width(src_texture, src_level), + wined3d_texture_get_level_pow2_height(src_texture, src_level))); + break; + + default: + break; + } context_draw_shaded_quad(context, src_texture, src_sub_resource_idx, src_rect, dst_rect, filter); GL_EXTCALL(glUseProgram(0)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ade1227581c..7cecd8c8ede 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3219,8 +3219,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_W, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } - if (!gl_info->supported[APPLE_YCBCR_422] && gl_info->supported[ARB_FRAGMENT_PROGRAM] - && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!gl_info->supported[APPLE_YCBCR_422] && (gl_info->supported[ARB_FRAGMENT_PROGRAM] + || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER]))) { idx = get_format_idx(WINED3DFMT_YUY2); gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUY2); @@ -3229,7 +3229,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); } else if (!gl_info->supported[APPLE_YCBCR_422] && (!gl_info->supported[ARB_FRAGMENT_PROGRAM] - || !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT])) + && (!gl_info->supported[ARB_FRAGMENT_SHADER] || !gl_info->supported[ARB_VERTEX_SHADER]))) { idx = get_format_idx(WINED3DFMT_YUY2); gl_info->formats[idx].glInternal = 0; @@ -3238,7 +3238,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].glInternal = 0; } - if (gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (gl_info->supported[ARB_FRAGMENT_PROGRAM] + || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER])) { idx = get_format_idx(WINED3DFMT_YV12); format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); -- 2.11.0

1 0

[PATCH 11/11] regedit: Sort function declarations alphabetically by source file
by Hugh McMaster May 21, 2018

May 21, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/main.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 218e8ec766..6e901b3ac2 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -124,11 +124,24 @@ void ShowAboutBox(HWND hWnd); LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull); LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); +/* edit.c */ +BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); +BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); +BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); +BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); +BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); +BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); +BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); +int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); + /* framewnd.c */ LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); void SetupStatusBar(HWND hWnd, BOOL bResize); void UpdateStatusBar(void); +/* hexedit.c */ +void HexEdit_Register(void); + /* listview.c */ BOOL update_listview_path(const WCHAR *path); void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); @@ -166,17 +179,4 @@ HWND StartKeyRename(HWND hwndTV); HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName); HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row); -/* edit.c */ -BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); -BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); -BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); -BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); -BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); -BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); -BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); -int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); - -/* hexedit.c */ -void HexEdit_Register(void); - #endif /* __MAIN_H__ */ -- 2.17.0

1 0

[PATCH 10/11] regedit: Remove implicit extern keywords from function declarations
by Hugh McMaster May 21, 2018

May 21, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/main.h | 74 ++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index af61252565..218e8ec766 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -117,33 +117,31 @@ extern const WCHAR* reg_class_namesW[]; #define INDEX_HKEY_CURRENT_USER 4 #define INDEX_HKEY_DYN_DATA 5 - - /* about.c */ -extern void ShowAboutBox(HWND hWnd); +void ShowAboutBox(HWND hWnd); /* childwnd.c */ -extern LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull); -extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); +LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull); +LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); /* framewnd.c */ -extern LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); -extern void SetupStatusBar(HWND hWnd, BOOL bResize); -extern void UpdateStatusBar(void); +LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); +void SetupStatusBar(HWND hWnd, BOOL bResize); +void UpdateStatusBar(void); /* listview.c */ -extern BOOL update_listview_path(const WCHAR *path); -extern void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); -extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); -extern void OnGetDispInfo(NMLVDISPINFOW *plvdi); -extern HWND CreateListView(HWND hwndParent, UINT id); -extern int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); -extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); -extern HWND StartValueRename(HWND hwndLV); -extern LPWSTR GetItemText(HWND hwndLV, UINT item); -extern LPCWSTR GetValueName(HWND hwndLV); -extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); -extern BOOL IsDefaultValue(HWND hwndLV, int i); +BOOL update_listview_path(const WCHAR *path); +void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); +int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); +void OnGetDispInfo(NMLVDISPINFOW *plvdi); +HWND CreateListView(HWND hwndParent, UINT id); +int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); +BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); +HWND StartValueRename(HWND hwndLV); +LPWSTR GetItemText(HWND hwndLV, UINT item); +LPCWSTR GetValueName(HWND hwndLV); +BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); +BOOL IsDefaultValue(HWND hwndLV, int i); /* regedit.c */ void WINAPIV output_message(unsigned int id, ...); @@ -158,27 +156,27 @@ void delete_registry_key(WCHAR *reg_key_name); BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format); /* treeview.c */ -extern HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id); -extern BOOL RefreshTreeView(HWND hWndTV); -extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEWW* pnmtv); -extern LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); -extern BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem); -extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name); -extern HWND StartKeyRename(HWND hwndTV); -extern HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName); -extern HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row); +HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id); +BOOL RefreshTreeView(HWND hWndTV); +BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEWW* pnmtv); +LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); +BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem); +HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name); +HWND StartKeyRename(HWND hwndTV); +HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName); +HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row); /* edit.c */ -extern BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); -extern BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); -extern BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); -extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); -extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); -extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); -extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); -extern int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); +BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); +BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); +BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); +BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); +BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); +BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); +BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); +int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); /* hexedit.c */ -extern void HexEdit_Register(void); +void HexEdit_Register(void); #endif /* __MAIN_H__ */ -- 2.17.0

1 0

[PATCH 09/11] regedit: Do not directly include stdio.h any longer
by Hugh McMaster May 21, 2018

May 21, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/childwnd.c | 1 - programs/regedit/edit.c | 1 - programs/regedit/framewnd.c | 1 - programs/regedit/hexedit.c | 1 - programs/regedit/listview.c | 1 - programs/regedit/main.c | 1 - programs/regedit/regedit.c | 1 - programs/regedit/regproc.c | 1 - programs/regedit/treeview.c | 1 - 9 files changed, 9 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 56ef59d3ff..d8431f10ec 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -21,7 +21,6 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include <windows.h> #include <commctrl.h> -#include <stdio.h> #include "main.h" diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 9baf881621..6ee9869a2a 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -25,7 +25,6 @@ #include <commdlg.h> #include <cderr.h> #include <stdlib.h> -#include <stdio.h> #include <shellapi.h> #include <shlwapi.h> diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 99f7686879..a6777fade4 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -25,7 +25,6 @@ #include <commdlg.h> #include <cderr.h> #include <stdlib.h> -#include <stdio.h> #include <shellapi.h> #include "main.h" diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 0d28388e21..e082e93585 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -24,7 +24,6 @@ */ #include <stdarg.h> -#include <stdio.h> #include <string.h> #include <assert.h> diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index e8bfb527b5..f42f9c2e2f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -23,7 +23,6 @@ #include <winternl.h> #include <commctrl.h> #include <stdlib.h> -#include <stdio.h> #include "main.h" #include "wine/heap.h" diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 62fd616b51..80f935027e 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -22,7 +22,6 @@ #include <windows.h> #include <commctrl.h> #include <stdlib.h> -#include <stdio.h> #include <fcntl.h> #include "wine/debug.h" diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 7469a90ac2..68001be892 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> #include <stdlib.h> #include <windows.h> #include <commctrl.h> diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index c4900e6c6d..2dbbd102c6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -22,7 +22,6 @@ */ #include <errno.h> -#include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <io.h> diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 9d75a31dd6..d5a6767754 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -26,7 +26,6 @@ #include <windows.h> #include <commctrl.h> #include <stdlib.h> -#include <stdio.h> #include <wine/debug.h> #include <shlwapi.h> -- 2.17.0

1 0

[PATCH 08/11] regedit: Simplify boolean comparisons in edit.c
by Hugh McMaster May 21, 2018

May 21, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 980d1c22d8..9baf881621 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -196,7 +196,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, WCHAR empty = 0; lRet = RegQueryValueExW(hKey, valueName ? valueName : &empty, 0, lpType, 0, &valueDataLen); - if (lRet != ERROR_SUCCESS) { + if (lRet) { if (lRet == ERROR_FILE_NOT_FOUND && !valueName) { /* no default value here, make it up */ if (len) *len = 1; if (lpType) *lpType = REG_SZ; @@ -210,7 +210,7 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, if ( *lpType == REG_DWORD ) valueDataLen = sizeof(DWORD); buffer = heap_xalloc(valueDataLen + sizeof(WCHAR)); lRet = RegQueryValueExW(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); goto done; } @@ -234,7 +234,7 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) HKEY hKey; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_CREATE_SUB_KEY, &hKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_CREATE_KEY_FAILED); goto done; } @@ -245,13 +245,13 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) for (keyNum = 1; keyNum < 100; keyNum++) { wsprintfW(keyName, newKey, keyNum); lRet = RegOpenKeyW(hKey, keyName, &retKey); - if (lRet != ERROR_SUCCESS) break; + if (lRet) break; RegCloseKey(retKey); } if (lRet == ERROR_SUCCESS) goto done; lRet = RegCreateKeyW(hKey, keyName, &retKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_CREATE_KEY_FAILED); goto done; } @@ -272,7 +272,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) LONG len; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); return FALSE; } @@ -388,7 +388,7 @@ BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath) HKEY hKey; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ|KEY_SET_VALUE, &hKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_DELETE_KEY_FAILED); return FALSE; } @@ -398,7 +398,7 @@ BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath) goto done; lRet = SHDeleteKeyW(hKeyRoot, keyPath); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_BAD_KEY, keyPath); goto done; } @@ -418,7 +418,7 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, B WCHAR empty = 0; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet != ERROR_SUCCESS) return FALSE; + if (lRet) return FALSE; if (showMessageBox) { @@ -428,10 +428,10 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, B } lRet = RegDeleteValueW(hKey, valueName ? valueName : &empty); - if (lRet != ERROR_SUCCESS && valueName) { + if (lRet && valueName) { error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); } - if (lRet != ERROR_SUCCESS) goto done; + if (lRet) goto done; result = TRUE; done: @@ -450,7 +450,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW LVITEMW item; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_CREATE_VALUE_FAILED); return FALSE; } @@ -469,7 +469,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW } lRet = RegSetValueExW(hKey, valueName, 0, valueType, (BYTE*)&valueDword, sizeof(DWORD)); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_CREATE_VALUE_FAILED); goto done; } @@ -500,7 +500,7 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC if (!newName) return FALSE; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); return FALSE; } @@ -512,12 +512,12 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC value = read_value(hwnd, hKey, oldName, &type, &len); if(!value) goto done; lRet = RegSetValueExW(hKey, newName, 0, type, (BYTE*)value, len); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); goto done; } lRet = RegDeleteValueW(hKey, oldName); - if (lRet != ERROR_SUCCESS) { + if (lRet) { RegDeleteValueW(hKey, newName); error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); goto done; @@ -555,7 +555,7 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) *srcSubKey_copy = 0; srcSubKey = srcSubKey_copy + 1; lRet = RegOpenKeyExW(hRootKey, parentPath, 0, KEY_READ | KEY_CREATE_SUB_KEY, &parentKey); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_RENAME_KEY_FAILED); goto done; } @@ -568,14 +568,14 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) KEY_WRITE, NULL /* FIXME */, &destKey, &disposition); if (disposition == REG_OPENED_EXISTING_KEY) lRet = ERROR_FILE_EXISTS; - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_KEY_EXISTS, srcSubKey); goto done; } /* FIXME: SHCopyKey does not copy the security attributes */ lRet = SHCopyKeyW(parentKey, srcSubKey, destKey, 0); - if (lRet != ERROR_SUCCESS) { + if (lRet) { RegCloseKey(destKey); RegDeleteKeyW(parentKey, newName); error_code_messagebox(hwnd, IDS_RENAME_KEY_FAILED); @@ -583,7 +583,7 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) } lRet = SHDeleteKeyW(hRootKey, keyPath); - if (lRet != ERROR_SUCCESS) { + if (lRet) { error_code_messagebox(hwnd, IDS_RENAME_KEY_FAILED); goto done; } -- 2.17.0

1 0

[PATCH 07/11] regedit: Simplify the detection of existing registry values
by Hugh McMaster May 21, 2018

May 21, 2018

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index bd6d720f2a..980d1c22d8 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -183,12 +183,9 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara return FALSE; } -static BOOL check_value(HWND hwnd, HKEY hKey, LPCWSTR valueName) +static BOOL value_exists(HWND hwnd, HKEY hKey, const WCHAR *value_name) { - WCHAR empty = 0; - LONG lRet = RegQueryValueExW(hKey, valueName ? valueName : &empty, 0, NULL, 0, NULL); - if(lRet != ERROR_SUCCESS) return FALSE; - return TRUE; + return !RegQueryValueExW(hKey, value_name ? value_name : NULL, NULL, NULL, NULL, NULL); } static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, LONG *len) @@ -507,8 +504,8 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); return FALSE; } - /* check if the value already exists */ - if (check_value(hwnd, hKey, newName)) { + + if (value_exists(hwnd, hKey, newName)) { error_code_messagebox(hwnd, IDS_VALUE_EXISTS, oldName); goto done; } -- 2.17.0

1 0