October 2018 - Wine-devel - list.winehq.org

[PATCH 2/4] server: Use default_fd_get_file_info for FileAccessInformation implementation.
by Jacek Caban 23 Oct '18

23 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 24 ++++-------------------- server/fd.c | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 21 deletions(-)

1 0

[PATCH 1/4] server: Use server_get_file_info for all info classes not implemented on client side.
by Jacek Caban 23 Oct '18

23 Oct '18

1 0

[PATCH] winemenubuilder: Avoid unneeded lstrlenA() calls.
by Francois Gouget 23 Oct '18

23 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- There is obviously no issue with NULL pointers here. programs/winemenubuilder/winemenubuilder.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9adfed63079..26710e9e926 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1468,13 +1468,13 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con wine_get_config_dir(), path, args); fprintf(file, "Type=Application\n"); fprintf(file, "StartupNotify=true\n"); - if (descr && lstrlenA(descr)) + if (descr && *descr) fprintf(file, "Comment=%s\n", descr); - if (workdir && lstrlenA(workdir)) + if (workdir && *workdir) fprintf(file, "Path=%s\n", workdir); - if (icon && lstrlenA(icon)) + if (icon && *icon) fprintf(file, "Icon=%s\n", icon); - if (wmclass && lstrlenA(wmclass)) + if (wmclass && *wmclass) fprintf(file, "StartupWMClass=%s\n", wmclass); fclose(file); -- 2.19.1

1 0

[PATCH] winebus.sys: Avoid an unneeded strlen() call.
by Francois Gouget 23 Oct '18

23 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- It seems wasteful to compute the length of the string when all we care about is the first character. Plus the 'if (*str)' pattern is pretty common and used extensively in Wine already. Note that this does not change handling of NULL pointers since strlen() does not check for them. dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index dabda6a2705..64b245e630d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1084,7 +1084,7 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, else if (strcmp(key, "HID_UNIQ") == 0) { /* The caller has to free the serial number */ - if (strlen(value)) + if (*value) { *serial_number = (WCHAR*)strdupAtoW(value); found_serial = 1; -- 2.19.1

1 0

[PATCH] cryptui: Avoid an unneeded strlen() call.
by Francois Gouget 23 Oct '18

23 Oct '18

--- dlls/cryptui/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 4ac37c96df0..66052f8727c 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3480,7 +3480,7 @@ static void set_general_cert_properties(HWND hwnd, struct edit_cert_data *data) static void set_cert_string_property(PCCERT_CONTEXT cert, DWORD prop, LPWSTR str) { - if (str && strlenW(str)) + if (str && *str) { CRYPT_DATA_BLOB blob; -- 2.19.1

1 0

[PATCH] crypt32/tests: Avoid an unneeded strlen() call.
by Francois Gouget 23 Oct '18

23 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- As in the previous patch, it seems wasteful to compute the length of the string when all we care about is the first character. Plus the 'if (*str)' pattern is pretty common and used extensively in Wine already. Also here there is obviously no issue with the pointer being NULL. dlls/crypt32/tests/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 4a6626ab006..64a45cdbbf8 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1017,7 +1017,7 @@ static void compareNameValues(const CERT_NAME_VALUE *expected, static void compareRDNAttrs(const CERT_RDN_ATTR *expected, const CERT_RDN_ATTR *got) { - if (expected->pszObjId && strlen(expected->pszObjId)) + if (expected->pszObjId && *expected->pszObjId) { ok(got->pszObjId != NULL, "Expected OID %s, got NULL\n", expected->pszObjId); -- 2.19.1

1 0

[PATCH] crypt32/tests: Fix a typo and reword a comment.
by Francois Gouget 23 Oct '18

23 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/crypt32/tests/oid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 5247a4aad5c..ae03bba90e8 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -652,8 +652,8 @@ static void test_registerOIDInfo(void) ok(!info2, "should fail\n"); SetLastError(0xdeadbeef); - /* while succeeds next call does't write anything to registry under Windows - * because of dwGroupId == 0. + /* While it succeeds, the next call does not write anything to the + * registry on Windows because dwGroupId == 0. */ ret = CryptRegisterOIDInfo(&info1, 0); ok(ret, "got %u\n", GetLastError()); -- 2.19.1

1 0

[PATCH] gdi32: Spelling fixes in a comment
by André Hentschel 23 Oct '18

23 Oct '18

Signed-off-by: Andr� Hentschel <nerv(a)dawncrow.de> --- dlls/gdi32/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 59cb73bd9f..b3d67ff624 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -753,9 +753,9 @@ static struct font_gamma_ramp *get_font_gamma_ramp( void ) gamma = min( max( gamma, 1000 ), 2200 ); } - /* Calibration the difference between the registry value and the Wine gamma value. - This shows a roughly similar looks to the Windows Native with the same registry value. - MS GDI seems to be rasterizing the outline at the different rate than FreeType. */ + /* Calibrating the difference between the registry value and the Wine gamma value. + This looks roughly similar to Windows Native with the same registry value. + MS GDI seems to be rasterizing the outline at a different rate than FreeType. */ gamma = 1000 * gamma / 1400; for (i = 0; i < 256; i++) -- 2.17.1

2 1

[PATCH 6/6] d2d1: Implement d2d_device_context_ID2D1DeviceContext_DrawGlyphRun().
by Henri Verbeet 23 Oct '18

23 Oct '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/device.c | 158 +++++++++++++++++++++++++++-------------------------- 1 file changed, 81 insertions(+), 77 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 25934136618..0e96224ec34 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1344,85 +1344,10 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, DWRITE_MEASURING_MODE measuring_mode) { - struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); - DWRITE_TEXT_ANTIALIAS_MODE antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE; - IDWriteRenderingParams *rendering_params; - DWRITE_RENDERING_MODE rendering_mode; - HRESULT hr; - 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; - - rendering_mode = IDWriteRenderingParams_GetRenderingMode(rendering_params); - - switch (context->drawing_state.textAntialiasMode) - { - case D2D1_TEXT_ANTIALIAS_MODE_ALIASED: - if (rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL - || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC - || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL - || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC) - { - d2d_device_context_set_error(context, E_INVALIDARG); - } - break; - case D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE: - if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED - || rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) - { - d2d_device_context_set_error(context, E_INVALIDARG); - } - break; - case D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE: - if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED) - d2d_device_context_set_error(context, E_INVALIDARG); - break; - default: - ; - } - - if (FAILED(context->error.code)) - return; - - rendering_mode = DWRITE_RENDERING_MODE_DEFAULT; - switch (context->drawing_state.textAntialiasMode) - { - case D2D1_TEXT_ANTIALIAS_MODE_DEFAULT: - if (IDWriteRenderingParams_GetClearTypeLevel(rendering_params) > 0.0f) - antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; - break; - case D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE: - antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; - break; - case D2D1_TEXT_ANTIALIAS_MODE_ALIASED: - rendering_mode = DWRITE_RENDERING_MODE_ALIASED; - break; - default: - ; - } - - if (rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) - { - if (FAILED(hr = IDWriteFontFace_GetRecommendedRenderingMode(glyph_run->fontFace, glyph_run->fontEmSize, - max(context->desc.dpiX, context->desc.dpiY) / 96.0f, - measuring_mode, rendering_params, &rendering_mode))) - { - ERR("Failed to get recommended rendering mode, hr %#x.\n", hr); - rendering_mode = DWRITE_RENDERING_MODE_OUTLINE; - } - } - - if (rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) - d2d_device_context_draw_glyph_run_outline(context, baseline_origin, glyph_run, brush); - else - d2d_device_context_draw_glyph_run_bitmap(context, baseline_origin, glyph_run, brush, - rendering_mode, measuring_mode, antialias_mode); + ID2D1DeviceContext_DrawGlyphRun(iface, baseline_origin, glyph_run, NULL, brush, measuring_mode); } static void STDMETHODCALLTYPE d2d_device_context_SetTransform(ID2D1DeviceContext *iface, @@ -2145,8 +2070,87 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawGlyphRun D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *glyph_run_desc, ID2D1Brush *brush, DWRITE_MEASURING_MODE measuring_mode) { - FIXME("iface %p, baseline_origin %s, glyph_run %p, glyph_run_desc %p, brush %p, measuring_mode %#x stub!\n", + DWRITE_TEXT_ANTIALIAS_MODE antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE; + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + IDWriteRenderingParams *rendering_params; + DWRITE_RENDERING_MODE rendering_mode; + HRESULT hr; + + TRACE("iface %p, baseline_origin %s, glyph_run %p, glyph_run_desc %p, brush %p, measuring_mode %#x.\n", iface, debug_d2d_point_2f(&baseline_origin), glyph_run, glyph_run_desc, brush, measuring_mode); + + if (FAILED(context->error.code)) + return; + + rendering_params = context->text_rendering_params ? context->text_rendering_params + : context->default_text_rendering_params; + + rendering_mode = IDWriteRenderingParams_GetRenderingMode(rendering_params); + + switch (context->drawing_state.textAntialiasMode) + { + case D2D1_TEXT_ANTIALIAS_MODE_ALIASED: + if (rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL + || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC + || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL + || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC) + d2d_device_context_set_error(context, E_INVALIDARG); + break; + + case D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE: + if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED + || rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) + d2d_device_context_set_error(context, E_INVALIDARG); + break; + + case D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE: + if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED) + d2d_device_context_set_error(context, E_INVALIDARG); + break; + + default: + break; + } + + if (FAILED(context->error.code)) + return; + + rendering_mode = DWRITE_RENDERING_MODE_DEFAULT; + switch (context->drawing_state.textAntialiasMode) + { + case D2D1_TEXT_ANTIALIAS_MODE_DEFAULT: + if (IDWriteRenderingParams_GetClearTypeLevel(rendering_params) > 0.0f) + antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; + break; + + case D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE: + antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; + break; + + case D2D1_TEXT_ANTIALIAS_MODE_ALIASED: + rendering_mode = DWRITE_RENDERING_MODE_ALIASED; + break; + + default: + break; + } + + if (rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) + { + if (FAILED(hr = IDWriteFontFace_GetRecommendedRenderingMode(glyph_run->fontFace, glyph_run->fontEmSize, + max(context->desc.dpiX, context->desc.dpiY) / 96.0f, + measuring_mode, rendering_params, &rendering_mode))) + { + ERR("Failed to get recommended rendering mode, hr %#x.\n", hr); + rendering_mode = DWRITE_RENDERING_MODE_OUTLINE; + } + } + + if (rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) + d2d_device_context_draw_glyph_run_outline(context, baseline_origin, glyph_run, brush); + else + d2d_device_context_draw_glyph_run_bitmap(context, baseline_origin, glyph_run, brush, + rendering_mode, measuring_mode, antialias_mode); } static void STDMETHODCALLTYPE d2d_device_context_DrawImage(ID2D1DeviceContext *iface, ID2D1Image *image, -- 2.11.0

1 0

[PATCH 5/6] wined3d: Pass the wined3d_buffer_desc structure directly to buffer_init().
by Henri Verbeet 23 Oct '18

23 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 64ceeda5b66..5b3419d29e0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1341,25 +1341,25 @@ static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_ return GL_ARRAY_BUFFER; } -static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, UINT size, - DWORD usage, unsigned int access, unsigned int bind_flags, const struct wined3d_sub_resource_data *data, +static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, + const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, usage); + const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, desc->usage); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; BOOL dynamic_buffer_ok; HRESULT hr; - if (!size) + if (!desc->byte_width) { WARN("Size 0 requested, returning E_INVALIDARG.\n"); return E_INVALIDARG; } - if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER && size & (WINED3D_CONSTANT_BUFFER_ALIGNMENT - 1)) + if (desc->bind_flags & WINED3D_BIND_CONSTANT_BUFFER && desc->byte_width & (WINED3D_CONSTANT_BUFFER_ALIGNMENT - 1)) { - WARN("Size %#x is not suitably aligned for constant buffers.\n", size); + WARN("Size %#x is not suitably aligned for constant buffers.\n", desc->byte_width); return E_INVALIDARG; } @@ -1369,14 +1369,16 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return E_INVALIDARG; } - if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, WINED3D_MULTISAMPLE_NONE, - 0, usage, access, size, 1, 1, size, parent, parent_ops, &buffer_resource_ops))) + if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->access, desc->byte_width, 1, 1, + desc->byte_width, parent, parent_ops, &buffer_resource_ops))) { WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } - buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, bind_flags); - buffer->bind_flags = bind_flags; + buffer->desc = *desc; + buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); + buffer->bind_flags = desc->bind_flags; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", @@ -1384,7 +1386,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING - || wined3d_resource_access_is_managed(access)) + || wined3d_resource_access_is_managed(desc->access)) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of @@ -1403,7 +1405,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device { TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); } - else if (!(access & WINED3D_RESOURCE_ACCESS_GPU)) + else if (!(desc->access & WINED3D_RESOURCE_ACCESS_GPU)) { TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); } @@ -1454,14 +1456,12 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage, - desc->access, desc->bind_flags, data, parent, parent_ops))) + if (FAILED(hr = wined3d_buffer_init(object, device, desc, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); heap_free(object); return hr; } - object->desc = *desc; TRACE("Created buffer %p.\n", object); -- 2.11.0

1 0