wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Nikolay Sivov : d2d1: Check the context error state on entering d2d_device_context_DrawGlyphRun ().
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: cc4b28a99df649d2885c14fd28c2ad2f0c2abdad URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc4b28a99df649d2885c14fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 8 22:13:42 2018 +0330 d2d1: Check the context error state on entering d2d_device_context_DrawGlyphRun(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 1e42051..ff5caac 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1355,6 +1355,9 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext TRACE("iface %p, baseline_origin %s, glyph_run %p, brush %p, measuring_mode %#x.\n", iface, debug_d2d_point_2f(&baseline_origin), glyph_run, brush, measuring_mode); + if (FAILED(context->error.code)) + return; + rendering_params = context->text_rendering_params ? context->text_rendering_params : context->default_text_rendering_params;

1 0

Henri Verbeet : d3d11/tests: Add depth bias clamp tests.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 4c940b0d3e89a411a2d8247c54bab4779f4e8c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c940b0d3e89a411a2d8247c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 22:13:41 2018 +0330 d3d11/tests: Add depth bias clamp tests. This is pretty much a copy of the d3d10core tests by Zebediah. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 203 ++++++++++++++++++++++++++--------------------- 1 file changed, 114 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c940b0d3e89a411a2d8…

1 0

Zebediah Figura : d3d10core/tests: Add depth bias clamp tests.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 2f2f0de550829d045a38449e979a47f1d900c25f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f2f0de550829d045a38449e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 8 22:13:40 2018 +0330 d3d10core/tests: Add depth bias clamp tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 198 ++++++++++++++++++++++----------------- 1 file changed, 111 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f2f0de550829d045a38…

1 0

Zebediah Figura : wined3d: Implement depth bias clamp.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 42b5d88f2e081d90195bd3cd1931929f84b26f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42b5d88f2e081d90195bd3cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 8 22:13:39 2018 +0330 wined3d: Implement depth bias clamp. Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 1 + dlls/wined3d/adapter_gl.c | 8 +++++++- dlls/wined3d/state.c | 18 ++++++++++++++++-- dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index c36b87f..6de3502 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1081,6 +1081,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_clip = desc->DepthClipEnable; + wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b62c86a..16a26b8 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -103,6 +103,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_pixel_buffer_object", ARB_PIXEL_BUFFER_OBJECT }, {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS }, {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, + {"GL_ARB_polygon_offset_clamp", ARB_POLYGON_OFFSET_CLAMP }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, {"GL_ARB_query_buffer_object", ARB_QUERY_BUFFER_OBJECT }, {"GL_ARB_sample_shading", ARB_SAMPLE_SHADING }, @@ -1254,7 +1255,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g shader_model = min(shader_model, max(shader_caps->hs_version, 4)); shader_model = min(shader_model, max(shader_caps->ds_version, 4)); - if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) + if (gl_info->supported[WINED3D_GL_VERSION_3_2] + && gl_info->supported[ARB_POLYGON_OFFSET_CLAMP] + && gl_info->supported[ARB_SAMPLER_OBJECTS]) { if (shader_model >= 5 && gl_info->supported[ARB_DRAW_INDIRECT] @@ -2172,6 +2175,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_point_parameters */ USE_GL_FUNC(glPointParameterfARB) USE_GL_FUNC(glPointParameterfvARB) + /* GL_ARB_polgyon_offset_clamp */ + USE_GL_FUNC(glPolygonOffsetClamp) /* GL_ARB_provoking_vertex */ USE_GL_FUNC(glProvokingVertex) /* GL_ARB_sample_shading */ @@ -3316,6 +3321,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_SHADER_TEXTURE_IMAGE_SAMPLES, MAKEDWORD_VERSION(4, 5)}, {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, + {ARB_POLYGON_OFFSET_CLAMP, MAKEDWORD_VERSION(4, 6)}, {ARB_TEXTURE_FILTER_ANISOTROPIC, MAKEDWORD_VERSION(4, 6)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3b2f845..375bc65 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1775,7 +1775,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 || state->render_states[WINED3D_RS_DEPTHBIAS]) { const struct wined3d_rendertarget_view *depth = state->fb->depth_stencil; - float factor, units, scale; + float factor, units, scale, clamp; union { @@ -1783,6 +1783,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 float f; } scale_bias, const_bias; + clamp = state->rasterizer_state ? state->rasterizer_state->desc.depth_bias_clamp : 0.0f; scale_bias.d = state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS]; const_bias.d = state->render_states[WINED3D_RS_DEPTHBIAS]; @@ -1811,7 +1812,16 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 } gl_info->gl_ops.gl.p_glEnable(GL_POLYGON_OFFSET_FILL); - gl_info->gl_ops.gl.p_glPolygonOffset(factor, units); + if (gl_info->supported[ARB_POLYGON_OFFSET_CLAMP]) + { + gl_info->gl_ops.ext.p_glPolygonOffsetClamp(factor, units, clamp); + } + else + { + if (clamp != 0.0f) + WARN("Ignoring depth bias clamp %.8e.\n", clamp); + gl_info->gl_ops.gl.p_glPolygonOffset(factor, units); + } } else { @@ -4345,6 +4355,8 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) + state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); depth_clip(state->rasterizer_state, gl_info); } @@ -4357,6 +4369,8 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ gl_info->gl_ops.gl.p_glFrontFace(mode); checkGLcall("glFrontFace"); + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_DEPTHBIAS))) + state_depthbias(context, state, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); depth_clip(state->rasterizer_state, gl_info); } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2a985da..a02073c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -89,6 +89,7 @@ enum wined3d_gl_extension ARB_PIXEL_BUFFER_OBJECT, ARB_POINT_PARAMETERS, ARB_POINT_SPRITE, + ARB_POLYGON_OFFSET_CLAMP, ARB_PROVOKING_VERTEX, ARB_QUERY_BUFFER_OBJECT, ARB_SAMPLE_SHADING, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8197a86..c62d364 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2012,6 +2012,7 @@ struct wined3d_blend_state_desc struct wined3d_rasterizer_state_desc { BOOL front_ccw; + float depth_bias_clamp; BOOL depth_clip; };

1 0

Henri Verbeet : wined3d: Add GPU information for NVIDIA GeForce GT 720.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 55d4f63164fc1c8c4b2b5170620ded566b69acb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55d4f63164fc1c8c4b2b5170… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 22:13:38 2018 +0330 wined3d: Add GPU information for NVIDIA GeForce GT 720. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 6941459..b62c86a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1714,6 +1714,7 @@ cards_nvidia_mesa[] = {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NV108", CARD_NVIDIA_GEFORCE_GT740M}, + {"NV106", CARD_NVIDIA_GEFORCE_GT720}, {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fb67fe4..f4aabb5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -283,6 +283,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT720, "NVIDIA GeForce GT 720", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ccb7130..20e626c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2386,6 +2386,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX675MX = 0x11a7, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, + CARD_NVIDIA_GEFORCE_GT720 = 0x128b, CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT740M = 0x1292,

1 0

Henri Verbeet : wined3d: Also default to OpenGL core contexts on NVIDIA GPUs.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 8fa5f1d8c6e2c0e0bb408de0b341b946984825c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fa5f1d8c6e2c0e0bb408de0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 22:13:37 2018 +0330 wined3d: Also default to OpenGL core contexts on NVIDIA GPUs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 22 ++-------------------- dlls/wined3d/wined3d_main.c | 2 -- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2f2d09d..6941459 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4178,22 +4178,6 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc } } -static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD flags) -{ - const char *gl_vendor, *gl_renderer; - - if (wined3d_settings.explicit_gl_version) - return wined3d_settings.max_gl_version; - - gl_vendor = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR); - gl_renderer = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER); - if (!gl_vendor || !gl_renderer - || wined3d_guess_card_vendor(gl_vendor, gl_renderer) == HW_VENDOR_NVIDIA) - return MAKEDWORD_VERSION(1, 0); - - return wined3d_settings.max_gl_version; -} - static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { wined3d_adapter_gl_create_context, @@ -4209,7 +4193,6 @@ BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, DWORD wined3d_crea }; struct wined3d_gl_info *gl_info = &adapter->gl_info; struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; - DWORD max_gl_version; unsigned int i; TRACE("adapter %p, wined3d_creation_flags %#x.\n", adapter, wined3d_creation_flags); @@ -4245,16 +4228,15 @@ BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, DWORD wined3d_crea return FALSE; } - max_gl_version = get_max_gl_version(gl_info, wined3d_creation_flags); for (i = 0; i < ARRAY_SIZE(supported_gl_versions); ++i) { - if (supported_gl_versions[i] <= max_gl_version) + if (supported_gl_versions[i] <= wined3d_settings.max_gl_version) break; } if (i == ARRAY_SIZE(supported_gl_versions)) { ERR_(winediag)("Requested invalid GL version %u.%u.\n", - max_gl_version >> 16, max_gl_version & 0xffff); + wined3d_settings.max_gl_version >> 16, wined3d_settings.max_gl_version & 0xffff); i = ARRAY_SIZE(supported_gl_versions) - 1; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 3537a48..ca83d0a 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -73,7 +73,6 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, struct wined3d_settings wined3d_settings = { TRUE, /* Multithreaded CS by default. */ - FALSE, /* explicit_gl_version */ MAKEDWORD_VERSION(4, 4), /* Default to OpenGL 4.4 */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ @@ -217,7 +216,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", tmpvalue >> 16, tmpvalue & 0xffff); - wined3d_settings.explicit_gl_version = TRUE; wined3d_settings.max_gl_version = tmpvalue; } if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5e3c79..ccb7130 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -374,7 +374,6 @@ static inline void wined3d_pause(void) struct wined3d_settings { unsigned int cs_multithreaded; - BOOL explicit_gl_version; DWORD max_gl_version; BOOL use_glsl; int offscreen_rendering_mode;

1 0

Henri Verbeet : d2d1: Do not release the "dxgi_target" interface on d2d_bitmap_render_target_init() error paths.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 502bcfe2c687cf19cdc47687a60e6868e1a302de URL: https://source.winehq.org/git/wine.git/?a=commit;h=502bcfe2c687cf19cdc47687… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 22:13:36 2018 +0330 d2d1: Do not release the "dxgi_target" interface on d2d_bitmap_render_target_init() error paths. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap_render_target.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index 836fa56..11c3788 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -794,6 +794,10 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta return hr; } + /* Note that we should be a little careful with the "dxgi_target" + * reference we get here. Because the object is aggregated, releasing the + * interface in any error paths below would end up calling + * d2d_bitmap_render_target_Release(). */ if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner, &IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target))) { @@ -816,7 +820,6 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta if (FAILED(hr)) { WARN("Failed to create target bitmap, hr %#x.\n", hr); - ID2D1RenderTarget_Release(render_target->dxgi_target); IUnknown_Release(render_target->dxgi_inner); return hr; }

1 0

Hans Leidekker : wmic: Pad output with spaces.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: c0f00105b5c148cba07d6f00e557a08cabbf82e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0f00105b5c148cba07d6f00… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 8 15:53:12 2018 +0200 wmic: Pad output with spaces. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 85b76de..5d50045 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -147,14 +147,14 @@ static int output_error( int msg ) return output_string( GetStdHandle(STD_ERROR_HANDLE), fmtW, buffer ); } -static int output_header( const WCHAR *prop ) +static int output_header( const WCHAR *prop, ULONG column_width ) { - static const WCHAR bomW[] = {0xfeff}, fmtW[] = {'%','s','\r','\n',0}; + static const WCHAR bomW[] = {0xfeff}, fmtW[] = {'%','-','*','s','\r','\n',0}; int len; DWORD count; WCHAR buffer[8192]; - len = snprintfW( buffer, ARRAY_SIZE(buffer), fmtW, prop ); + len = snprintfW( buffer, ARRAY_SIZE(buffer), fmtW, column_width, prop ); if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len, &count, NULL )) /* redirected */ { @@ -166,10 +166,10 @@ static int output_header( const WCHAR *prop ) return count; } -static int output_line( const WCHAR *str ) +static int output_line( const WCHAR *str, ULONG column_width ) { - static const WCHAR fmtW[] = {'%','s','\r','\n',0}; - return output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, str ); + static const WCHAR fmtW[] = {'%','-','*','s','\r','\n',0}; + return output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, column_width, str ); } static int query_prop( const WCHAR *class, const WCHAR *propname ) @@ -186,6 +186,9 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) WCHAR *prop = NULL; BOOL first = TRUE; int len, ret = -1; + IWbemClassObject *obj; + ULONG count, width = 0; + VARIANT v; WINE_TRACE("%s, %s\n", debugstr_w(class), debugstr_w(propname)); @@ -210,29 +213,41 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result ); if (hr != S_OK) goto done; - for (;;) + for (;;) /* get column width */ { - IWbemClassObject *obj; - ULONG count; - VARIANT v; + IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); + if (!count) break; + if (!prop && !(prop = find_prop( obj, propname ))) + { + output_error( STRING_INVALID_QUERY ); + goto done; + } + if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) + { + VariantChangeType( &v, &v, 0, VT_BSTR ); + width = max( strlenW( V_BSTR( &v ) ), width ); + VariantClear( &v ); + } + IWbemClassObject_Release( obj ); + } + width += 2; + + IEnumWbemClassObject_Reset( result ); + for (;;) + { IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); if (!count) break; if (first) { - if (!(prop = find_prop( obj, propname ))) - { - output_error( STRING_INVALID_QUERY ); - goto done; - } - output_header( prop ); + output_header( prop, width ); first = FALSE; } if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { VariantChangeType( &v, &v, 0, VT_BSTR ); - output_line( V_BSTR( &v ) ); + output_line( V_BSTR( &v ), width ); VariantClear( &v ); } IWbemClassObject_Release( obj );

1 0

Hans Leidekker : wmic: Don't write an extra newline at the end.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: 462897797992ca58a06531f760a209f1658b8eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=462897797992ca58a06531f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 8 15:53:11 2018 +0200 wmic: Don't write an extra newline at the end. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index f01aad7..85b76de 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -177,7 +177,6 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; static const WCHAR wqlW[] = {'W','Q','L',0}; - static const WCHAR newlineW[] = {'\r','\n',0}; HRESULT hr; IWbemLocator *locator = NULL; IWbemServices *services = NULL; @@ -238,7 +237,6 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) } IWbemClassObject_Release( obj ); } - output_string( GetStdHandle(STD_OUTPUT_HANDLE), newlineW ); ret = 0; done:

1 0

Hans Leidekker : wmic: Output Unicode text with BOM when redirected.
by Alexandre Julliard 08 Oct '18

08 Oct '18

Module: wine Branch: master Commit: a7f0dc07b2378d707845f416e08bdf1173dcdf2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f0dc07b2378d707845f416… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 8 15:53:10 2018 +0200 wmic: Output Unicode text with BOM when redirected. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 57 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index b2ec7e2..f01aad7 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -124,32 +124,17 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) static int output_string( HANDLE handle, const WCHAR *msg, ... ) { va_list va_args; - int wlen; - DWORD count, ret; + int len; + DWORD count; WCHAR buffer[8192]; va_start( va_args, msg ); - vsprintfW( buffer, msg, va_args ); + len = vsnprintfW( buffer, ARRAY_SIZE(buffer), msg, va_args ); va_end( va_args ); - wlen = strlenW( buffer ); - ret = WriteConsoleW( handle, buffer, wlen, &count, NULL ); - if (!ret) - { - DWORD len; - char *msgA; - - /* On Windows WriteConsoleW() fails if the output is redirected. So fall - * back to WriteFile(), assuming the console encoding is still the right - * one in that case. - */ - len = WideCharToMultiByte( GetConsoleOutputCP(), 0, buffer, wlen, NULL, 0, NULL, NULL ); - if (!(msgA = HeapAlloc( GetProcessHeap(), 0, len * sizeof(char) ))) return 0; - - WideCharToMultiByte( GetConsoleOutputCP(), 0, buffer, wlen, msgA, len, NULL, NULL ); - WriteFile( handle, msgA, len, &count, FALSE ); - HeapFree( GetProcessHeap(), 0, msgA ); - } + if (!WriteConsoleW( handle, buffer, len, &count, NULL )) + WriteFile( handle, buffer, len * sizeof(WCHAR), &count, FALSE ); + return count; } @@ -162,13 +147,37 @@ static int output_error( int msg ) return output_string( GetStdHandle(STD_ERROR_HANDLE), fmtW, buffer ); } +static int output_header( const WCHAR *prop ) +{ + static const WCHAR bomW[] = {0xfeff}, fmtW[] = {'%','s','\r','\n',0}; + int len; + DWORD count; + WCHAR buffer[8192]; + + len = snprintfW( buffer, ARRAY_SIZE(buffer), fmtW, prop ); + + if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len, &count, NULL )) /* redirected */ + { + WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), bomW, sizeof(bomW), &count, FALSE ); + WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len * sizeof(WCHAR), &count, FALSE ); + count += sizeof(bomW); + } + + return count; +} + +static int output_line( const WCHAR *str ) +{ + static const WCHAR fmtW[] = {'%','s','\r','\n',0}; + return output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, str ); +} + static int query_prop( const WCHAR *class, const WCHAR *propname ) { static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; static const WCHAR wqlW[] = {'W','Q','L',0}; static const WCHAR newlineW[] = {'\r','\n',0}; - static const WCHAR fmtW[] = {'%','s','\r','\n',0}; HRESULT hr; IWbemLocator *locator = NULL; IWbemServices *services = NULL; @@ -218,13 +227,13 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) output_error( STRING_INVALID_QUERY ); goto done; } - output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, prop ); + output_header( prop ); first = FALSE; } if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { VariantChangeType( &v, &v, 0, VT_BSTR ); - output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, V_BSTR( &v ) ); + output_line( V_BSTR( &v ) ); VariantClear( &v ); } IWbemClassObject_Release( obj );

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018