- wine-devel - winehq.org

[PATCH] dmime: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Oct '18

23 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/dmutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index c51d579849..cb5fd32db1 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -386,7 +386,7 @@ const char *debugstr_dmguid (const GUID *id) { unsigned int i; if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } @@ -430,7 +430,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { -- 2.14.5

1 0

[PATCH] dmcompos: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Oct '18

23 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmcompos/dmcompos_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index c15c97d500..2e68775084 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -406,7 +406,7 @@ const char *debugstr_dmguid (const GUID *id) { if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } @@ -450,7 +450,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* dump whole DMUS_OBJECTDESC struct */ -- 2.14.5

1 0

[PATCH] dmband: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 23 Oct '18

23 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/dmutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index b121564c48..e04e9dd73e 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -82,7 +82,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { FE(DMUS_OBJ_MEMORY), FE(DMUS_OBJ_STREAM) }; - return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); + return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } /* month number into month name (for debugstr_filetime) */ @@ -506,7 +506,7 @@ const char *debugstr_dmguid (const GUID *id) { unsigned int i; if (!id) return "(null)"; - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(id, guids[i].guid)) return guids[i].name; } -- 2.14.5

1 0

[PATCH 4/4] server: Add NtQueryInformationFile(FileIoCompletionNotificationInformation) implementation.
by Jacek Caban 23 Oct '18

23 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 10 ++++++++++ server/fd.c | 12 ++++++++++++ 2 files changed, 22 insertions(+)

1 0

[PATCH 3/4] ntdll/tests: Add more NtQueryInformationFile tests.
by Jacek Caban 23 Oct '18

23 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)

1 0

[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

[PATCH 4/6] wined3d: Get rid of the "format_id" parameter 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e7b05157ccf..64ceeda5b66 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1341,11 +1341,11 @@ 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, enum wined3d_format_id format_id, unsigned int access, unsigned int bind_flags, - const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) +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, + void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_format *format = wined3d_get_format(device->adapter, format_id, usage); + const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, usage); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; BOOL dynamic_buffer_ok; @@ -1454,7 +1454,7 @@ 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, WINED3DFMT_UNKNOWN, + if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage, desc->access, desc->bind_flags, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); -- 2.11.0

1 0

[PATCH 3/6] wined3d: Store the "buffer_object" in struct wined3d_bo_address as an UINT_PTR.
by Henri Verbeet 23 Oct '18

23 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 127c7b34a0c..6e60c5ae3db 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4212,7 +4212,7 @@ const char *debug_const_bo_address(const struct wined3d_const_bo_address *addres { if (!address) return "(null)"; - return wine_dbg_sprintf("{%#x:%p}", address->buffer_object, address->addr); + return wine_dbg_sprintf("{%#lx:%p}", address->buffer_object, address->addr); } const char *debug_bo_address(const struct wined3d_bo_address *address) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e31e41e798..33d248fcfdd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1461,13 +1461,13 @@ do { \ struct wined3d_bo_address { - GLuint buffer_object; + UINT_PTR buffer_object; BYTE *addr; }; struct wined3d_const_bo_address { - GLuint buffer_object; + UINT_PTR buffer_object; const BYTE *addr; }; -- 2.11.0

1 0

[PATCH 2/6] wined3d: Introduce debug helpers for wined3d_bo_address structures.
by Henri Verbeet 23 Oct '18

23 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/utils.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8199afa1d0e..37abf19d73e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3670,7 +3670,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st if (buffer->fence) context->buffer_fences[context->buffer_fence_count++] = buffer->fence; - TRACE("Load array %u {%#x:%p}.\n", i, element->data.buffer_object, element->data.addr); + TRACE("Load array %u %s.\n", i, debug_bo_address(&element->data)); } if (prev_all_vbo != stream_info->all_vbo) @@ -5068,8 +5068,8 @@ void context_load_tex_coords(const struct wined3d_context *context, const struct { const struct wined3d_stream_info_element *e = &si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx]; - TRACE("Setting up texture %u, idx %d, coord_idx %u, data {%#x:%p}.\n", - texture_idx, mapped_stage, coord_idx, e->data.buffer_object, e->data.addr); + TRACE("Setting up texture %u, idx %u, coord_idx %u, data %s.\n", + texture_idx, mapped_stage, coord_idx, debug_bo_address(&e->data)); if (*current_bo != e->data.buffer_object) { @@ -5386,7 +5386,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, continue; } - TRACE("Loading array %u [VBO=%u].\n", i, element->data.buffer_object); + TRACE("Loading array %u %s.\n", i, debug_bo_address(&element->data)); if (element->stride) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ecbe94b2459..a3d834e8f53 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1927,10 +1927,10 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s BOOL decompress; GLenum target; - TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " + TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data %s, " "src_row_pitch %#x, src_slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u, srgb %#x.\n", texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), - data->buffer_object, data->addr, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); + debug_const_bo_address(data), src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); if (texture->sub_resources[sub_resource_idx].map_count) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9ddfd5c2059..127c7b34a0c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4208,6 +4208,18 @@ const char *debug_vec4(const struct wined3d_vec4 *v) v->x, v->y, v->z, v->w); } +const char *debug_const_bo_address(const struct wined3d_const_bo_address *address) +{ + if (!address) + return "(null)"; + return wine_dbg_sprintf("{%#x:%p}", address->buffer_object, address->addr); +} + +const char *debug_bo_address(const struct wined3d_bo_address *address) +{ + return debug_const_bo_address((const struct wined3d_const_bo_address *)address); +} + const char *debug_d3dformat(enum wined3d_format_id format_id) { switch (format_id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d5bf61271e9..8e31e41e798 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3915,8 +3915,10 @@ void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, */ /* Trace routines */ +const char *debug_bo_address(const struct wined3d_bo_address *address) DECLSPEC_HIDDEN; const char *debug_box(const struct wined3d_box *box) DECLSPEC_HIDDEN; const char *debug_color(const struct wined3d_color *color) DECLSPEC_HIDDEN; +const char *debug_const_bo_address(const struct wined3d_const_bo_address *address) DECLSPEC_HIDDEN; const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx) DECLSPEC_HIDDEN; const char *debug_d3dformat(enum wined3d_format_id format_id) DECLSPEC_HIDDEN; const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/6] wined3d: Validate the initial texture data before initialising the texture.
by Henri Verbeet 23 Oct '18

23 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 15492cd86fe..ecbe94b2459 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3568,8 +3568,10 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct UINT layer_count, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) { + unsigned int sub_count = level_count * layer_count; const struct wined3d_texture_ops *texture_ops; struct wined3d_texture *object; + unsigned int i; HRESULT hr; TRACE("device %p, desc %p, layer_count %u, level_count %u, flags %#x, data %p, " @@ -3630,8 +3632,19 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct return WINED3DERR_INVALIDCALL; } - if (!(object = heap_alloc_zero(FIELD_OFFSET(struct wined3d_texture, - sub_resources[level_count * layer_count])))) + if (data) + { + for (i = 0; i < sub_count; ++i) + { + if (data[i].data) + continue; + + WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); + return E_INVALIDARG; + } + } + + if (!(object = heap_alloc_zero(FIELD_OFFSET(struct wined3d_texture, sub_resources[sub_count])))) return E_OUTOFMEMORY; if (FAILED(hr = wined3d_texture_init(object, desc, layer_count, @@ -3646,21 +3659,8 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct * in this case. */ if (data) { - unsigned int sub_count = level_count * layer_count; unsigned int level, width, height, depth; struct wined3d_box box; - unsigned int i; - - for (i = 0; i < sub_count; ++i) - { - if (!data[i].data) - { - WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); - wined3d_texture_cleanup_sync(object); - heap_free(object); - return E_INVALIDARG; - } - } for (i = 0; i < sub_count; ++i) { -- 2.11.0

1 0

[PATCH 1/3] gdi32: Support other settings for obtaining the default_aa_flags value.
by Byeongsik Jeon 23 Oct '18

23 Oct '18

The global subpixel orientation setting are: 1. fontconfig builtin recommendation 10-sub-pixel-rgb.conf. <match target="pattern"> <edit name="rgba" mode="assign"><const>rgb</const></edit> </match> 2. Current Wine, or the recommendation of some web pages. <match target="font"> <edit name="rgba" mode="assign"><const>rgb</const></edit> </match> This patch allows both situations to return the correct value. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/gdi32/freetype.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5b1a23bf32..f60bdf4990 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2812,6 +2812,15 @@ static void init_fontconfig(void) pFcConfigSubstitute( NULL, pattern, FcMatchFont ); default_aa_flags = parse_aa_pattern( pattern ); pFcPatternDestroy( pattern ); + + if (!default_aa_flags) + { + pattern = pFcPatternCreate(); + pFcConfigSubstitute( NULL, pattern, FcMatchPattern ); + default_aa_flags = parse_aa_pattern( pattern ); + pFcPatternDestroy( pattern ); + } + TRACE( "enabled, default flags = %x\n", default_aa_flags ); fontconfig_enabled = TRUE; } -- 2.19.1

1 3

[PATCH 1/2] dxgi: Add IDXGIAdapter4 stub.
by Nikolay Sivov 23 Oct '18

23 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/adapter.c | 10 ++++++++++ include/wine/winedxgi.idl | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 0079759568..a913870319 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -34,6 +34,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *i TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IWineDXGIAdapter) + || IsEqualGUID(iid, &IID_IDXGIAdapter4) || IsEqualGUID(iid, &IID_IDXGIAdapter3) || IsEqualGUID(iid, &IID_IDXGIAdapter2) || IsEqualGUID(iid, &IID_IDXGIAdapter1) @@ -301,6 +302,13 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNoti FIXME("iface %p, cookie %#x stub!\n", iface, cookie); } +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = { dxgi_adapter_QueryInterface, @@ -325,6 +333,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_SetVideoMemoryReservation, dxgi_adapter_RegisterVideoMemoryBudgetChangeNotificationEvent, dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification, + /* IDXGIAdapter4 methods */ + dxgi_adapter_GetDesc3, }; struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 3a1d6fa064..fccf45d792 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -18,7 +18,7 @@ #pragma makedep header -import "dxgi1_5.idl"; +import "dxgi1_6.idl"; [ object, @@ -56,7 +56,7 @@ interface IWineDXGIDeviceParent : IUnknown local, uuid(17399d75-964e-4c03-99f8-9d4fd196dd62) ] -interface IWineDXGIAdapter : IDXGIAdapter3 +interface IWineDXGIAdapter : IDXGIAdapter4 { } -- 2.19.1

2 2

[PATCH v2] browseui: Implement PROGDLG_AUTOTIME flag for IProgressDialog.
by Alistair Leslie-Hughes 23 Oct '18

23 Oct '18

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45970 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- v2: Use FormatMessage. dlls/browseui/browseui.rc | 5 ++++ dlls/browseui/progressdlg.c | 73 +++++++++++++++++++++++++++++++++++++++++---- dlls/browseui/resids.h | 5 ++++ 3 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 4c612e9..e33b2ad 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -25,6 +25,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { IDS_CANCELLING "Canceling..." + IDS_REMAINING1 "%1!u! %2 remaining" + IDS_REMAINING2 "%1!u! %2 and %3!u! %4 remaining" + IDS_SECONDS "seconds" + IDS_MINUTES "minutes" + IDS_HOURS "hours" } IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 2355b0c..e10d8bd 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -74,6 +74,9 @@ typedef struct tagProgressDialog { ULONGLONG ullCompleted; ULONGLONG ullTotal; HWND hwndDisabledParent; /* For modal dialog: the parent that need to be re-enabled when the dialog ends */ + ULONGLONG startTime; + LPWSTR remainingMsg[2]; + LPWSTR timeMsg[3]; } ProgressDialog; static inline ProgressDialog *impl_from_IProgressDialog(IProgressDialog *iface) @@ -158,6 +161,22 @@ static void update_dialog(ProgressDialog *This, DWORD dwUpdate) } } +static void load_time_strings(ProgressDialog *This) +{ + int i; + + for (i = 0; i < 2; i++) + { + if (!This->remainingMsg[i]) + This->remainingMsg[i] = load_string(BROWSEUI_hinstance, IDS_REMAINING1 + i); + } + for (i = 0; i < 3; i++) + { + if (!This->timeMsg[i]) + This->timeMsg[i] = load_string(BROWSEUI_hinstance, IDS_SECONDS + i); + } +} + static void end_dialog(ProgressDialog *This) { SendMessageW(This->hwnd, WM_DLG_DESTROY, 0, 0); @@ -260,14 +279,18 @@ static DWORD WINAPI dialog_thread(LPVOID lpParameter) static void ProgressDialog_Destructor(ProgressDialog *This) { + int i; TRACE("destroying %p\n", This); if (This->hwnd) end_dialog(This); - heap_free(This->lines[0]); - heap_free(This->lines[1]); - heap_free(This->lines[2]); + for (i = 0; i < 3; i++) + heap_free(This->lines[i]); heap_free(This->cancelMsg); heap_free(This->title); + for (i = 0; i < 2; i++) + heap_free(This->remainingMsg[i]); + for (i = 0; i < 3; i++) + heap_free(This->timeMsg[i]); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); heap_free(This); @@ -329,8 +352,6 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, TRACE("(%p, %p, %x, %p)\n", iface, punkEnableModeless, dwFlags, reserved); if (punkEnableModeless || reserved) FIXME("Reserved parameters not null (%p, %p)\n", punkEnableModeless, reserved); - if (dwFlags & PROGDLG_AUTOTIME) - FIXME("Flags PROGDLG_AUTOTIME not supported\n"); if (dwFlags & PROGDLG_NOTIME) FIXME("Flags PROGDLG_NOTIME not supported\n"); @@ -365,6 +386,10 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, This->hwndDisabledParent = hwndDisable; } + if (dwFlags & PROGDLG_AUTOTIME) + load_time_strings(This); + + This->startTime = GetTickCount64(); LeaveCriticalSection(&This->cs); return S_OK; @@ -422,6 +447,42 @@ static BOOL WINAPI ProgressDialog_HasUserCancelled(IProgressDialog *iface) return This->isCancelled; } +static void update_time_remaining(ProgressDialog *This, ULONGLONG ullCompleted, ULONGLONG ullTotal) +{ + unsigned int remaining, remainder = 0; + ULONGLONG elapsed; + WCHAR line[128]; + int i; + DWORD_PTR args[4]; + + if (!This->startTime || !ullCompleted || !ullTotal) + return; + + elapsed = GetTickCount64() - This->startTime; + remaining = (elapsed * ullTotal / ullCompleted - elapsed) / 1000; + + for (i = 0; remaining >= 60 && i < 2; i++) + { + remainder = remaining % 60; + remaining /= 60; + } + + args[0] = remaining; + args[1] = (DWORD_PTR)This->timeMsg[i]; + args[2] = remainder; + args[3] = (DWORD_PTR)This->timeMsg[i-1]; + + if (i > 0 && remaining < 2 && remainder != 0) + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, + This->remainingMsg[1], 0, 0, line, ARRAY_SIZE(line), (__ms_va_list*)args); + else + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, + This->remainingMsg[0], 0, 0, line, ARRAY_SIZE(line), (__ms_va_list*)args); + + set_buffer(&This->lines[2], line); + This->dwUpdate |= UPDATE_LINE3; +} + static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONGLONG ullCompleted, ULONGLONG ullTotal) { ProgressDialog *This = impl_from_IProgressDialog(iface); @@ -434,6 +495,8 @@ static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONG This->ullCompleted = ullCompleted; This->dwUpdate |= UPDATE_PROGRESS; hwnd = This->hwnd; + if (This->dwFlags & PROGDLG_AUTOTIME) + update_time_remaining(This, ullCompleted, ullTotal); LeaveCriticalSection(&This->cs); if (hwnd) diff --git a/dlls/browseui/resids.h b/dlls/browseui/resids.h index cd44a8e..865cdd1 100644 --- a/dlls/browseui/resids.h +++ b/dlls/browseui/resids.h @@ -21,6 +21,11 @@ #include "commctrl.h" #define IDS_CANCELLING 16 +#define IDS_REMAINING1 17 +#define IDS_REMAINING2 18 +#define IDS_SECONDS 19 +#define IDS_MINUTES 20 +#define IDS_HOURS 21 #define IDC_ANIMATION 100 #define IDC_PROGRESS_BAR 102 -- 1.9.1

1 0

[PATCH v2] odbccp32: Implement SQLConfigDataSource/W
by Alistair Leslie-Hughes 23 Oct '18

23 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 155 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 131 insertions(+), 24 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 694a90c..4ad64c4 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -102,6 +102,32 @@ static inline WCHAR *heap_strdupAtoW(const char *str) return ret; } +static inline WCHAR *heap_attrdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + + if (str) + { + DWORD size = 0, len; + const char *p; + WCHAR *current; + + for (p = str; *p; p += lstrlenA(p) + 1) + { + len = MultiByteToWideChar(CP_ACP, 0, p, -1, NULL, 0); + size += len; + } + + current = ret = heap_alloc_zero( (size+1)*sizeof(WCHAR)); + for (p = str; *p; p += lstrlenA(p) + 1) + { + len = MultiByteToWideChar(CP_ACP, 0, p, -1, current, size); + current += len; + } + } + return ret; +} + BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { @@ -220,30 +246,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng return success; } -BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, - LPCWSTR lpszDriver, LPCWSTR lpszAttributes) -{ - LPCWSTR p; - - clear_errors(); - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszAttributes)); - - for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) - FIXME("%s\n", debugstr_w(p)); - - return TRUE; -} - -BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, - LPCSTR lpszDriver, LPCSTR lpszAttributes) -{ - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszAttributes)); - clear_errors(); - return TRUE; -} - static HMODULE load_config_driver(const WCHAR *driver) { static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; @@ -360,6 +362,111 @@ fail: return FALSE; } +static BOOL call_ConfigDSN(HANDLE mod, HWND hwnd, WORD request, const char *driverA, const char *attributesA, const WCHAR *driverW, const WCHAR *attributesW) +{ + BOOL (WINAPI *pConfigDSN)(HWND hwnd, WORD request, const char *driver, const char *attr); + BOOL (WINAPI *pConfigDSNW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *attr); + BOOL ret = FALSE; + + TRACE("%p, %p, %d, %p, %p, %p %p\n", mod, hwnd, request, driverA, attributesA, driverW, attributesW); + + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + + if (pConfigDSNW) + { + const WCHAR *attr = attributesW; + if(!attr) + attr = heap_attrdupAtoW(attributesA); + + TRACE("Calling ConfigDSNW (%p)\n", pConfigDSNW); + + ret = pConfigDSNW(hwnd, request, driverW, attr); + + if(attr != attributesW) + heap_free((WCHAR *)attr); + } + else if (pConfigDSN) + { + TRACE("Calling pConfigDSN (%p)\n", pConfigDSN); + ret = pConfigDSN(hwnd, request, driverA, attributesA); + } + else + ERR("Neither ConfigDSN or ConfigDSNW found.\n"); + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + return ret; +} + +BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, + LPCWSTR driver, LPCWSTR attributes) +{ + HMODULE hmod; + BOOL ret = FALSE; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); + if (TRACE_ON(odbc)) + { + const WCHAR *p; + for (p = attributes; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + } + + clear_errors(); + + hmod = load_config_driver(driver); + if (!hmod) + return FALSE; + + ret = call_ConfigDSN (hmod, hwnd, request, NULL, NULL, driver, attributes); + + FreeLibrary(hmod); + + return ret; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, + LPCSTR driver, LPCSTR attributes) +{ + HMODULE hmod; + BOOL ret = FALSE; + WCHAR *driverW; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); + + if (TRACE_ON(odbc)) + { + const char *p; + for (p = attributes; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + } + + clear_errors(); + + driverW = heap_strdupAtoW(driver); + if (!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + + hmod = load_config_driver(driverW); + if (!hmod) + { + heap_free(driverW); + return FALSE; + } + + ret = call_ConfigDSN (hmod, hwnd, request, driver, attributes, driverW, NULL); + heap_free(driverW); + + FreeLibrary(hmod); + + return ret; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { -- 1.9.1

1 0

[PATCH] wrc: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 22 Oct '18

22 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/wrc/po.c | 10 +++++----- tools/wrc/utils.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index c72a422f94..74bcf1e6ff 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -602,7 +602,7 @@ static const char *get_language_name( const language_t *lang ) static char name[20]; unsigned int i; - for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + for (i = 0; i < ARRAY_SIZE(languages); i++) if (languages[i].id == lang->id && languages[i].sub == lang->sub) return languages[i].name; @@ -1314,7 +1314,7 @@ static ver_value_t *translate_stringfileinfo( ver_value_t *val, language_t *lang new_blk = new_ver_block(); *new_blk = *blk; name = convert_msgid_ascii( blk->name, 0 ); - for (i = 0; i < sizeof(block_name)/sizeof(block_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(block_name); i++) { if (!strcasecmp( name, english_block_name[i] )) { @@ -1344,7 +1344,7 @@ static ver_value_t *translate_stringfileinfo( ver_value_t *val, language_t *lang val = val->next; } - for (i = 0; i < sizeof(block_name)/sizeof(block_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(block_name); i++) free( block_name[i] ); return head; } @@ -1494,10 +1494,10 @@ void add_translations( const char *po_dir ) if ((p = strchr( buffer, '#' ))) *p = 0; for (tok = strtok( buffer, " \t\r\n" ); tok; tok = strtok( NULL, " \t\r\n" )) { - for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + for (i = 0; i < ARRAY_SIZE(languages); i++) if (!strcmp( tok, languages[i].name )) break; - if (i == sizeof(languages)/sizeof(languages[0])) + if (i == ARRAY_SIZE(languages)) error( "unknown language '%s'\n", tok ); name = strmake( "%s/%s.mo", po_dir, tok ); diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 800692a37e..633ec57d86 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -565,7 +565,7 @@ int get_language_codepage( unsigned short lang, unsigned short sublang ) unsigned int i; int cp = -1, defcp = -1; - for (i = 0; i < sizeof(lang2cps)/sizeof(lang2cps[0]); i++) + for (i = 0; i < ARRAY_SIZE(lang2cps); i++) { if (lang2cps[i].lang != lang) continue; if (lang2cps[i].sublang == sublang) -- 2.14.5

1 0

[PATCH] wmc: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 22 Oct '18

22 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/wmc/lang.c | 7 +++---- tools/wmc/po.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index b045612bb6..07022f7c79 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -162,14 +162,12 @@ static const language_t languages[] = { {0x500A, 850, 1252, "Spanish", "Puerto Rico"} }; -#define NLAN (sizeof(languages)/sizeof(languages[0])) - void show_languages(void) { unsigned int i; printf(" Code | DOS-cp | WIN-cp | Language | Country\n"); printf("-------+--------+--------+--------------+---------\n"); - for(i = 0; i < NLAN; i++) + for(i = 0; i < ARRAY_SIZE(languages); i++) printf("0x%04x | %5d | %5d | %-12s | %s\n", languages[i].id, languages[i].doscp, @@ -185,7 +183,8 @@ static int langcmp(const void *p1, const void *p2) const language_t *find_language(unsigned id) { - return (const language_t *)bsearch(&id, languages, NLAN, sizeof(languages[0]), langcmp); + return (const language_t *)bsearch(&id, languages, ARRAY_SIZE(languages), + sizeof(languages[0]), langcmp); } void show_codepages(void) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 6db02c8a72..3529a5b99c 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -666,10 +666,10 @@ void add_translations( const char *po_dir ) if ((p = strchr( buffer, '#' ))) *p = 0; for (tok = strtok( buffer, " \t\r\n" ); tok; tok = strtok( NULL, " \t\r\n" )) { - for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + for (i = 0; i < ARRAY_SIZE(languages); i++) if (!strcmp( tok, languages[i].name )) break; - if (i == sizeof(languages)/sizeof(languages[0])) + if (i == ARRAY_SIZE(languages)) error( "unknown language '%s'\n", tok ); name = strmake( "%s/%s.mo", po_dir, tok ); -- 2.14.5

1 0

[PATCH] winedump: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 22 Oct '18

22 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winedump/lib.c | 4 ++-- tools/winedump/pe.c | 2 +- tools/winedump/tlb.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index f593515d68..5a7c33aa8b 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -68,8 +68,8 @@ static void dump_import_object(const IMPORT_OBJECT_HEADER *ioh) name = (const char *)ioh + sizeof(*ioh); printf(" DLL name : %s\n", name + strlen(name) + 1); printf(" Symbol name : %s\n", name); - printf(" Type : %s\n", (ioh->Type < sizeof(obj_type)/sizeof(obj_type[0])) ? obj_type[ioh->Type] : "unknown"); - printf(" Name type : %s\n", (ioh->NameType < sizeof(name_type)/sizeof(name_type[0])) ? name_type[ioh->NameType] : "unknown"); + printf(" Type : %s\n", (ioh->Type < ARRAY_SIZE(obj_type)) ? obj_type[ioh->Type] : "unknown"); + printf(" Name type : %s\n", (ioh->NameType < ARRAY_SIZE(name_type)) ? name_type[ioh->NameType] : "unknown"); printf(" %-13s: %u\n", (ioh->NameType == IMPORT_OBJECT_ORDINAL) ? "Ordinal" : "Hint", ioh->u.Ordinal); printf("\n"); } diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 7bbb576104..ca41bb7439 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1654,7 +1654,7 @@ static const char *get_resource_type( unsigned int id ) "RT_MANIFEST" }; - if ((size_t)id < sizeof(types)/sizeof(types[0])) return types[id]; + if ((size_t)id < ARRAY_SIZE(types)) return types[id]; return NULL; } diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index bed53933be..c55c6a9f23 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -1000,7 +1000,7 @@ static void dump_msft_segdir(void) print_begin_block("SegDir"); - for(i=0; i < sizeof(segdir)/sizeof(segdir[0]); i++) + for(i=0; i < ARRAY_SIZE(segdir); i++) dump_msft_seg(segdir+i); print_end_block(); @@ -1010,7 +1010,7 @@ static BOOL dump_offset(void) { int i; - for(i=0; i < sizeof(segdir)/sizeof(segdir[0]); i++) + for(i=0; i < ARRAY_SIZE(segdir); i++) if(segdir[i].offset == offset) return segdir[i].func(segdir+i); -- 2.14.5

1 0

[PATCH] server: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 22 Oct '18

22 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/clipboard.c | 2 +- server/directory.c | 2 +- server/fd.c | 10 +++++----- server/mapping.c | 2 +- server/queue.c | 4 ++-- server/registry.c | 18 +++++++++--------- server/token.c | 11 +++++------ server/trace.c | 2 +- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 160eb46959..162725b2ea 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -214,7 +214,7 @@ static int synthesize_formats( struct clipboard *clipboard ) else free( data ); } - for (i = 0; i < sizeof(formats) / sizeof(formats[0]); i++) + for (i = 0; i < ARRAY_SIZE( formats ); i++) { if (HAS_FORMAT( map, formats[i][0] )) continue; if (HAS_FORMAT( map, formats[i][1] )) from = formats[i][1]; diff --git a/server/directory.c b/server/directory.c index 7ffaedc462..6aa3a55f35 100644 --- a/server/directory.c +++ b/server/directory.c @@ -421,7 +421,7 @@ void init_directories(void) make_object_static( link_mailslot ); /* events */ - for (i = 0; i < sizeof(kernel_events)/sizeof(kernel_events[0]); i++) + for (i = 0; i < ARRAY_SIZE( kernel_events ); i++) { struct event *event = create_event( &dir_kernel->obj, &kernel_events[i], 0, 1, 0, NULL ); make_object_static( (struct object *)event ); diff --git a/server/fd.c b/server/fd.c index b26b111d76..4d077972eb 100644 --- a/server/fd.c +++ b/server/fd.c @@ -535,7 +535,7 @@ static inline void main_loop_epoll(void) if (!active_users) break; /* last user removed by a timeout */ if (epoll_fd == -1) break; /* an error occurred with epoll */ - ret = epoll_wait( epoll_fd, events, sizeof(events)/sizeof(events[0]), timeout ); + ret = epoll_wait( epoll_fd, events, ARRAY_SIZE( events ), timeout ); set_current_time(); /* put the events into the pollfd array first, like poll does */ @@ -646,9 +646,9 @@ static inline void main_loop_epoll(void) ts.tv_sec = timeout / 1000; ts.tv_nsec = (timeout % 1000) * 1000000; - ret = kevent( kqueue_fd, NULL, 0, events, sizeof(events)/sizeof(events[0]), &ts ); + ret = kevent( kqueue_fd, NULL, 0, events, ARRAY_SIZE( events ), &ts ); } - else ret = kevent( kqueue_fd, NULL, 0, events, sizeof(events)/sizeof(events[0]), NULL ); + else ret = kevent( kqueue_fd, NULL, 0, events, ARRAY_SIZE( events ), NULL ); set_current_time(); @@ -750,9 +750,9 @@ static inline void main_loop_epoll(void) ts.tv_sec = timeout / 1000; ts.tv_nsec = (timeout % 1000) * 1000000; - ret = port_getn( port_fd, events, sizeof(events)/sizeof(events[0]), &nget, &ts ); + ret = port_getn( port_fd, events, ARRAY_SIZE( events ), &nget, &ts ); } - else ret = port_getn( port_fd, events, sizeof(events)/sizeof(events[0]), &nget, NULL ); + else ret = port_getn( port_fd, events, ARRAY_SIZE( events ), &nget, NULL ); if (ret == -1) break; /* an error occurred with event completion */ diff --git a/server/mapping.c b/server/mapping.c index affe8fcffa..bc59b21b96 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -695,7 +695,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s /* load the section headers */ pos += sizeof(nt.Signature) + sizeof(nt.FileHeader) + nt.FileHeader.SizeOfOptionalHeader; - if (nt.FileHeader.NumberOfSections > sizeof(sec)/sizeof(sec[0])) return STATUS_INVALID_IMAGE_FORMAT; + if (nt.FileHeader.NumberOfSections > ARRAY_SIZE( sec )) return STATUS_INVALID_IMAGE_FORMAT; size = sizeof(*sec) * nt.FileHeader.NumberOfSections; if (!mapping->size) mapping->size = mapping->image.map_size; else if (mapping->size > mapping->image.map_size) return STATUS_SECTION_TOO_BIG; diff --git a/server/queue.c b/server/queue.c index c479b388bd..f274dfb7aa 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1666,7 +1666,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons queue_hardware_message( desktop, msg, 0 ); } - for (i = 0; i < sizeof(messages)/sizeof(messages[0]); i++) + for (i = 0; i < ARRAY_SIZE( messages ); i++) { if (!messages[i]) continue; if (!(flags & (1 << i))) continue; @@ -1695,7 +1695,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if (hook_flags & SEND_HWMSG_INJECTED) msg_data->flags = LLMHF_INJECTED; /* specify a sender only when sending the last message */ - if (!(flags & ((1 << sizeof(messages)/sizeof(messages[0])) - 1))) + if (!(flags & ((1 << ARRAY_SIZE( messages )) - 1))) { if (!(wait = send_hook_ll_message( desktop, msg, input, sender ))) queue_hardware_message( desktop, msg, 0 ); diff --git a/server/registry.c b/server/registry.c index 8ad97d4987..9e6815d8e3 100644 --- a/server/registry.c +++ b/server/registry.c @@ -178,7 +178,7 @@ static const struct object_ops key_ops = static inline int is_wow6432node( const WCHAR *name, unsigned int len ) { return (len == sizeof(wow6432node) && - !memicmpW( name, wow6432node, sizeof(wow6432node)/sizeof(WCHAR) )); + !memicmpW( name, wow6432node, ARRAY_SIZE( wow6432node ))); } /* @@ -439,9 +439,9 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); if (skip_root && str->len >= sizeof(root_name) && - !memicmpW( str->str, root_name, sizeof(root_name)/sizeof(WCHAR) )) + !memicmpW( str->str, root_name, ARRAY_SIZE( root_name ))) { - str->str += sizeof(root_name)/sizeof(WCHAR); + str->str += ARRAY_SIZE( root_name ); str->len -= sizeof(root_name); } } @@ -691,8 +691,8 @@ static struct key *follow_symlink( struct key *key, int iteration ) path.str = value->data; path.len = (value->len / sizeof(WCHAR)) * sizeof(WCHAR); if (path.len <= sizeof(root_name)) return NULL; - if (memicmpW( path.str, root_name, sizeof(root_name)/sizeof(WCHAR) )) return NULL; - path.str += sizeof(root_name) / sizeof(WCHAR); + if (memicmpW( path.str, root_name, ARRAY_SIZE( root_name ))) return NULL; + path.str += ARRAY_SIZE( root_name ); path.len -= sizeof(root_name); key = root_key; @@ -2052,9 +2052,9 @@ DECL_HANDLER(create_key) class.len = (class.len / sizeof(WCHAR)) * sizeof(WCHAR); if (!objattr->rootdir && name.len >= sizeof(root_name) && - !memicmpW( name.str, root_name, sizeof(root_name)/sizeof(WCHAR) )) + !memicmpW( name.str, root_name, ARRAY_SIZE( root_name ))) { - name.str += sizeof(root_name)/sizeof(WCHAR); + name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); } @@ -2210,9 +2210,9 @@ DECL_HANDLER(load_registry) } if (!objattr->rootdir && name.len >= sizeof(root_name) && - !memicmpW( name.str, root_name, sizeof(root_name)/sizeof(WCHAR) )) + !memicmpW( name.str, root_name, ARRAY_SIZE( root_name ))) { - name.str += sizeof(root_name)/sizeof(WCHAR); + name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); } diff --git a/server/token.c b/server/token.c index 0810a61353..d88f16c4ce 100644 --- a/server/token.c +++ b/server/token.c @@ -791,12 +791,11 @@ struct token *token_create_admin( void ) const SID *user_sid = security_unix_uid_to_sid( getuid() ); ACL *default_dacl = create_default_dacl( user_sid ); - alias_admins_sid = security_sid_alloc( &nt_authority, sizeof(alias_admins_subauth)/sizeof(alias_admins_subauth[0]), + alias_admins_sid = security_sid_alloc( &nt_authority, ARRAY_SIZE( alias_admins_subauth ), alias_admins_subauth ); - alias_users_sid = security_sid_alloc( &nt_authority, sizeof(alias_users_subauth)/sizeof(alias_users_subauth[0]), + alias_users_sid = security_sid_alloc( &nt_authority, ARRAY_SIZE( alias_users_subauth ), alias_users_subauth ); - logon_sid = security_sid_alloc( &nt_authority, sizeof(logon_subauth)/sizeof(logon_subauth[0]), - logon_subauth ); + logon_sid = security_sid_alloc( &nt_authority, ARRAY_SIZE( logon_subauth ), logon_subauth ); if (alias_admins_sid && alias_users_sid && logon_sid && default_dacl) { @@ -836,8 +835,8 @@ struct token *token_create_admin( void ) { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID }, }; static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; - token = create_token( TRUE, user_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), - admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), default_dacl, + token = create_token( TRUE, user_sid, admin_groups, ARRAY_SIZE( admin_groups ), + admin_privs, ARRAY_SIZE( admin_privs ), default_dacl, admin_source, NULL, -1 ); /* we really need a primary group */ assert( token->primary_group ); diff --git a/server/trace.c b/server/trace.c index 36d30213bd..7ad283a249 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1145,7 +1145,7 @@ static void dump_varargs_filesystem_event( const char *prefix, data_size_t size data_size_t len = (offsetof( struct filesystem_event, name[event->len] ) + sizeof(int)-1) / sizeof(int) * sizeof(int); if (size < len) break; - if (event->action < sizeof(actions)/sizeof(actions[0]) && actions[event->action]) + if (event->action < ARRAY_SIZE( actions ) && actions[event->action]) fprintf( stderr, "{action=%s", actions[event->action] ); else fprintf( stderr, "{action=%u", event->action ); -- 2.14.5

1 0

[PATCH 1/4] dwmapi: add initial tests
by Louis Lenders 22 Oct '18

22 Oct '18

This test and tests in last patch tested on Win7 laptop with DWM service both running and stopped Win7 testbots don`t have DWM service enabled so some tests will be skipped there. On win8 and higher DWM is enabled by default Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/dwmapi/tests/Makefile.in | 5 ++ dlls/dwmapi/tests/dwmapi.c | 92 +++++++++++++++++++++++++++++++++++ include/dwmapi.h | 3 ++ include/winerror.h | 2 + 6 files changed, 104 insertions(+) create mode 100644 dlls/dwmapi/tests/Makefile.in create mode 100644 dlls/dwmapi/tests/dwmapi.c diff --git a/configure b/configure index 9d4a7a8b78..0b780a3576 100755 --- a/configure +++ b/configure @@ -19411,6 +19411,7 @@ wine_fn_config_makefile dlls/dssenh/tests enable_tests wine_fn_config_makefile dlls/dswave enable_dswave wine_fn_config_makefile dlls/dswave/tests enable_tests wine_fn_config_makefile dlls/dwmapi enable_dwmapi +wine_fn_config_makefile dlls/dwmapi/tests enable_tests wine_fn_config_makefile dlls/dwrite enable_dwrite wine_fn_config_makefile dlls/dwrite/tests enable_tests wine_fn_config_makefile dlls/dx8vb enable_dx8vb diff --git a/configure.ac b/configure.ac index b64d99e9d1..ecb5b80e74 100644 --- a/configure.ac +++ b/configure.ac @@ -3264,6 +3264,7 @@ WINE_CONFIG_MAKEFILE(dlls/dssenh/tests) WINE_CONFIG_MAKEFILE(dlls/dswave) WINE_CONFIG_MAKEFILE(dlls/dswave/tests) WINE_CONFIG_MAKEFILE(dlls/dwmapi) +WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests) WINE_CONFIG_MAKEFILE(dlls/dwrite) WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) WINE_CONFIG_MAKEFILE(dlls/dx8vb) diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in new file mode 100644 index 0000000000..f365f96c72 --- /dev/null +++ b/dlls/dwmapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dwmapi.dll +IMPORTS = dwmapi + +C_SRCS = \ + dwmapi.c diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c new file mode 100644 index 0000000000..1307206362 --- /dev/null +++ b/dlls/dwmapi/tests/dwmapi.c @@ -0,0 +1,92 @@ +/* + * Unit tests for dwmapi + * + * Copyright 2018 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "dwmapi.h" + +#include "wine/test.h" + +static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL*); +static HRESULT (WINAPI *pDwmEnableComposition)(UINT); + +BOOL dwmenabled; + +static void test_isdwmenabled(void) +{ + HRESULT res; + BOOL ret; + + ret = -1; + res = pDwmIsCompositionEnabled(&ret); + ok((res == S_OK && ret == TRUE) || (res == S_OK && ret == FALSE), "got %x and %d\n", res, ret); + + if (res == S_OK && ret == TRUE) /*to test enable DWM service via services.msc*/ + dwmenabled = TRUE; + else /*to test disable DWM service via services.msc*/ + dwmenabled = FALSE; + + if (dwmenabled) /* disable and reenable dwm*/ + { + ret = -1; + res = pDwmEnableComposition(DWM_EC_DISABLECOMPOSITION); + ok(res == S_OK, "got %x expected S_OK\n", res); + + res = pDwmIsCompositionEnabled(&ret); + ok(res == S_OK && ret == FALSE, "got %x and %d\n", res, ret); + + ret = -1; + res = pDwmEnableComposition(DWM_EC_ENABLECOMPOSITION); + ok(res == S_OK, "got %x\n", res); + + res = pDwmIsCompositionEnabled(&ret); + todo_wine ok(res == S_OK && ret == TRUE, "got %x and %d\n", res, ret); + } + else + { + ret = -1; + res = pDwmEnableComposition(DWM_EC_ENABLECOMPOSITION); /*cannot enable DWM composition this way*/ + todo_wine ok(res == DWM_E_COMPOSITIONDISABLED, "got %x expected S_OK\n", res); + + res = pDwmIsCompositionEnabled(&ret); + ok(res == S_OK && ret == FALSE, "got %x and %d\n", res, ret); + } +} + +START_TEST(dwmapi) +{ + HMODULE hmod = LoadLibraryA("dwmapi.dll"); + + if (!hmod) + { + trace("dwmapi not found, skipping tests\n"); + return; + } + + pDwmIsCompositionEnabled = (void *)GetProcAddress(hmod, "DwmIsCompositionEnabled"); + pDwmEnableComposition = (void *)GetProcAddress(hmod, "DwmEnableComposition"); + + if (!pDwmIsCompositionEnabled || !pDwmEnableComposition) + { + trace("essential function pointers not found, skipping tests\n"); + return; + } + + test_isdwmenabled(); +} diff --git a/include/dwmapi.h b/include/dwmapi.h index b2f39deae5..12527aee62 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -101,6 +101,9 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; +#define DWM_EC_DISABLECOMPOSITION 0 +#define DWM_EC_ENABLECOMPOSITION 1 + #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 diff --git a/include/winerror.h b/include/winerror.h index d78c91e84e..a97b405c34 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3090,6 +3090,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) #define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003) -- 2.17.1

2 5

Integrating FAudio, a reimplementation of XAudio2
by Andrew Eikum 22 Oct '18

22 Oct '18

Hey all, Our current xaudio2 implementation uses OpenAL to do the mixing before sending audio to hardware. We're running up against limitations of the OpenAL API such that it makes sense for us to write our own mixing code. Luckily, someone has already done this. Ethan Lee, who maintains the FNA reimplementation of the XNA game libraries, wrote an implementation of the XAudio2 API called FAudio[1]. FAudio is far more advanced than Wine's current XAudio2 implementation. I'd like to take advantage of his work, rather than re-invent this wheel. Much of this work has already been done, the question is how to upstream the integration into Wine. The licenses are compatible, but the tricky part is Wine isn't the only customer of FAudio, so we have to be mindful of other external requirements on FAudio. I discussed some options with Ethan over private email. You can see the latest reply from Ethan below. I'd like to get more feedback from the community. Does anyone have any other ideas, or strong feelings about the right way to use Ethan's code in Wine? [1] https://github.com/FNA-XNA/FAudio/ Thanks, Andrew ----- Forwarded message from Ethan Lee <flibitijibibo(a)flibitijibibo.com> ----- On 10/18/18 08:40, Andrew Eikum wrote: > On Wed, Oct 17, 2018 at 06:11:37PM -0400, Ethan Lee wrote: > > Since we’re building FAudio directly into the XAudio2 source, how > > should I go about including the source in that folder? I just want to > > be sure I’m doing it in a way that Wine upstream will be okay with; > > codewise I think we’re doing everything okay (no added dependencies, > > FFmpeg is optional, etc.) but since this is effectively a mirror of a > > separate project I wasn’t sure if I needed to do anything more than a > > folder with a README containing FAudio’s Git hash and a date. > > > > Yep, this is going to be the hard part. I can think of a few options, > ranked in order of how I think upstream (Julliard and the rest of the > Wine community) would like it: > > -Make Wine the home of FAudio. We'd import all of the C files, and any > changes to FAudio would have to go through the usual Wine submission > process, including our requirement for tests. You would have to > somehow integrate Wine's source into FNA somehow in order to pull > FAudio into your other builds. The requirement for tests would > actually be a big plus for FAudio in terms of matching Microsoft's > behavior. We aren't sticklers about tests for no reason. I don't know > if this would require a re-license to LGPL; perhaps we can keep just > xaudio2 stuff as zlib. > 1. Probably no to the home change, and definitely no to the license change. One of the big motivations for FAudio's creation was the zlib-licensed implementation, which is mandatory for platforms like iOS/Switch/Sony. Plus, I don't own 100% of the rights, so we'd have to do another relicensing round, which may not go as well as last time. The home change wouldn't be the worst thing but it'd be tough explaining to the average FNA user (and most other devs, now that I think about it) that they have to dig into the Wine tree first. > -Distribute FAudio as a library and build Wine against that. Similar > to how we depend on OpenAL currently. This has some challenges in > terms of getting distro maintainers to bother building it, but I think > it won't be too tough. We can follow VKD3D's lead here in terms of > gathering distro support. If you're not careful when pushing out > FAudio updates, you may break the Wine tests, and our users, which > would be unfortunate (and poorly received by the other Wine devs). > 2. Second best option IMO, though we would need to work around the CoTaskMem exposure in the XAPO/XACT APIs. > -Use a Git submodule. Wine doesn't do this at all currently, but maybe > we could convince them. This would let Wine control precisely which > revision of FAudio is used, preventing regressions due to upstream > changes. It does complicate the Wine build somewhat, and makes > distributing Wine source significantly more complicated. > 3. I'd be okay with this but I could also totally understand why it would be avoided. Git submodules are surprisingly user-unfriendly! We use submodules in FNA but explaining them to new users has definitely taken a few minutes of my time over the years. > -Just copy the source straight over and periodically merge in updates > from FAudio upstream. Git has a subtree-merge feature that can do this > relatively elegantly. This has the disadvantage that we now have two > full copies of the FAudio source that must be maintained, instead of > storing it all at one location. Again, potential licensing > complications. > 4. I think this is the best route, but at the same time I think I can sweeten the deal a whole lot more. One possibility is giving the WASAPI platform entirely to Wine so the team has total control over the platform subsystem (including the license), and while FAudio's core would be primarily developed elsewhere, I can formalize the release process a whole lot more so updates can be reviewed with more consistency, and possibly more participation from Wine maintainers if needed. For example, when Johan sends his xWMA PR the two of us can both do a review of the patchset, and only when both reviews are cleared will we do the merge. At the moment FAudio releases are bundled with FNA releases, which are always on the first of every month, but if the Wine team are more comfortable with FAudio getting dedicated releases (but with the same schedule) I can do that as well.

5 19

[PATCH v2] comctl32: Implement handling of EM_SETCUEBANNER/EM_GETCUEBANNER messages.
by Sergio Gómez Del Real 22 Oct '18

22 Oct '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/comctl32/edit.c | 66 ++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/edit.c | 62 +++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f0180adfbe..f58ceb1a39 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -131,6 +131,7 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ + WCHAR *cue_banner_text; /* * only for multi line controls */ @@ -2181,6 +2182,12 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) x += EDIT_PaintText(es, dc, x, y, line, e - li, li + ll - e, FALSE); } else x += EDIT_PaintText(es, dc, x, y, line, 0, ll, FALSE); + + if (!(es->flags & EF_FOCUSED) && es->cue_banner_text && es->text_length == 0) + { + SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); + TextOutW(dc, x, y, es->cue_banner_text, strlenW(es->cue_banner_text)); + } } @@ -4152,6 +4159,56 @@ static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); } +/********************************************************************* + * + * EM_SETCUEBANNER + * + */ +static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, const WCHAR *cue_text) +{ + SIZE_T str_size; + + if (es->style & ES_MULTILINE || !cue_text) + return FALSE; + + str_size = strlenW(cue_text); + + if (es->cue_banner_text) + heap_free(es->cue_banner_text); + + es->cue_banner_text = heap_alloc((str_size + 1) * sizeof(WCHAR)); + if (!es->cue_banner_text) + return FALSE; + + memcpy(es->cue_banner_text, cue_text, str_size * sizeof(WCHAR)); + es->cue_banner_text[str_size] = 0; + + return TRUE; +} + +/********************************************************************* + * + * EM_GETCUEBANNER + * + */ +static BOOL EDIT_EM_GetCueBanner(EDITSTATE *es, WCHAR *buf, DWORD size) +{ + if (!es->cue_banner_text) + return FALSE; + else + { + if (size > strlenW(es->cue_banner_text)) + size = strlenW(es->cue_banner_text) + 1; + //lstrcpynW(buf, es->cue_banner_text, strlenW(es->cue_banner_text)+1); + //else if (size > 0) + //{ + memcpy(buf, es->cue_banner_text, (size - 1) * sizeof(WCHAR)); + buf[size-1] = 0; + // } + return TRUE; + } +} + /******************************************************************** * @@ -4489,6 +4546,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) SetWindowLongPtrW( es->hwndSelf, 0, 0 ); heap_free(es->undo_text); + heap_free(es->cue_banner_text); heap_free(es); return 0; @@ -4703,6 +4761,14 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR result = EDIT_EM_CharFromPos(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; + case EM_SETCUEBANNER: + result = EDIT_EM_SetCueBanner(es, (const WCHAR *)lParam); + break; + + case EM_GETCUEBANNER: + result = EDIT_EM_GetCueBanner(es, (WCHAR *)wParam, (DWORD)lParam); + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index a5097d1cbb..5ab013efb3 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3061,6 +3061,67 @@ static const struct message killfocus_combined_seq[] = { 0 } }; +static void test_cue_banner(void) +{ + HWND hwnd_edit; + BOOL ret; + static WCHAR testW[5] = {'T','e','s','t',0}; + static WCHAR testcmp1W[] = {'T','e','s','t',0}; + static WCHAR testcmp2W[] = {'T','e','s',0}; + static WCHAR getcuetestW[5]; + static WCHAR emptyW[] = {0}; + + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_SETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + if (ret == FALSE) + { + win_skip("skipping for Win XP and 2003 Server.\n"); + DestroyWindow(hwnd_edit); + return; + } + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)emptyW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, emptyW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + /* EM_GETCUEBANNER's buffer size includes null char */ + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + memset(testW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)testW, (LPARAM)lstrlenW(testcmp1W)+1); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(testW, testcmp1W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(testW)); + memset(testW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)testW, (LPARAM)lstrlenW(testcmp1W)); + ok(lstrcmpW(testW, testcmp2W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(testW)); + DestroyWindow(hwnd_edit); + + /* setting cue banner fails for multi-line edit controls */ + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + + DestroyWindow(hwnd_edit); +} + static void test_change_focus(void) { HWND hwnd, parent_wnd; @@ -3138,6 +3199,7 @@ START_TEST(edit) test_EM_GETLINE(); test_wordbreak_proc(); test_change_focus(); + test_cue_banner(); UnregisterWindowClasses(); -- 2.17.1

1 0

[PATCH] comctl32: Implement handling of EM_SETCUEBANNER/EM_GETCUEBANNER messages.
by Sergio Gómez Del Real 22 Oct '18

22 Oct '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/comctl32/edit.c | 64 ++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/edit.c | 62 ++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f0180adfbe..9800b84749 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -131,6 +131,7 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ + LPWSTR cue_banner_text; /* cue banner string */ /* * only for multi line controls */ @@ -2181,6 +2182,12 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) x += EDIT_PaintText(es, dc, x, y, line, e - li, li + ll - e, FALSE); } else x += EDIT_PaintText(es, dc, x, y, line, 0, ll, FALSE); + + if (!(es->flags & EF_FOCUSED) && es->cue_banner_text && es->text_length == 0) + { + SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); + TextOutW(dc, x, y, es->cue_banner_text, strlenW(es->cue_banner_text)); + } } @@ -4152,6 +4159,54 @@ static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); } +/********************************************************************* + * + * EM_SETCUEBANNER + * + */ +static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL focus, const WCHAR *cue_text) +{ + SIZE_T str_size; + + if (es->style & ES_MULTILINE || !cue_text) + return FALSE; + + str_size = strlenW(cue_text); + + if (es->cue_banner_text) + heap_free(es->cue_banner_text); + + es->cue_banner_text = heap_alloc_zero(ROUND_TO_GROW((str_size + 1) * sizeof(WCHAR))); + if (!es->cue_banner_text) + return FALSE; + + memcpy(es->cue_banner_text, cue_text, str_size * sizeof(WCHAR)); + + return TRUE; +} + +/********************************************************************* + * + * EM_GETCUEBANNER + * + */ +static BOOL EDIT_EM_GetCueBanner(EDITSTATE *es, WCHAR *buf, DWORD size) +{ + if (!es->cue_banner_text) + return FALSE; + else + { + if (size > strlenW(es->cue_banner_text)) + lstrcpynW(buf, es->cue_banner_text, strlenW(es->cue_banner_text)+1); + else if (size > 0) + { + memcpy(buf, es->cue_banner_text, (size - 1) * sizeof(WCHAR)); + buf[size-1] = 0; + } + return TRUE; + } +} + /******************************************************************** * @@ -4490,6 +4545,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) SetWindowLongPtrW( es->hwndSelf, 0, 0 ); heap_free(es->undo_text); heap_free(es); + heap_free(es->cue_banner_text); return 0; } @@ -4703,6 +4759,14 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR result = EDIT_EM_CharFromPos(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; + case EM_SETCUEBANNER: + result = EDIT_EM_SetCueBanner(es, (BOOL)wParam, (const WCHAR *)lParam); + break; + + case EM_GETCUEBANNER: + result = EDIT_EM_GetCueBanner(es, (WCHAR *)wParam, (DWORD)lParam); + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index a5097d1cbb..030c614344 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3061,6 +3061,67 @@ static const struct message killfocus_combined_seq[] = { 0 } }; +static void test_cue_banner(void) +{ + HWND hwnd_edit; + BOOL ret; + static WCHAR testW[80] = {'T','e','s','t',0}; + static WCHAR testcmp1W[] = {'T','e','s','t',0}; + static WCHAR testcmp2W[] = {'T','e','s',0}; + static WCHAR getcuetestW[5]; + static WCHAR emptyW[] = {0}; + + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_SETCUEBANNER should have returned FALSE.\n"); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)emptyW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, emptyW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + /* EM_GETCUEBANNER's buffer size includes null char */ + ret = (BOOL)SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + memset(testW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)testW, (LPARAM)lstrlenW(testcmp1W)+1); + ok(ret == TRUE || + broken(ret == FALSE), /* Win XP */ + "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(testW, testcmp1W) == 0 || + broken(lstrcmpW(testW, testcmp1W) == -1), /* Win XP, Server 2003 */ + "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(testW)); + memset(testW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)testW, (LPARAM)lstrlenW(testcmp1W)); + ok(lstrcmpW(testW, testcmp2W) == 0 || + broken(lstrcmpW(testW, testcmp1W) == -1), /* Win XP, Server 2003 */ + "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(testW)); + DestroyWindow(hwnd_edit); + + /* setting cue banner fails for multi-line edit controls */ + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + ret = (BOOL)SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + + DestroyWindow(hwnd_edit); +} + static void test_change_focus(void) { HWND hwnd, parent_wnd; @@ -3138,6 +3199,7 @@ START_TEST(edit) test_EM_GETLINE(); test_wordbreak_proc(); test_change_focus(); + test_cue_banner(); UnregisterWindowClasses(); -- 2.17.1

3 2

[PATCH] winex11.drv: Force changing lock keys state if hooks blocked keyboard input processing.
by Jacek Caban 22 Oct '18

22 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This fixes https://github.com/ValveSoftware/Proton/issues/911 If the game is ran with numlock enabled, Wine will try to sync on the first key event. The game uses dinput in exclusive mode, so our low level keyboard hook prevents simulated numlock press in update_lock_state. Thus, we simulate the same key press again on following key events. It means that all key events will result in two events on Wine side: (simulated) numlock press and the actual key press. The patch avoids that by forcing Wine-side state to be the same as X server state. For this particular case, the game could theoretically be fixed on dinput side (as part of rewrite on top of HID?), but it's still a bug in winex11.drv that any other hooks could expose. dlls/winex11.drv/keyboard.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)

1 0

[PATCH] gdiplus: Implement GdipMultiplyPenTransform().
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/pen.c | 7 +------ dlls/gdiplus/tests/pen.c | 35 +++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 1f18f3f5a3..ad45bcb5d5 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -496,17 +496,12 @@ GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen *pen, REAL angle, GpMatrixOrder GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *pen, GDIPCONST GpMatrix *matrix, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%p,%u)\n", pen, matrix, order); if(!pen) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return GdipMultiplyMatrix(&pen->transform, matrix, order); } GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 6f69c3b8b4..530967afb2 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -553,6 +553,41 @@ static void test_transform(void) expectf(1.0, values[4]); expectf(-2.0, values[5]); + /* Multiply */ + status = GdipResetPenTransform(pen); + expect(Ok, status); + + status = GdipSetMatrixElements(matrix, 2.0, 1.0, 1.0, 4.0, 1.0, 2.0); + expect(Ok, status); + + status = GdipMultiplyPenTransform(NULL, matrix, MatrixOrderPrepend); + expect(InvalidParameter, status); + + status = GdipMultiplyPenTransform(pen, matrix, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(2.0, values[0]); + expectf(1.0, values[1]); + expectf(1.0, values[2]); + expectf(4.0, values[3]); + expectf(1.0, values[4]); + expectf(2.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipMultiplyPenTransform(pen, matrix, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(-2.0, values[0]); + expectf(-36.0, values[1]); + expectf(-36.0, values[2]); + expectf(-158.0, values[3]); + expectf(-15.0, values[4]); + expectf(-76.0, values[5]); + GdipDeletePen(pen); GdipDeleteMatrix(matrix); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 628db82d45..5593ac51b6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -629,6 +629,7 @@ GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*); GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *, GpMatrix *); +GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *,GDIPCONST GpMatrix *,GpMatrixOrder); GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*); GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); -- 2.19.1

2 1

[PATCH] d2d1: Implement d2d_device_context_ID2D1DeviceContext_DrawGlyphRun().
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 156 +++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 77 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 2593413661..97ed17394a 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,85 @@ 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", + 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, 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: + ; + } + + 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); } static void STDMETHODCALLTYPE d2d_device_context_DrawImage(ID2D1DeviceContext *iface, ID2D1Image *image, -- 2.19.1

1 0

[PATCH 4/4] crypt32: Add support for importing public key information to a 3rd party CSP.
by Dmitry Timoshkov 22 Oct '18

22 Oct '18

Based on a patch by Alexander Morozov. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/encode.c | 35 +++++++++++++++++++++++++++++++---- include/wincrypt.h | 1 + 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 9a9850d683..9d052b61c1 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4974,21 +4974,48 @@ BOOL WINAPI CryptImportPublicKeyInfo(HCRYPTPROV hCryptProv, 0, 0, NULL, phKey); } -static BOOL WINAPI CRYPT_ImportRsaPublicKeyInfoEx(HCRYPTPROV hCryptProv, +typedef BOOL (WINAPI *ConvertPublicKeyInfoFunc)(DWORD dwCertEncodingType, + PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, + BYTE **ppbData, DWORD *dwDataLen); + +static BOOL WINAPI CRYPT_ImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, void *pvAuxInfo, HCRYPTKEY *phKey) { + static HCRYPTOIDFUNCSET set = NULL; + ConvertPublicKeyInfoFunc convertFunc = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; BOOL ret; - DWORD pubKeySize = 0; + DWORD pubKeySize; + LPBYTE pubKey; TRACE_(crypt)("(%08lx, %08x, %p, %08x, %08x, %p, %p)\n", hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_CONVERT_PUBLIC_KEY_INFO_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, pInfo->Algorithm.pszObjId, + 0, (void **)&convertFunc, &hFunc); + if (convertFunc) + { + pubKey = NULL; + pubKeySize = 0; + ret = convertFunc(dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, &pubKey, &pubKeySize); + if (ret) + { + ret = CryptImportKey(hCryptProv, pubKey, pubKeySize, 0, 0, phKey); + CryptMemFree(pubKey); + } + + CryptFreeOIDFunctionAddress(hFunc, 0); + return ret; + } + ret = CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, pInfo->PublicKey.pbData, pInfo->PublicKey.cbData, 0, NULL, &pubKeySize); if (ret) { - LPBYTE pubKey = CryptMemAlloc(pubKeySize); + pubKey = CryptMemAlloc(pubKeySize); if (pubKey) { @@ -5031,7 +5058,7 @@ BOOL WINAPI CryptImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, CryptGetOIDFunctionAddress(set, dwCertEncodingType, pInfo->Algorithm.pszObjId, 0, (void **)&importFunc, &hFunc); if (!importFunc) - importFunc = CRYPT_ImportRsaPublicKeyInfoEx; + importFunc = CRYPT_ImportPublicKeyInfoEx; ret = importFunc(hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); if (hFunc) diff --git a/include/wincrypt.h b/include/wincrypt.h index 0ba3b5ef79..bcb67ff091 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2345,6 +2345,7 @@ static const WCHAR CERT_TRUST_PUB_AUTHENTICODE_FLAGS_VALUE_NAME[] = #define CRYPT_OID_IMPORT_PRIVATE_KEY_INFO_FUNC "CryptDllImportPrivateKeyInfoEx" #define CRYPT_OID_VERIFY_CERTIFICATE_CHAIN_POLICY_FUNC \ "CertDllVerifyCertificateChainPolicy" +#define CRYPT_OID_CONVERT_PUBLIC_KEY_INFO_FUNC "CryptDllConvertPublicKeyInfo" #define URL_OID_GET_OBJECT_URL_FUNC "UrlDllGetObjectUrl" #define TIME_VALID_OID_GET_OBJECT_FUNC "TimeValidDllGetObject" #define CMSG_OID_GEN_CONTENT_ENCRYPT_KEY_FUNC "CryptMsgDllGenContentEncryptKey" -- 2.17.1

1 0

[PATCH 3/4] crypt32: Add support for exporting public key information from a 3rd party CSP.
by Dmitry Timoshkov 22 Oct '18

22 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/encode.c | 90 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 62d2bc91f7..9a9850d683 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4779,20 +4779,22 @@ BOOL WINAPI CryptExportPublicKeyInfo(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, NULL, 0, NULL, pInfo, pcbInfo); } -static BOOL WINAPI CRYPT_ExportRsaPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, +typedef BOOL (WINAPI *EncodePublicKeyAndParametersFunc)(DWORD dwCertEncodingType, + LPSTR pszPublicKeyObjId, BYTE *pbPubKey, DWORD cbPubKey, DWORD dwFlags, void *pvAuxInfo, + BYTE **ppPublicKey, DWORD *pcbPublicKey, BYTE **ppbParams, DWORD *pcbParams); + +static BOOL WINAPI CRYPT_ExportPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, DWORD dwKeySpec, DWORD dwCertEncodingType, LPSTR pszPublicKeyObjId, DWORD dwFlags, void *pvAuxInfo, PCERT_PUBLIC_KEY_INFO pInfo, DWORD *pcbInfo) { BOOL ret; HCRYPTKEY key; - static CHAR oid[] = szOID_RSA_RSA; + static CHAR rsa_oid[] = szOID_RSA_RSA; TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %d)\n", hCryptProv, dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, pvAuxInfo, pInfo, pInfo ? *pcbInfo : 0); - if (!pszPublicKeyObjId) - pszPublicKeyObjId = oid; if ((ret = CryptGetUserKey(hCryptProv, dwKeySpec, &key))) { DWORD keySize = 0; @@ -4800,16 +4802,86 @@ static BOOL WINAPI CRYPT_ExportRsaPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDL ret = CryptExportKey(key, 0, PUBLICKEYBLOB, 0, NULL, &keySize); if (ret) { - LPBYTE pubKey = CryptMemAlloc(keySize); + PUBLICKEYSTRUC *pubKey = CryptMemAlloc(keySize); if (pubKey) { - ret = CryptExportKey(key, 0, PUBLICKEYBLOB, 0, pubKey, - &keySize); + ret = CryptExportKey(key, 0, PUBLICKEYBLOB, 0, (BYTE *)pubKey, &keySize); if (ret) { - DWORD encodedLen = 0; + DWORD encodedLen; + + if (!pszPublicKeyObjId) + { + static HCRYPTOIDFUNCSET set; + EncodePublicKeyAndParametersFunc encodeFunc = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; + + pszPublicKeyObjId = (LPSTR)CertAlgIdToOID(pubKey->aiKeyAlg); + TRACE("public key algid %#x (%s)\n", pubKey->aiKeyAlg, debugstr_a(pszPublicKeyObjId)); + + if (!set) /* FIXME: there is no a public macro */ + set = CryptInitOIDFunctionSet("CryptDllEncodePublicKeyAndParameters", 0); + + CryptGetOIDFunctionAddress(set, dwCertEncodingType, pszPublicKeyObjId, 0, (void **)&encodeFunc, &hFunc); + if (encodeFunc) + { + BYTE *key_data = NULL; + DWORD key_size = 0; + BYTE *params = NULL; + DWORD params_size = 0; + + ret = encodeFunc(dwCertEncodingType, pszPublicKeyObjId, (BYTE *)pubKey, keySize, + dwFlags, pvAuxInfo, &key_data, &key_size, &params, &params_size); + if (ret) + { + DWORD oid_size = strlen(pszPublicKeyObjId) + 1; + DWORD size_needed = sizeof(*pInfo) + oid_size + key_size + params_size; + + if (!pInfo) + *pcbInfo = size_needed; + else if (*pcbInfo < size_needed) + { + *pcbInfo = size_needed; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbInfo = size_needed; + pInfo->Algorithm.pszObjId = (char *)(pInfo + 1); + lstrcpyA(pInfo->Algorithm.pszObjId, pszPublicKeyObjId); + if (params) + { + pInfo->Algorithm.Parameters.cbData = params_size; + pInfo->Algorithm.Parameters.pbData = (BYTE *)pInfo->Algorithm.pszObjId + oid_size; + memcpy(pInfo->Algorithm.Parameters.pbData, params, params_size); + } + else + { + pInfo->Algorithm.Parameters.cbData = 0; + pInfo->Algorithm.Parameters.pbData = NULL; + } + pInfo->PublicKey.pbData = (BYTE *)pInfo->Algorithm.pszObjId + oid_size + params_size; + pInfo->PublicKey.cbData = key_size; + memcpy(pInfo->PublicKey.pbData, key_data, key_size); + pInfo->PublicKey.cUnusedBits = 0; + } + + CryptMemFree(key_data); + CryptMemFree(params); + } + + CryptMemFree(pubKey); + CryptFreeOIDFunctionAddress(hFunc, 0); + return ret; + } + + /* fallback to RSA */ + pszPublicKeyObjId = rsa_oid; + } + encodedLen = 0; ret = CryptEncodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, pubKey, NULL, &encodedLen); if (ret) @@ -4887,7 +4959,7 @@ BOOL WINAPI CryptExportPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptPro 0, (void **)&exportFunc, &hFunc); } if (!exportFunc) - exportFunc = CRYPT_ExportRsaPublicKeyInfoEx; + exportFunc = CRYPT_ExportPublicKeyInfoEx; ret = exportFunc(hCryptProv, dwKeySpec, dwCertEncodingType, pszPublicKeyObjId, dwFlags, pvAuxInfo, pInfo, pcbInfo); if (hFunc) -- 2.17.1

1 0

[PATCH 2/4] crypt32: Make I_CryptGetDefaultCryptProv hot-patchable.
by Dmitry Timoshkov 22 Oct '18

22 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 79a0ce1fd3..d93fb91677 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -174,7 +174,7 @@ BOOL WINAPI I_CryptGetOssGlobal(DWORD x) return FALSE; } -HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(DWORD reserved) +HCRYPTPROV WINAPI DECLSPEC_HOTPATCH I_CryptGetDefaultCryptProv(DWORD reserved) { HCRYPTPROV ret; -- 2.17.1

1 0

[PATCH 1/4] crypt32/tests: Actually test the return value of CryptGetKeyParam.
by Dmitry Timoshkov 22 Oct '18

22 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/tests/encode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 4a6626ab00..2da2a87b08 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8435,7 +8435,7 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) ok(ret, "CryptImportPublicKeyInfoEx failed: %08x\n", GetLastError()); dwSize = sizeof(ai); - CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); + ret = CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); ok(ret, "CryptGetKeyParam failed: %08x\n", GetLastError()); if(ret) { @@ -8451,7 +8451,7 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) ok(ret, "CryptImportPublicKeyInfoEx failed: %08x\n", GetLastError()); dwSize = sizeof(ai); - CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); + ret = CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); ok(ret, "CryptGetKeyParam failed: %08x\n", GetLastError()); if(ret) { -- 2.17.1

1 0

[PATCH v5] gdi32: Support the gamma correction for the subpixel rendering.
by Byeongsik Jeon 22 Oct '18

22 Oct '18

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v5: Fix the reproduced thread safety problem. dlls/gdi32/dc.c | 1 + dlls/gdi32/dibdrv/dibdrv.h | 8 +++++- dlls/gdi32/dibdrv/graphics.c | 18 +++++++------ dlls/gdi32/dibdrv/primitives.c | 49 +++++++++++++++++++++++++--------- dlls/gdi32/font.c | 43 +++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 10 +++++++ 6 files changed, 108 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 892d3e9744..8ee8a52d94 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -168,6 +168,7 @@ static void free_dc_state( DC *dc ) if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); if (dc->region) DeleteObject( dc->region ); if (dc->path) free_gdi_path( dc->path ); + HeapFree( GetProcessHeap(), 0, dc->font_gamma_ramp ); HeapFree( GetProcessHeap(), 0, dc ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f79f5b0867..02164c9692 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -85,6 +85,12 @@ struct intensity_range BYTE b_min, b_max; }; +struct font_intensities +{ + struct intensity_range ranges[17]; + struct font_gamma_ramp *gamma_ramp; +}; + typedef struct dibdrv_physdev { struct gdi_physdev dev; @@ -192,7 +198,7 @@ typedef struct primitive_funcs void (* draw_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges); void (* draw_subpixel_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ); + const POINT *origin, DWORD text_pixel, const struct font_gamma_ramp *gamma_ramp); DWORD (* get_pixel)(const dib_info *dib, int x, int y); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); COLORREF (* pixel_to_colorref)(const dib_info *dib, DWORD pixel); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 08f8c3d6d2..7d71fbb12a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -683,8 +683,8 @@ static inline void get_text_bkgnd_masks( DC *dc, const dib_info *dib, rop_mask * static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics, const dib_info *glyph_dib, DWORD text_color, - const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, - RECT *bounds ) + const struct font_intensities *intensity, + const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; RECT rect, clipped_rect; @@ -705,10 +705,10 @@ static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics if (glyph_dib->bit_count == 32) dib->funcs->draw_subpixel_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color ); + text_color, intensity->gamma_ramp ); else dib->funcs->draw_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color, ranges ); + text_color, intensity->ranges ); } } } @@ -816,7 +816,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT struct cached_glyph *glyph; dib_info glyph_dib; DWORD text_color; - struct intensity_range ranges[17]; + struct font_intensities intensity; glyph_dib.bit_count = get_glyph_depth( font->aa_flags ); glyph_dib.rect.left = 0; @@ -826,8 +826,10 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT text_color = get_pixel_color( dc, dib, dc->textColor, TRUE ); - if (glyph_dib.bit_count == 8) - get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), ranges ); + if (glyph_dib.bit_count == 32) + intensity.gamma_ramp = dc->font_gamma_ramp; + else + get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), intensity.ranges ); for (i = 0; i < count; i++) { @@ -841,7 +843,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT glyph_dib.stride = get_dib_stride( glyph->metrics.gmBlackBoxX, glyph_dib.bit_count ); glyph_dib.bits.ptr = glyph->bits; - draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, ranges, clipped_rects, bounds ); + draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, &intensity, clipped_rects, bounds ); if (dx) { diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 0d097b2da6..01a1c7c1d8 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -6272,16 +6272,35 @@ static void draw_glyph_null( const dib_info *dib, const RECT *rect, const dib_in { return; } +static inline BYTE blend_color_gamma( BYTE dst, BYTE text, BYTE alpha, + const struct font_gamma_ramp *gamma_ramp ) +{ + if (alpha == 0) return dst; + if (alpha == 255) return text; + if (dst == text) return dst; + + return gamma_ramp->encode[ blend_color( gamma_ramp->decode[dst], + gamma_ramp->decode[text], + alpha ) ]; +} -static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) +static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha, + const struct font_gamma_ramp *gamma_ramp ) { + if (gamma_ramp != NULL && gamma_ramp->gamma != 1000) + { + return blend_color_gamma( r, text >> 16, (BYTE)(alpha >> 16), gamma_ramp ) << 16 | + blend_color_gamma( g, text >> 8, (BYTE)(alpha >> 8), gamma_ramp ) << 8 | + blend_color_gamma( b, text, (BYTE) alpha, gamma_ramp ); + } return blend_color( r, text >> 16, (BYTE)(alpha >> 16) ) << 16 | blend_color( g, text >> 8, (BYTE)(alpha >> 8) ) << 8 | blend_color( b, text, (BYTE) alpha ); } static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6292,7 +6311,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con for (x = 0; x < rect->right - rect->left; x++) { if (glyph_ptr[x] == 0) continue; - dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], text_pixel, glyph_ptr[x] ); + dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], + text_pixel, glyph_ptr[x], gamma_ramp ); } dst_ptr += dib->stride / 4; glyph_ptr += glyph->stride / 4; @@ -6300,7 +6320,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con } static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6319,7 +6340,7 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], gamma_ramp ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 4; @@ -6328,7 +6349,8 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { BYTE *dst_ptr = get_pixel_ptr_24( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6341,7 +6363,7 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const { if (glyph_ptr[x] == 0) continue; val = blend_subpixel( dst_ptr[x * 3 + 2], dst_ptr[x * 3 + 1], dst_ptr[x * 3], - text_pixel, glyph_ptr[x] ); + text_pixel, glyph_ptr[x], gamma_ramp ); dst_ptr[x * 3] = val; dst_ptr[x * 3 + 1] = val >> 8; dst_ptr[x * 3 + 2] = val >> 16; @@ -6352,7 +6374,8 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6371,7 +6394,7 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons val = blend_subpixel( ((dst_ptr[x] >> 7) & 0xf8) | ((dst_ptr[x] >> 12) & 0x07), ((dst_ptr[x] >> 2) & 0xf8) | ((dst_ptr[x] >> 7) & 0x07), ((dst_ptr[x] << 3) & 0xf8) | ((dst_ptr[x] >> 2) & 0x07), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); } dst_ptr += dib->stride / 2; @@ -6380,7 +6403,8 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons } static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6399,7 +6423,7 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 2; @@ -6408,7 +6432,8 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_null( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { return; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5c67d5b518..59cb73bd9f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -729,6 +729,47 @@ static void update_font_code_page( DC *dc, HANDLE font ) TRACE("charset %d => cp %d\n", charset, dc->font_code_page); } +static struct font_gamma_ramp *get_font_gamma_ramp( void ) +{ + static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'D','e','s','k','t','o','p',0 }; + static const WCHAR smoothing_gamma[] = { 'F','o','n','t','S','m','o','o','t','h','i','n','g', + 'G','a','m','m','a',0 }; + const DWORD gamma_default = 1400; + struct font_gamma_ramp *ramp; + DWORD i, gamma; + HKEY key; + + ramp = HeapAlloc( GetProcessHeap(), 0, sizeof(*ramp) ); + if ( ramp == NULL) return NULL; + + gamma = gamma_default; + if (RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key ) == ERROR_SUCCESS) + { + if (get_key_value( key, smoothing_gamma, &gamma ) || gamma == 0) + gamma = gamma_default; + RegCloseKey( key ); + + 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. */ + gamma = 1000 * gamma / 1400; + + for (i = 0; i < 256; i++) + { + ramp->encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; + ramp->decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; + } + + ramp->gamma = gamma; + TRACE("gamma %d\n", ramp->gamma); + + return ramp; +} + /*********************************************************************** * FONT_SelectObject */ @@ -754,6 +795,8 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) dc->hFont = handle; dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; update_font_code_page( dc, handle ); + if (dc->font_gamma_ramp == NULL) + dc->font_gamma_ramp = get_font_gamma_ramp(); GDI_dec_ref_count( ret ); } else GDI_dec_ref_count( handle ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5b09b84846..920cd1e7bf 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -99,6 +99,8 @@ typedef struct tagDC struct gdi_path *path; + struct font_gamma_ramp *font_gamma_ramp; + UINT font_code_page; WORD ROPmode; WORD polyFillMode; @@ -270,6 +272,14 @@ extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DE /* enhmetafile.c */ extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on_disk ) DECLSPEC_HIDDEN; +/* font.c */ +struct font_gamma_ramp +{ + DWORD gamma; + BYTE encode[256]; + BYTE decode[256]; +}; + /* freetype.c */ /* Undocumented structure filled in by GetFontRealizationInfo */ -- 2.19.1

2 1

[PATCH 2/4] d3d11/tests: Add a test for D3D11_STANDARD_MULTISAMPLE_PATTERN.
by Henri Verbeet 22 Oct '18

22 Oct '18

From: Andrew Wesie <awesie(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45197 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 010139c7e0d..632ef4f3538 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28529,6 +28529,127 @@ static void test_render_a8(void) release_test_context(&test_context); } +static void test_standard_pattern(void) +{ + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + struct d3d11_test_context test_context; + struct swapchain_desc swapchain_desc; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11UnorderedAccessView *uav; + D3D11_BUFFER_DESC buffer_desc; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Buffer *buffer; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD ps_samplepos[] = + { +#if 0 + Texture2DMS<float> t; + RWByteAddressBuffer u; + + float4 main() : SV_Target + { + u.Store2(0, asuint(t.GetSamplePosition(0))); + u.Store2(8, asuint(t.GetSamplePosition(1))); + u.Store2(16, asuint(t.GetSamplePosition(2))); + u.Store2(24, asuint(t.GetSamplePosition(3))); + return float4(0.0f, 1.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0xa1db77e8, 0x804d8862, 0x0e3c213d, 0x2703dec6, 0x00000001, 0x00000190, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000118, 0x00000050, 0x00000046, + 0x0100086a, 0x04002058, 0x00107000, 0x00000000, 0x00005555, 0x0300009d, 0x0011e000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0800006e, 0x00100032, 0x00000000, + 0x00107046, 0x00000000, 0x00004001, 0x00000000, 0x00000000, 0x0800006e, 0x001000c2, 0x00000000, + 0x00107406, 0x00000000, 0x00004001, 0x00000001, 0x00000000, 0x070000a6, 0x0011e0f2, 0x00000001, + 0x00004001, 0x00000000, 0x00100e46, 0x00000000, 0x0800006e, 0x00100032, 0x00000000, 0x00107046, + 0x00000000, 0x00004001, 0x00000002, 0x00000000, 0x0800006e, 0x001000c2, 0x00000000, 0x00107406, + 0x00000000, 0x00004001, 0x00000003, 0x00000000, 0x070000a6, 0x0011e0f2, 0x00000001, 0x00004001, + 0x00000010, 0x00100e46, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e + }; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const unsigned int zero[4] = {0}; + static const float standard_pos4[] = + { + -2 / 16.0f, -6 / 16.0f, + 6 / 16.0f, -2 / 16.0f, + -6 / 16.0f, 2 / 16.0f, + 2 / 16.0f, 6 / 16.0f, + }; + + swapchain_desc.windowed = TRUE; + swapchain_desc.buffer_count = 1; + swapchain_desc.width = 32; + swapchain_desc.height = 32; + swapchain_desc.swap_effect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.flags = 0; + if (!init_test_context_ext(&test_context, &feature_level, &swapchain_desc)) + return; + device = test_context.device; + context = test_context.immediate_context; + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.SampleDesc.Count = 4; + texture_desc.SampleDesc.Quality = D3D11_STANDARD_MULTISAMPLE_PATTERN; + texture_desc.BindFlags |= D3D11_BIND_SHADER_RESOURCE; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + uav_desc.Format = DXGI_FORMAT_R32_TYPELESS; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + U(uav_desc).Buffer.FirstElement = 0; + U(uav_desc).Buffer.NumElements = 256; + U(uav_desc).Buffer.Flags = D3D11_BUFFER_UAV_FLAG_RAW; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_samplepos, sizeof(ps_samplepos), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, + 1, &test_context.backbuffer_rtv, NULL, 1, 1, &uav, NULL); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + get_buffer_readback(buffer, &rb); + for (i = 0; i < ARRAY_SIZE(standard_pos4); ++i) + { + float data = get_readback_float(&rb, i, 0); + /* Wine does not support GetSamplePosition. */ + todo_wine ok(data == standard_pos4[i], "Got sample position %.8e, expected %.8e.\n", data, standard_pos4[i]); + } + release_resource_readback(&rb); + + ID3D11PixelShader_Release(ps); + ID3D11Buffer_Release(buffer); + ID3D11UnorderedAccessView_Release(uav); + ID3D11ShaderResourceView_Release(srv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -28679,6 +28800,7 @@ START_TEST(d3d11) queue_test(test_depth_clip); queue_test(test_staging_buffers); queue_test(test_render_a8); + queue_test(test_standard_pattern); run_queued_tests(); } -- 2.11.0

2 1

[PATCH 4/4] d3drm/tests: Add tests for IDirect3DRM*_LoadTexture().
by Henri Verbeet 22 Oct '18

22 Oct '18

From: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3drm/tests/d3drm.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a2ea1827ee4..9bc9a84444a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5598,6 +5598,49 @@ static void test_load_texture(void) ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); ref1 = get_refcount((IUnknown *)d3drm1); + /* Test all failures together. */ + texture1 = (IDirect3DRMTexture *)0xdeadbeef; + hr = IDirect3DRM_LoadTexture(d3drm1, NULL, &texture1); + todo_wine ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture1, "Got unexpected texture %p.\n", texture1); + texture1 = (IDirect3DRMTexture *)0xdeadbeef; + hr = IDirect3DRM_LoadTexture(d3drm1, "", &texture1); + todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture1, "Got unexpected texture %p.\n", texture1); + if (hr == D3DRMERR_FILENOTFOUND) + { + hr = IDirect3DRM_LoadTexture(d3drm1, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + } + + texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; + hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, &texture2); + todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture2, "Got unexpected texture %p.\n", texture2); + texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; + hr = IDirect3DRM2_LoadTexture(d3drm2, "", &texture2); + todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture2, "Got unexpected texture %p.\n", texture2); + if (hr == D3DRMERR_FILENOTFOUND) + { + hr = IDirect3DRM2_LoadTexture(d3drm2, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + } + + texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; + hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, &texture3); + todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture3, "Got unexpected texture %p.\n", texture3); + texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; + hr = IDirect3DRM_LoadTexture(d3drm3, "", &texture3); + todo_wine ok(hr == D3DRMERR_FILENOTFOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!texture3, "Got unexpected texture %p.\n", texture3); + if (hr == D3DRMERR_FILENOTFOUND) + { + hr = IDirect3DRM3_LoadTexture(d3drm3, NULL, NULL); + ok(hr == D3DRMERR_BADVALUE, "Got unexpected hr %#x.\n", hr); + } + for (i = 0; i < ARRAY_SIZE(tests); ++i) { filename = create_bitmap(tests[i].w, tests[i].h, tests[i].palettized); -- 2.11.0

1 0

[PATCH 3/4] d3drm/tests: Add tests for IDirect3DRMTexture*_InitFromFile().
by Henri Verbeet 22 Oct '18

22 Oct '18

From: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3drm/tests/d3drm.c | 83 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f78e098fec0..a2ea1827ee4 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5569,10 +5569,11 @@ static void test_load_texture(void) IDirect3DRM3 *d3drm3; IDirect3DRM2 *d3drm2; IDirect3DRM *d3drm1; + ULONG ref1, ref2; + unsigned int i; char *filename; HRESULT hr; BOOL ret; - int i; static const struct { @@ -5595,6 +5596,7 @@ static void test_load_texture(void) ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -5602,26 +5604,80 @@ static void test_load_texture(void) hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + /* InitFromFile() seems to AddRef() IDirect3DRM even if it fails. */ + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture_GetImage(texture1); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture_Release(texture1); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, + NULL, &IID_IDirect3DRMTexture, (void **)&texture1); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 1, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture2_Release(texture2); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, + NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); /* Test whether querying a version 1 texture from version 3 causes a * change in the loading behavior. */ hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1); @@ -5629,9 +5685,26 @@ static void test_load_texture(void) d3drm_img = IDirect3DRMTexture_GetImage(texture1); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); IDirect3DRMTexture3_Release(texture3); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, + NULL, &IID_IDirect3DRMTexture3, (void **)&texture3); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture3_Release(texture3); ret = DeleteFileA(filename); ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename); -- 2.11.0

1 0

[PATCH 1/4] wined3d: Implement D3D11_STANDARD_MULTISAMPLE_PATTERN.
by Henri Verbeet 22 Oct '18

22 Oct '18

From: Andrew Wesie <awesie(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45197 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 8 +++++--- include/wine/wined3d.h | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b8e7ef03489..15492cd86fe 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -627,6 +627,8 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture unsigned int samples = wined3d_texture_get_gl_sample_count(texture); GLsizei height = wined3d_texture_get_level_pow2_height(texture, 0); GLsizei width = wined3d_texture_get_level_pow2_width(texture, 0); + GLboolean standard_pattern = texture->resource.multisample_type != WINED3D_MULTISAMPLE_NON_MASKABLE + && texture->resource.multisample_quality == WINED3D_STANDARD_MULTISAMPLE_PATTERN; switch (texture->target) { @@ -640,11 +642,11 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture break; case GL_TEXTURE_2D_MULTISAMPLE: GL_EXTCALL(glTexStorage2DMultisample(texture->target, samples, - gl_internal_format, width, height, GL_FALSE)); + gl_internal_format, width, height, standard_pattern)); break; case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: GL_EXTCALL(glTexStorage3DMultisample(texture->target, samples, - gl_internal_format, width, height, texture->layer_count, GL_FALSE)); + gl_internal_format, width, height, texture->layer_count, standard_pattern)); break; case GL_TEXTURE_1D_ARRAY: GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, @@ -3604,7 +3606,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct } if (desc->multisample_type != WINED3D_MULTISAMPLE_NON_MASKABLE && (!(format->multisample_types & 1u << (desc->multisample_type - 1)) - || desc->multisample_quality)) + || (desc->multisample_quality && desc->multisample_quality != WINED3D_STANDARD_MULTISAMPLE_PATTERN))) { WARN("Unsupported multisample type %u quality %u requested.\n", desc->multisample_type, desc->multisample_quality); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 95549e96cb4..1b3a46e6567 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1571,6 +1571,8 @@ enum wined3d_shader_type #define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008 #define WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS 0x00000010 +#define WINED3D_STANDARD_MULTISAMPLE_PATTERN 0xffffffff + #define WINED3D_APPEND_ALIGNED_ELEMENT 0xffffffff #define WINED3D_OUTPUT_SLOT_SEMANTIC 0xffffffff -- 2.11.0

1 0

[PATCH 1/4] testbot: Add Missions support.
by Francois Gouget 22 Oct '18

22 Oct '18

Missions allow the TestBot administrator to specify which tests a given VM should perform for mailing list patches. For instance this can be used to restrict a 64 bit Windows VM to 32 bit tests (useful when it duplicates another VM with just a different locale). Furthermore missions can get options. Currently only the 'nosubmit' option is supported and it disables submitting the WineTest results online. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Eventually missions will make it possible to specify how much testing a Wine VM should do, from running only patched tests to running every test for every patch; against which Wine build; only in the English locale, or in other locales too. testbot/bin/CheckForWinetestUpdate.pl | 105 ++++++++++++++------ testbot/bin/WineRunTask.pl | 12 ++- testbot/bin/WineRunWineTest.pl | 31 +++--- testbot/bin/build/WineTest.pl | 131 +++++++++++++------------ testbot/ddl/update41.sql | 48 +++++++++ testbot/ddl/winetestbot.sql | 2 + testbot/doc/winetestbot-schema.dia | 46 +++++++++ testbot/lib/WineTestBot/Missions.pm | 99 +++++++++++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 8 +- testbot/lib/WineTestBot/Patches.pm | 134 +++++++++++++++----------- testbot/lib/WineTestBot/StepsTasks.pm | 55 +++++++---- testbot/lib/WineTestBot/Tasks.pm | 1 + testbot/lib/WineTestBot/VMs.pm | 41 ++++++++ testbot/web/JobDetails.pl | 1 + testbot/web/Submit.pl | 80 ++++++++------- testbot/web/admin/VMDetails.pl | 16 +++ 16 files changed, 587 insertions(+), 223 deletions(-) create mode 100644 testbot/ddl/update41.sql create mode 100644 testbot/lib/WineTestBot/Missions.pm diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 29953642ef..95cb13d8ed 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -53,6 +53,7 @@ use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Jobs; use WineTestBot::Log; +use WineTestBot::Missions; use WineTestBot::PatchUtils; use WineTestBot::Users; use WineTestBot::Utils; @@ -201,21 +202,38 @@ sub AddJob($$$) $NewJob->Priority($BaseJob && $Build eq "exe32" ? 8 : 9); $NewJob->Remarks($Remarks); - # Add a step to the job - my $Steps = $NewJob->Steps; - my $NewStep = $Steps->Add(); - $NewStep->Type("suite"); - $NewStep->FileName($LatestBaseName); - $NewStep->FileType($Build); - # Add a task for each VM - my $Tasks = $NewStep->Tasks; + my $Tasks; foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { - Debug(" $VMKey $Build\n"); - my $Task = $Tasks->Add(); - $Task->VM($VMs->GetItem($VMKey)); - $Task->Timeout(GetTestTimeout(undef, { $Build => 1 })); + my $VM = $VMs->GetItem($VMKey); + my ($ErrMessage, $Missions) = ParseMissionStatement($VM->Missions); + if (defined $ErrMessage) + { + Debug("$VMKey has an invalid mission statement: $!\n"); + next; + } + + foreach my $TaskMissions (@$Missions) + { + next if (!$TaskMissions->{Builds}->{$Build}); + + if (!$Tasks) + { + # Add a step to the job + my $TestStep = $NewJob->Steps->Add(); + $TestStep->Type("suite"); + $TestStep->FileName($LatestBaseName); + $TestStep->FileType($Build); + $Tasks = $TestStep->Tasks; + } + + Debug(" $VMKey $Build\n"); + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout($SuiteTimeout); + $Task->Missions($TaskMissions->{Statement}); + } } # Save it all @@ -246,9 +264,6 @@ sub AddJob($$$) return 1; } -my @ExeBuilds = qw(exe32 exe64); -my @WineBuilds = qw(win32 wow32 wow64); - sub AddReconfigJob($) { my ($VMType) = @_; @@ -287,9 +302,23 @@ sub AddReconfigJob($) Debug(" $VMKey $VMType reconfig\n"); my $Task = $BuildStep->Tasks->Add(); $Task->VM($VM); - my $Builds; - map { $Builds->{$_} = 1 } ($VMType eq "wine" ? @WineBuilds : @ExeBuilds); - $Task->Timeout(GetBuildTimeout(undef, $Builds)); + + # Merge all the tasks into one so we only recreate the base snapshot once + my $MissionStatement = $VMType ne "wine" ? "exe32:exe64" : + MergeMissionStatementTasks($VM->Missions); + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) + { + Debug("$VMKey has an invalid mission statement: $!\n"); + next; + } + if (@$Missions != 1) + { + Debug("Found no mission or too many task missions for $VMKey\n"); + next; + } + $Task->Timeout(GetBuildTimeout(undef, $Missions->[0])); + $Task->Missions($Missions->[0]->{Statement}); } # Save the build step so the others can reference it. @@ -303,22 +332,38 @@ sub AddReconfigJob($) if ($VMType eq "wine") { # Add steps to run WineTest on Wine - foreach my $Build (@WineBuilds) + my $Tasks; + foreach my $VMKey (@$SortedKeys) { - # Add a step to the job - my $NewStep = $Steps->Add(); - $NewStep->PreviousNo($BuildStep->No); - $NewStep->Type("suite"); - $NewStep->FileType("none"); + my $VM = $VMs->GetItem($VMKey); + # Move all the missions into separate tasks so we don't have one very + # long task hogging the VM forever. Note that this also ok because the + # WineTest tasks don't have to recompile Wine. + my $MissionStatement = SplitMissionStatementTasks($VM->Missions); + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) + { + Debug("$VMKey has an invalid mission statement: $!\n"); + next; + } - foreach my $VMKey (@$SortedKeys) + foreach my $TaskMissions (@$Missions) { - my $VM = $VMs->GetItem($VMKey); - Debug(" $VMKey $Build\n"); - my $Task = $NewStep->Tasks->Add(); + if (!$Tasks) + { + # Add a step to the job + my $TestStep = $Steps->Add(); + $TestStep->PreviousNo($BuildStep->No); + $TestStep->Type("suite"); + $TestStep->FileType("none"); + $Tasks = $TestStep->Tasks; + } + + Debug(" $VMKey $TaskMissions->{Statement}\n"); + my $Task = $Tasks->Add(); $Task->VM($VM); - $Task->CmdLineArg($Build); - $Task->Timeout(GetTestTimeout(undef, { $Build => 1 })); + $Task->Timeout(GetTestTimeout(undef, $TaskMissions)); + $Task->Missions($TaskMissions->{Statement}); } } } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 077426b232..fea8c03f5e 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -45,6 +45,7 @@ use WineTestBot::Engine::Notify; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::Utils; use WineTestBot::VMs; @@ -391,6 +392,13 @@ if ($Step->FileType ne "exe32" and $Step->FileType ne "exe64") FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } +my ($ErrMessage, $Missions) = ParseMissionStatement($Task->Missions); +FatalError "$ErrMessage\n" if (defined $ErrMessage); +FatalError "Empty mission statement\n" if (!@$Missions); +FatalError "Cannot specify missions for multiple tasks\n" if (@$Missions > 1); +FatalError "Cannot specify multiple missions\n" if (@{$Missions->[0]->{Missions}} > 1); +my $Mission = $Missions->[0]->{Missions}->[0]; + # # Setup the VM @@ -477,8 +485,8 @@ elsif ($Step->Type eq "suite") $Info =~ s/"/\\"/g; $Info =~ s/%/%%/g; $Info =~ s/%/%%/g; - $Script .= "-q -o $RptFileName -t $Tag -m \"$EMail\" -i \"$Info\"\r\n". - "$FileName -q -s $RptFileName\r\n"; + $Script .= "-q -o $RptFileName -t $Tag -m \"$EMail\" -i \"$Info\"\r\n"; + $Script .= "$FileName -q -s $RptFileName\r\n" if (!$Mission->{nosubmit}); } Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 0e438f957c..f47a02413a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -41,13 +41,14 @@ $Name0 =~ s+^.*/++; use WineTestBot::Config; +use WineTestBot::Engine::Notify; use WineTestBot::Jobs; +use WineTestBot::Missions; use WineTestBot::PatchUtils; -use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; use WineTestBot::Utils; -use WineTestBot::Engine::Notify; +use WineTestBot::VMs; # @@ -220,6 +221,8 @@ sub LogTaskError($) } } +my $TaskMissions; + sub WrapUpAndExit($;$$$) { my ($Status, $TestFailures, $Retry, $TimedOut) = @_; @@ -287,9 +290,7 @@ sub WrapUpAndExit($;$$$) if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { - my $BuildList = $Task->CmdLineArg; - $BuildList =~ s/ .*$//; - foreach my $Build (split /,/, $BuildList) + foreach my $Build (keys %{$TaskMissions->{Builds}}) { # Keep the old report if the new one is missing my $RptFileName = "$Build.report"; @@ -392,6 +393,12 @@ if (($Step->Type eq "suite" and $Step->FileType ne "none") or FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } +my ($ErrMessage, $Missions) = ParseMissionStatement($Task->Missions); +FatalError "$ErrMessage\n" if (defined $ErrMessage); +FatalError "Empty mission statement\n" if (!@$Missions); +FatalError "Cannot specify missions for multiple tasks\n" if (@$Missions > 1); +$TaskMissions = $Missions->[0]; + # # Setup the VM @@ -431,7 +438,7 @@ $Script .= " ../bin/build/WineTest.pl "; if ($Step->Type eq "suite") { my $BaseTag = BuildTag($VM->Name); - $Script .= "--winetest ". $Task->CmdLineArg ." $BaseTag "; + $Script .= "--winetest ". $Task->Missions ." $BaseTag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; @@ -447,7 +454,7 @@ if ($Step->Type eq "suite") } else { - $Script .= "--testpatch ". $Task->CmdLineArg ." patch.diff"; + $Script .= "--testpatch ". $Task->Missions ." patch.diff"; } $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); @@ -475,7 +482,7 @@ if (!$Pid) # my $NewStatus = 'completed'; -my ($TaskFailures, $TaskTimedOut, $ErrMessage, $TAError, $PossibleCrash); +my ($TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -542,9 +549,7 @@ elsif (!defined $TAError) if ($Step->Type ne "build") { - my $BuildList = $Task->CmdLineArg; - $BuildList =~ s/ .*$//; - foreach my $Build (split /,/, $BuildList) + foreach my $Build (keys %{$TaskMissions->{Builds}}) { my $RptFileName = "$Build.report"; Debug(Elapsed($Start), " Retrieving '$RptFileName'\n"); @@ -602,9 +607,7 @@ if ($NewStatus eq 'completed') { my $LatestDir = "$DataDir/latest"; my $StepDir = $Step->GetDir(); - my $BuildList = $Task->CmdLineArg; - $BuildList =~ s/ .*$//; - foreach my $Build (split /,/, $BuildList) + foreach my $Build (keys %{$TaskMissions->{Builds}}) { my $RptFileName = "$Build.report"; my $RefReport = $Task->VM->Name ."_$RptFileName"; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 712341b339..c5d38df9d4 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -43,6 +43,7 @@ sub BEGIN use Build::Utils; use WineTestBot::Config; +use WineTestBot::Missions; use WineTestBot::Utils; @@ -52,9 +53,9 @@ use WineTestBot::Utils; sub BuildWine($$) { - my ($Targets, $Build) = @_; + my ($TaskMissions, $Build) = @_; - return 1 if (!$Targets->{$Build}); + return 1 if (!$TaskMissions->{Builds}->{$Build}); InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); @@ -74,44 +75,40 @@ sub BuildWine($$) # Test helpers # - -sub DailyWineTest($$$$$) +sub DailyWineTest($$$$) { - my ($Targets, $Build, $NoSubmit, $BaseTag, $Args) = @_; - - return 1 if (!$Targets->{$Build}); + my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; - InfoMsg "\nRunning WineTest in the $Build Wine\n"; - SetupWineEnvironment($Build); + InfoMsg "\nRunning WineTest in the $Mission->{Build} Wine\n"; + SetupWineEnvironment($Mission->{Build}); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - my $Tag = SanitizeTag("$BaseTag-$Build"); - RunWine($Build, "./programs/winetest/winetest.exe.so", - "-c -o '../$Build.report' -t $Tag ". ShArgv2Cmd(@$Args)); - if (!-f "$Build.report") + my $Tag = SanitizeTag("$BaseTag-$Mission->{Build}"); + RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", + "-c -o '../$Mission->{Build}.report' -t $Tag ". + ShArgv2Cmd(@$Args)); + if (!-f "$Mission->{Build}.report") { LogMsg "WineTest did not produce a report file\n"; return 0; } # Send the report to the website - if (!$NoSubmit and - RunWine($Build, "./programs/winetest/winetest.exe.so", - "-c -s '../$Build.report'")) + if ((!$NoSubmit and !$Mission->{nosubmit}) and + RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", + "-c -s '../$Mission->{Build}.report'")) { - LogMsg "WineTest failed to send the $Build report\n"; + LogMsg "WineTest failed to send the $Mission->{Build} report\n"; # Soldier on in case it's just a network issue } return 1; } -sub TestPatch($$$) +sub TestPatch($$) { - my ($Targets, $Build, $Impacts) = @_; - - return 1 if (!$Targets->{"test$Build"}); + my ($Mission, $Impacts) = @_; my @TestList; foreach my $Module (sort keys %{$Impacts->{Tests}}) @@ -131,14 +128,15 @@ sub TestPatch($$$) } return 1 if (!@TestList); - InfoMsg "\nRunning the tests in the $Build Wine\n"; - SetupWineEnvironment($Build); + InfoMsg "\nRunning the tests in the $Mission->{Build} Wine\n"; + SetupWineEnvironment($Mission->{Build}); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Build, "./programs/winetest/winetest.exe.so", - "-c -o '../$Build.report' -t test-$Build ". join(" ", @TestList)); - if (!-f "$Build.report") + RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", + "-c -o '../$Mission->{Build}.report' -t test-$Mission->{Build} ". + join(" ", @TestList)); + if (!-f "$Mission->{Build}.report") { LogMsg "WineTest did not produce a report file\n"; return 0; @@ -155,11 +153,8 @@ sub TestPatch($$$) $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; -my %AllTargets; -map { $AllTargets{$_} = 1 } qw(win32 wow32 wow64); - my $Action = ""; -my ($Usage, $OptNoSubmit, $TargetList, $FileName, $BaseTag); +my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag); while (@ARGV) { my $Arg = shift @ARGV; @@ -186,9 +181,9 @@ while (@ARGV) $Usage = 2; last; } - elsif (!defined $TargetList) + elsif (!defined $MissionStatement) { - $TargetList = $Arg; + $MissionStatement = $Arg; } elsif ($Action eq "winetest") { @@ -223,24 +218,35 @@ while (@ARGV) } # Check and untaint parameters -my $Targets; +my $TaskMissions; if (!defined $Usage) { - if (defined $TargetList) + if (defined $MissionStatement) { - foreach my $Target (split /[,:]/, $TargetList) + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) { - if (!$AllTargets{$Target}) - { - Error "invalid target name $Target\n"; - $Usage = 2; - } - $Targets->{$Target} = 1; + Error "$ErrMessage\n"; + $Usage = 2; + } + elsif (!@$Missions) + { + Error "empty mission statement\n"; + $Usage = 2; + } + elsif (@$Missions > 1) + { + Error "cannot specify missions for multiple tasks\n"; + $Usage = 2; + } + else + { + $TaskMissions = $Missions->[0]; } } else { - Error "specify at least one target\n"; + Error "you must specify the mission statement\n"; $Usage = 2; } @@ -268,16 +274,13 @@ if (!defined $Usage) } else { - foreach my $Build ("win32", "wow32", "wow64") - { - $Targets->{"test$Build"} = 1 if ($Targets->{$Build}); - } - if ($Targets->{"wow32"} or $Targets->{"wow64"}) + my $Builds = $TaskMissions->{Builds}; + if ($Builds->{"wow32"} or $Builds->{"wow64"}) { # Always rebuild both WoW targets before running the tests to make sure # we don't run into issues caused by the two Wine builds being out of # sync. - $Targets->{"wow32"} = $Targets->{"wow64"} = 1; + $Builds->{"wow32"} = $Builds->{"wow64"} = 1; } } @@ -295,8 +298,8 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--help] --testpatch TARGETS PATCH\n"; - print "or $Name0 [--help] --winetest [--no-submit] TARGETS BASETAG ARGS\n"; + print "Usage: $Name0 [--help] --testpatch MISSIONS PATCH\n"; + print "or $Name0 [--help] --winetest [--no-submit] MISSIONS BASETAG ARGS\n"; print "\n"; print "Tests the specified patch or runs WineTest in Wine.\n"; print "\n"; @@ -304,7 +307,7 @@ if (defined $Usage) print " --testpatch Verify that the patch compiles and run the impacted tests.\n"; print " --winetest Run WineTest and submit the result to the website.\n"; print " --no-submit Do not submit the WineTest results to the website.\n"; - print " TARGETS Is a comma-separated list of targets for the specified action.\n"; + print " MISSIONS Is a colon-separated list of missions for the specified action.\n"; print " - win32: The regular 32 bit Wine build.\n"; print " - wow32: The 32 bit WoW Wine build.\n"; print " - wow64: The 64 bit WoW Wine build.\n"; @@ -328,26 +331,26 @@ if ($DataDir =~ /'/) # # Clean up old reports -map { unlink("$_.report") } keys %AllTargets; +map { unlink("$_.report") } keys %{$TaskMissions->{Builds}}; +my $Impacts; if ($Action eq "testpatch") { - my $Impacts = ApplyPatch("wine", $FileName); + $Impacts = ApplyPatch("wine", $FileName); exit(1) if (!$Impacts or - !BuildWine($Targets, "win32") or - !BuildWine($Targets, "wow64") or - !BuildWine($Targets, "wow32") or - !TestPatch($Targets, "win32", $Impacts) or - !TestPatch($Targets, "wow64", $Impacts) or - !TestPatch($Targets, "wow32", $Impacts)); + !BuildWine($TaskMissions, "win32") or + !BuildWine($TaskMissions, "wow64") or + !BuildWine($TaskMissions, "wow32")); } -elsif ($Action eq "winetest") +foreach my $Mission (@{$TaskMissions->{Missions}}) { - if (!DailyWineTest($Targets, "win32", $OptNoSubmit, $BaseTag, \@ARGV) or - !DailyWineTest($Targets, "wow64", $OptNoSubmit, $BaseTag, \@ARGV) or - !DailyWineTest($Targets, "wow32", $OptNoSubmit, $BaseTag, \@ARGV)) + if ($Action eq "testpatch") { - exit(1); + exit(1) if (!TestPatch($Mission, $Impacts)); + } + elsif ($Action eq "winetest") + { + exit(1) if (!DailyWineTest($Mission, $OptNoSubmit, $BaseTag, \@ARGV)); } } diff --git a/testbot/ddl/update41.sql b/testbot/ddl/update41.sql new file mode 100644 index 0000000000..f1a5e1a240 --- /dev/null +++ b/testbot/ddl/update41.sql @@ -0,0 +1,48 @@ +USE winetestbot; + +ALTER TABLE Tasks + ADD Missions VARCHAR(256) NULL + AFTER Timeout; + +UPDATE Tasks, VMs + SET Tasks.Missions = 'build' + WHERE Tasks.Missions is NULL AND Tasks.VMName = VMs.Name AND VMs.Type = 'build'; + +UPDATE Tasks, VMs + SET Tasks.Missions = 'exe32' + WHERE Tasks.Missions is NULL AND Tasks.VMName = VMs.Name AND VMs.Type = 'win32'; + +UPDATE Tasks, VMs + SET Tasks.Missions = 'exe32|exe64' + WHERE Tasks.Missions is NULL AND Tasks.VMName = VMs.Name AND VMs.Type = 'win64'; + +UPDATE Tasks, VMs + SET Tasks.Missions = 'win32:wow64' + WHERE Tasks.Missions is NULL AND Tasks.VMName = VMs.Name AND VMs.Type = 'wine'; + +ALTER TABLE Tasks + MODIFY Missions VARCHAR(256) NOT NULL; + + +ALTER TABLE VMs + ADD Missions VARCHAR(256) NULL + AFTER Role; + +UPDATE VMs + SET Missions = 'build' + WHERE Missions is NULL AND Type = 'build'; + +UPDATE VMs + SET Missions = 'exe32' + WHERE Missions is NULL AND Type = 'win32'; + +UPDATE VMs + SET Missions = 'exe32|exe64' + WHERE Missions is NULL AND Type = 'win64'; + +UPDATE VMs + SET Missions = 'win32|wow64' + WHERE Missions is NULL AND Type = 'wine'; + +ALTER TABLE VMs + MODIFY Missions VARCHAR(256) NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 8862c6c9dc..e6114e0917 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -48,6 +48,7 @@ CREATE TABLE VMs SortOrder INT(3) NOT NULL, Type ENUM('win32', 'win64', 'build', 'wine') NOT NULL, Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, + Missions VARCHAR(256) NOT NULL, Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, Errors INT(2) NULL, ChildPid INT(5) NULL, @@ -149,6 +150,7 @@ CREATE TABLE Tasks Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, VMName VARCHAR(20) NOT NULL, Timeout INT(4) NOT NULL, + Missions VARCHAR(256) NOT NULL, CmdLineArg VARCHAR(256) NULL, Started DATETIME NULL, Ended DATETIME NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index c54897a831..372d3bf006 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2106,6 +2106,29 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Missions#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(256)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#CmdLineArg#</dia:string> @@ -2360,6 +2383,29 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Missions#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#VARCHAR(256)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#Status#</dia:string> diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm new file mode 100644 index 0000000000..58b33403fb --- /dev/null +++ b/testbot/lib/WineTestBot/Missions.pm @@ -0,0 +1,99 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Copyright 2018 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package WineTestBot::Missions; + +=head1 NAME + +WineTestBot::Missions - Missions parser and helper functions + +=cut + +use Exporter 'import'; +our @EXPORT = qw(DumpMissions ParseMissionStatement + MergeMissionStatementTasks SplitMissionStatementTasks); + + +sub DumpMissions($$) +{ + my ($Label, $Missions) = @_; + + print STDERR "$Label:\n"; + foreach my $TaskMissions (@$Missions) + { + print STDERR "Builds=", join(",", sort keys %{$TaskMissions->{Builds}}), "\n"; + foreach my $Mission (@{$TaskMissions->{Missions}}) + { + print STDERR " [$Mission->{Build}]\n"; + print STDERR " \"$_\"=\"$Mission->{$_}\"\n" for (sort grep(!/^Build$/,keys %$Mission)); + } + } +} + +sub ParseMissionStatement($) +{ + my ($MissionStatement) = @_; + + my @Missions; + foreach my $TaskStatement (split /[|]/, $MissionStatement) + { + my $TaskMissions = { Statement => $TaskStatement }; + push @Missions, $TaskMissions; + foreach my $Statement (split /:/, $TaskStatement) + { + my ($Build, @Options) = split /,/, $Statement; + if ($Build !~ /^([a-z0-9]+)$/) + { + return ("Invalid mission name '$Build'", undef); + } + $Build = $1; # untaint + $TaskMissions->{Builds}->{$Build} = 1; + my $Mission = { Build => $Build, Statement => $Statement }; + push @{$TaskMissions->{Missions}}, $Mission; + + foreach my $Option (@Options) + { + if ($Option !~ s/^([a-z0-9_]+)//) + { + return ("Invalid option name '$Option'", undef); + } + my $Name = $1; # untaint + # do not untaint the value + $Mission->{$Name} = ($Option =~ s/^=//) ? $Option : 1; + } + } + } + return (undef, \@Missions); +} + +sub MergeMissionStatementTasks($) +{ + my ($MissionStatement) = @_; + $MissionStatement =~ s/\|/:/g; + return $MissionStatement; +} + +sub SplitMissionStatementTasks($) +{ + my ($MissionStatement) = @_; + $MissionStatement =~ s/:/|/g; + return $MissionStatement; +} + +1; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 7df50f9b21..444ffaf491 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -457,10 +457,10 @@ sub GetPatchImpacts($) sub GetBuildTimeout($$) { - my ($Impacts, $Builds) = @_; + my ($Impacts, $TaskMissions) = @_; my ($ExeCount, $WineCount); - map {$_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %$Builds; + map {$_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %{$TaskMissions->{Builds}}; # Set $ModuleCount to 0 if a full rebuild is needed my $ModuleCount = (!$Impacts or $Impacts->{RebuildRoot}) ? 0 : @@ -486,7 +486,7 @@ sub GetBuildTimeout($$) sub GetTestTimeout($$) { - my ($Impacts, $Builds) = @_; + my ($Impacts, $TaskMissions) = @_; my $Timeout = $SuiteTimeout; if ($Impacts) @@ -496,7 +496,7 @@ sub GetTestTimeout($$) max(0, $UnitCount - 2) * $SingleAvgTime; $Timeout = min($SuiteTimeout, $TestsTimeout); } - return scalar(keys %$Builds) * $Timeout; + return @{$TaskMissions->{Missions}} * $Timeout; } 1; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index f685e86b32..e621e8845d 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -40,12 +40,13 @@ use Encode qw/decode/; use File::Basename; use WineTestBot::Config; +use WineTestBot::Engine::Notify; use WineTestBot::Jobs; +use WineTestBot::Missions; use WineTestBot::PatchUtils; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::VMs; -use WineTestBot::Engine::Notify; sub InitializeNew($$) @@ -175,23 +176,8 @@ sub Submit($$$) $BuildVMs->AddFilter("Role", ["base"]); if ($Impacts->{TestUnitCount} and !$BuildVMs->IsEmpty()) { - # Create the Build Step - my $BuildStep = $NewJob->Steps->Add(); - $BuildStep->FileName("patch.diff"); - $BuildStep->FileType("patch"); - $BuildStep->Type("build"); - $BuildStep->DebugLevel(0); - - # Save the build step so the others can reference it. - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) - { - $self->Disposition("Failed to submit build step"); - return $ErrMessage; - } - # Create steps for the Windows tests - my $Builds; + my ($BuildStep, $BuildMissions); foreach my $Module (sort keys %{$Impacts->{Tests}}) { my $TestInfo = $Impacts->{Tests}->{$Module}; @@ -202,26 +188,54 @@ sub Submit($$$) my $WinVMs = CreateVMs(); $WinVMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); $WinVMs->AddFilter("Role", ["base"]); - if (!$WinVMs->IsEmpty()) + my $SortedKeys = $WinVMs->SortKeysBySortOrder($WinVMs->GetKeys()); + + my $Tasks; + foreach my $VMKey (@$SortedKeys) { - # Create one Step per (module, unit, bitness) combination - my $NewStep = $NewJob->Steps->Add(); - $NewStep->PreviousNo($BuildStep->No); - my $FileName = $TestInfo->{ExeBase}; - $FileName .= "64" if ($Bits eq "64"); - $NewStep->FileName("$FileName.exe"); - $NewStep->FileType("exe$Bits"); - $Builds->{"exe$Bits"} = 1; - - # And a task for each VM - my $Tasks = $NewStep->Tasks; - my $SortedKeys = $WinVMs->SortKeysBySortOrder($WinVMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) + my $VM = $WinVMs->GetItem($VMKey); + my ($ErrMessage, $Missions) = ParseMissionStatement($VM->Missions); + next if (defined $ErrMessage); + + foreach my $TaskMissions (@$Missions) { - my $VM = $WinVMs->GetItem($VMKey); + next if (!$TaskMissions->{Builds}->{"exe$Bits"}); + + if (!$BuildStep) + { + # Create the Build Step + $BuildStep = $NewJob->Steps->Add(); + $BuildStep->FileName("patch.diff"); + $BuildStep->FileType("patch"); + $BuildStep->Type("build"); + $BuildStep->DebugLevel(0); + + # Save the build step so the others can reference it. + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined($ErrMessage)) + { + $self->Disposition("Failed to submit build step"); + return $ErrMessage; + } + } + + if (!$Tasks) + { + # Create one Step per (module, unit, bitness) combination + my $NewStep = $NewJob->Steps->Add(); + $NewStep->PreviousNo($BuildStep->No); + my $FileName = $TestInfo->{ExeBase}; + $FileName .= "64" if ($Bits eq "64"); + $NewStep->FileName("$FileName.exe"); + $NewStep->FileType("exe$Bits"); + $BuildMissions->{Builds}->{"exe$Bits"} = 1; + $Tasks = $NewStep->Tasks; + } + my $Task = $Tasks->Add(); $Task->VM($VM); $Task->Timeout($SingleTimeout); + $Task->Missions($TaskMissions->{Statement}); $Task->CmdLineArg($Unit); } } @@ -229,38 +243,48 @@ sub Submit($$$) } } - # Add the build task - my $BuildVM = ${$BuildVMs->GetItems()}[0]; - my $BuildTask = $BuildStep->Tasks->Add(); - $BuildTask->VM($BuildVM); - $BuildTask->Timeout(GetBuildTimeout($Impacts, $Builds)); + if ($BuildStep) + { + # Add the build task + my $BuildVM = ${$BuildVMs->GetItems()}[0]; + my $BuildTask = $BuildStep->Tasks->Add(); + $BuildTask->VM($BuildVM); + $BuildMissions->{Statement} = join(":", keys %{$BuildMissions->{Builds}}); + $BuildTask->Timeout(GetBuildTimeout($Impacts, $BuildMissions)); + $BuildTask->Missions($BuildMissions->{Statement}); + } } my $WineVMs = CreateVMs(); $WineVMs->AddFilter("Type", ["wine"]); $WineVMs->AddFilter("Role", ["base"]); - if (!$WineVMs->IsEmpty()) + my $SortedKeys = $WineVMs->SortKeysBySortOrder($WineVMs->GetKeys()); + + my $Tasks; + foreach my $VMKey (@$SortedKeys) { - # Add a Wine step to the job - my $NewStep = $NewJob->Steps->Add(); - $NewStep->FileName("patch.diff"); - $NewStep->FileType("patch"); - $NewStep->Type("single"); - $NewStep->DebugLevel(0); - - # And a task for each VM - my $Tasks = $NewStep->Tasks; - my $SortedKeys = $WineVMs->SortKeysBySortOrder($WineVMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) + my $VM = $WineVMs->GetItem($VMKey); + my ($ErrMessage, $Missions) = ParseMissionStatement($VM->Missions); + next if (defined $ErrMessage); + + foreach my $TaskMissions (@$Missions) { - my $VM = $WineVMs->GetItem($VMKey); + if (!$Tasks) + { + # Add a Wine step to the job + my $TestStep = $NewJob->Steps->Add(); + $TestStep->FileName("patch.diff"); + $TestStep->FileType("patch"); + $TestStep->Type("single"); + $TestStep->DebugLevel(0); + $Tasks = $TestStep->Tasks; + } + my $Task = $Tasks->Add(); $Task->VM($VM); - # Only verify that the win32 version compiles - my $Builds = { "win32" => 1 }; - $Task->Timeout(GetBuildTimeout($Impacts, $Builds) + - GetTestTimeout($Impacts, $Builds)); - $Task->CmdLineArg(join(",", keys %$Builds)); + $Task->Timeout(GetBuildTimeout($Impacts, $TaskMissions) + + GetTestTimeout($Impacts, $TaskMissions)); + $Task->Missions($TaskMissions->{Statement}); } } diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index a50f61ada3..cfd78e52e2 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -30,6 +30,7 @@ use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); use WineTestBot::Config; +use WineTestBot::Missions; sub GetStepDir($) @@ -68,34 +69,50 @@ sub GetTitle($) { my ($self) = @_; - my $Title = ""; - if ($self->Type eq "single") + my @TitleParts; + if ($self->Type eq "build") { - if ($self->FileType eq "exe32") - { - $Title .= "32 bit "; - } - elsif ($self->FileType eq "exe64") - { - $Title .= "64 bit "; - } - $Title .= $self->CmdLineArg || ""; + push @TitleParts, "build"; } - elsif ($self->Type eq "build") + elsif ($self->FileType eq "exe32") { - $Title = "build"; + push @TitleParts, "32 bit"; } - $Title =~ s/\s*$//; - - if ($Title) + elsif ($self->FileType eq "exe64") { - $Title = $self->VM->Name . " (" . $Title . ")"; + push @TitleParts, "64 bit"; } else { - $Title = $self->VM->Name; + my ($ErrMessage, $Missions) = ParseMissionStatement($self->Missions); + if (!defined $ErrMessage and @$Missions == 1) + { + my $Builds = $Missions->[0]->{Builds}; + if ($Builds->{build}) + { + push @TitleParts, "build"; + } + elsif ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) + { + push @TitleParts, "32 & 64 bit"; + } + elsif ($Builds->{win32} or $Builds->{wow32}) + { + push @TitleParts, "32 bit"; + } + elsif ($Builds->{wow64}) + { + push @TitleParts, "64 bit"; + } + } + } + if ($self->Type ne "suite" and $self->CmdLineArg) + { + push @TitleParts, $self->CmdLineArg; } + my $Title = $self->VM->Name; + $Title .= " (@TitleParts)" if (@TitleParts); return $Title; } @@ -148,6 +165,7 @@ sub _initialize($$) $StepTask->Timeout($Task->Timeout); $StepTask->FileName($Step->FileName); $StepTask->FileType($Step->FileType); + $StepTask->Missions($Task->Missions); $StepTask->CmdLineArg($Task->CmdLineArg); $StepTask->Started($Task->Started); $StepTask->Ended($Task->Ended); @@ -179,6 +197,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 32), + CreateBasicPropertyDescriptor("Missions", "Missions", !1, 1, "A", 256), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 084784a3ba..f9e84d471b 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -298,6 +298,7 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), + CreateBasicPropertyDescriptor("Missions", "Missions", !1, 1, "A", 256), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index cf7bd5ab75..e7cd277494 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -151,6 +151,7 @@ use ObjectModel::BackEnd; use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::LibvirtDomain; +use WineTestBot::Missions; use WineTestBot::RecordGroups; use WineTestBot::TestAgent; @@ -302,6 +303,24 @@ sub KillChild($) $self->ChildPid(undef); } +sub PutColValue($$$) +{ + my ($self, $ColName, $Value) = @_; + + $self->SUPER::PutColValue($ColName, $Value); + if ($self->{IsModified} and ($ColName eq "Type" or $ColName eq "Missions")) + { + $self->{ValidateMissions} = 1; + } +} + +my $_SupportedMissions = { + "build" => { "build" => 1 }, + "win32" => { "exe32" => 1 }, + "win64" => { "exe32" => 1, "exe64" => 1 }, + "wine" => { "win32" => 1, "wow32" => 1, "wow64" => 1 }, +}; + sub Validate($) { my ($self) = @_; @@ -311,6 +330,27 @@ sub Validate($) { return ("Role", "Only win32, win64 and wine VMs can have a role of '" . $self->Role . "'"); } + if ($self->{ValidateMissions}) + { + my ($ErrMessage, $Missions) = ParseMissionStatement($self->Missions); + return ("Missions", $ErrMessage) if (defined $ErrMessage); + foreach my $TaskMissions (@$Missions) + { + if ($self->Type ne "wine" and @{$TaskMissions->{Missions}} > 1) + { + return ("Missions", "Only wine VMs can handle more than one mission per task"); + } + foreach my $Mission (@{$TaskMissions->{Missions}}) + { + if (!$_SupportedMissions->{$self->Type}->{$Mission->{Build}}) + { + return ("Missions", ucfirst($self->Type) ." VMs only support ". join(", ", sort keys %{$_SupportedMissions->{$self->Type}}) ." missions"); + } + } + } + delete $self->{ValidateMissions}; + } + return $self->SUPER::Validate(); } @@ -666,6 +706,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build', 'wine']), CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), + CreateBasicPropertyDescriptor("Missions", "Missions", !1, 1, "A", 256), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), CreateBasicPropertyDescriptor("Errors", "Errors", !1, !1, "N", 2), CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8efe5eefcf..de2f9ccb40 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -398,6 +398,7 @@ EOF print "<details><summary>", $self->CGI->escapeHTML($VM->Description || $VM->Name), "</summary>", $self->CGI->escapeHTML($VM->Details || "No details!"), + ($StepTask->Missions ? "<br>Missions: ". $StepTask->Missions : ""), "</details>\n"; my $MoreInfo = $self->{More}->{$Key}; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index c10a267909..bcb5458ad5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -36,6 +36,7 @@ use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Jobs; +use WineTestBot::Missions; use WineTestBot::PatchUtils; use WineTestBot::Steps; use WineTestBot::Utils; @@ -814,13 +815,18 @@ sub SubmitJob($$$) my $Task = $BuildStep->Tasks->Add(); $Task->VM($BuildVM); - my $Builds = { "exe32" => 1 }; - $Builds->{"exe64"} = 1 if defined $self->GetParam("Run64"); - $Task->Timeout(GetBuildTimeout($Impacts, $Builds)); + my $MissionStatement = "exe32"; + $MissionStatement .= ":exe64" if (defined $self->GetParam("Run64")); + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (!defined $ErrMessage) + { + $Task->Timeout(GetBuildTimeout($Impacts, $Missions->[0])); + $Task->Missions($Missions->[0]); - # Save the build step so the others can reference it - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) + # Save the build step so the others can reference it + (my $ErrKey, my $ErrProperty, $ErrMessage) = $Jobs->Save(); + } + if (defined $ErrMessage) { $self->{ErrMessage} = $ErrMessage; return !1; @@ -851,51 +857,53 @@ sub SubmitJob($$$) my $Task = $Tasks->Add(); $Task->VM($VM); $Task->Timeout($SingleTimeout); + $Task->Missions("exe$Bits"); $Task->CmdLineArg($self->GetParam("CmdLineArg")); } } if ($FileType eq "patch") { - my $Tasks; + my ($Tasks, $MissionStatement, $Timeout); my $VMs = CreateVMs(); $VMs->AddFilter("Type", ["wine"]); my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $Build ("win32", "wow64") + foreach my $VMKey (@$SortedKeys) { - next if ($Build eq "wow64" and !defined($self->GetParam("Run64"))); + my $VM = $VMs->GetItem($VMKey); + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + next if (!$self->GetParam($FieldName)); # skip unselected VMs - my $Timeout; - foreach my $VMKey (@$SortedKeys) + if (!$Tasks) { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs - - if (!$Tasks) + # First create the Wine test step + my $WineStep = $Steps->Add(); + $WineStep->FileName($BaseName); + $WineStep->FileType($FileType); + $WineStep->Type("single"); + $WineStep->DebugLevel($self->GetParam("DebugLevel")); + $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); + $Tasks = $WineStep->Tasks; + + $MissionStatement = "win32"; + $MissionStatement.= ":wow64" if (defined $self->GetParam("Run64")); + + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) { - # First create the Wine test step - my $WineStep = $Steps->Add(); - $WineStep->FileName($BaseName); - $WineStep->FileType($FileType); - $WineStep->Type("single"); - $WineStep->DebugLevel($self->GetParam("DebugLevel")); - $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); - $Tasks = $WineStep->Tasks; + $self->{ErrMessage} = $ErrMessage; + return !1; } - if (!defined $Timeout) - { - my $Builds = { $Build => 1 }; - $Timeout = GetBuildTimeout($Impacts, $Builds) + - GetTestTimeout($Impacts, $Builds); - } - - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->CmdLineArg($Build); - $Task->Timeout($Timeout); + $Missions = $Missions->[0]; + $Timeout = GetBuildTimeout($Impacts, $Missions) + + GetTestTimeout($Impacts, $Missions); } + + # Then add a task for this VM + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout($Timeout); + $Task->Missions($MissionStatement); } } diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 9603e346a8..5f49c684d8 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -67,6 +67,22 @@ sub Save($) return ! defined($self->{ErrMessage}); } +sub GenerateFooter($) +{ + my ($self) = @_; + print "<p></p><div class='CollectionBlock'><table>\n"; + print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; + print "<tbody><tr><td class='Record'>\n"; + + print "<p>The Missions syntax is <i>mission1:mission2:...|mission3|...</i> where <i>mission1</i> and <i>mission2</i> will be run in the same task, and <i>mission3</i> in a separate task.<br>\n"; + print "Each mission is composed of a build and options separated by commas: <i>build,option1=value,option2,...</i>. The value can be omitted for boolean options and defaults to true.<br>\n"; + print "The supported builds are <i>build</i> for build VMs; <i>exe32</i> and <i>exe64</i> for Windows VMs;<i> win32</i>, <i>wow32</i> and <i>wow64</i> for Wine VMs.</p>\n"; + print "<p>On Wine VMs:<br>\n"; + print "If set, the <i>nosubmit</i> option specifies that the WineTest results should not be published online.</p>\n"; + print "</td></tr></tbody>\n"; + print "</table></div>\n"; + $self->SUPER::GenerateFooter(); +} package main; -- 2.19.1

1 4

[PATCH] odbccp32: Implement SQLConfigDataSource/W
by Alistair Leslie-Hughes 22 Oct '18

22 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 156 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 132 insertions(+), 24 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 694a90c..ed0bf10 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -102,6 +102,33 @@ static inline WCHAR *heap_strdupAtoW(const char *str) return ret; } +static inline WCHAR *heap_attrdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) + { + DWORD size = 0, len; + const char *p; + LPWSTR current = NULL; + + for (p = str; *p; p += lstrlenA(p) + 1) + { + len = MultiByteToWideChar(CP_ACP, 0, p, -1, NULL, 0); + size += len; + } + + current = ret = heap_alloc_zero( (size+1)*sizeof(WCHAR)); + for (p = str; *p; p += lstrlenA(p) + 1) + { + len = MultiByteToWideChar(CP_ACP, 0, p, -1, current, size); + current += len; + size -= len; + } + } + return ret; +} + BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { @@ -220,30 +247,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng return success; } -BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, - LPCWSTR lpszDriver, LPCWSTR lpszAttributes) -{ - LPCWSTR p; - - clear_errors(); - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszAttributes)); - - for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) - FIXME("%s\n", debugstr_w(p)); - - return TRUE; -} - -BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, - LPCSTR lpszDriver, LPCSTR lpszAttributes) -{ - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszAttributes)); - clear_errors(); - return TRUE; -} - static HMODULE load_config_driver(const WCHAR *driver) { static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; @@ -360,6 +363,111 @@ fail: return FALSE; } +static BOOL call_ConfigDNS(HANDLE mod, HWND hwnd, WORD request, LPCSTR driverA, LPCSTR attributesA, LPCWSTR driverW, LPCWSTR attributesW) +{ + BOOL (WINAPI *pConfigDSN)(HWND hwnd, WORD request, const char *driver, const char *attr); + BOOL (WINAPI *pConfigDSNW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *attr); + BOOL ret = FALSE; + + TRACE("%p, %p, %d, %p, %p, %p %p\n", mod, hwnd, request, driverA, attributesA, driverW, attributesW); + + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + + if(pConfigDSNW) + { + const WCHAR *attr = attributesW; + if(!attr) + attr = heap_attrdupAtoW(attributesA); + + TRACE("Calling ConfigDSNW (%p)\n", pConfigDSNW); + + ret = pConfigDSNW(hwnd, request, driverW, attr); + + if(attr != attributesW) + heap_free((WCHAR *)attr); + } + else if(pConfigDSN) + { + TRACE("Calling pConfigDSN (%p)\n", pConfigDSN); + ret = pConfigDSN(hwnd, request, driverA, attributesA); + } + else + ERR("Neither ConfigDSN or ConfigDSNW found.\n"); + + if(!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + return ret; +} + +BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, + LPCWSTR lpszDriver, LPCWSTR lpszAttributes) +{ + HMODULE hmod; + BOOL ret = FALSE; + + TRACE("%p, %d, %s, %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), debugstr_w(lpszAttributes)); + if(TRACE_ON(odbc)) + { + const WCHAR *p; + for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + } + + clear_errors(); + + hmod = load_config_driver(lpszDriver); + if(!hmod) + return FALSE; + + ret = call_ConfigDNS (hmod, hwndParent, fRequest, NULL, NULL, lpszDriver, lpszAttributes); + + FreeLibrary(hmod); + + return ret; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, + LPCSTR lpszDriver, LPCSTR lpszAttributes) +{ + HMODULE hmod; + BOOL ret = FALSE; + WCHAR *driverW; + + TRACE("%p, %d, %s, %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), debugstr_a(lpszAttributes)); + + if(TRACE_ON(odbc)) + { + const char *p; + for (p = lpszAttributes; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + } + + clear_errors(); + + driverW = heap_strdupAtoW(lpszDriver); + if(!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + + hmod = load_config_driver(driverW); + if(!hmod) + { + heap_free(driverW); + return FALSE; + } + + ret = call_ConfigDNS (hmod, hwndParent, fRequest, lpszDriver, lpszAttributes, driverW, NULL); + heap_free(driverW); + + FreeLibrary(hmod); + + return ret; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { -- 1.9.1

2 2

[PATCH] comctl32: Avoid an unneeded lstrlenW() call.
by Francois Gouget 22 Oct '18

22 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. dlls/comctl32/toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 6a51ad7fc17..ec3b49890fd 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2435,7 +2435,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) btnInfo->btn = nmtb.tbButton; if (!(nmtb.tbButton.fsStyle & BTNS_SEP)) { - if (lstrlenW(nmtb.pszText)) + if (*nmtb.pszText) lstrcpyW(btnInfo->text, nmtb.pszText); else if (nmtb.tbButton.iString >= 0 && nmtb.tbButton.iString < infoPtr->nNumStrings) -- 2.19.1

3 3

[PATCH] kernel32: Add GetProcessMitigationPolicy() stub.
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 52120dd143..afd44dfe1c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -786,6 +786,7 @@ @ stdcall GetProcessId(long) @ stdcall GetProcessIdOfThread(long) @ stdcall GetProcessIoCounters(long ptr) +@ stdcall GetProcessMitigationPolicy(long long ptr long) # @ stub GetProcessPreferredUILanguages @ stdcall GetProcessPriorityBoost(long ptr) @ stdcall GetProcessShutdownParameters(ptr ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f9456aeb49..c3dc113803 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4701,3 +4701,13 @@ BOOL WINAPI SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY policy, void *b return TRUE; } + +/********************************************************************** + * GetProcessMitigationPolicy (KERNEL32.@) + */ +BOOL WINAPI GetProcessMitigationPolicy(HANDLE hProcess, PROCESS_MITIGATION_POLICY policy, void *buffer, SIZE_T length) +{ + FIXME("(%p, %u, %p, %lu): stub\n", hProcess, policy, buffer, length); + + return TRUE; +} -- 2.19.1

2 1

[PATCH] powrprof: Add PowerDeterminePlatformRoleEx() stub.
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 1597d96f58..d870fe2ebd 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -321,6 +321,12 @@ POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) return PlatformRoleDesktop; } +POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRoleEx(ULONG version) +{ + FIXME("%u stub.\n", version); + return PlatformRoleDesktop; +} + DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, POWER_DATA_ACCESSOR flags, ULONG index, UCHAR *buffer, DWORD *buffer_size) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index a9e337a0e4..169219ad1a 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -11,6 +11,7 @@ @ stdcall IsPwrShutdownAllowed () @ stdcall IsPwrSuspendAllowed () @ stdcall PowerDeterminePlatformRole () +@ stdcall PowerDeterminePlatformRoleEx(long) @ stdcall PowerEnumerate(long ptr ptr long long ptr ptr) @ stdcall PowerGetActiveScheme (ptr ptr) @ stdcall PowerSetActiveScheme (ptr ptr) -- 2.19.1

1 0

[PATCH 1/2] kernel32/tests: Remove workarounds for SearchPath().
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/path.c | 64 ++++++++++++++------------------------ 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index ca1cbf30ec..ad8a34296a 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -70,8 +70,6 @@ static DWORD (WINAPI *pGetLongPathNameW)(LPWSTR,LPWSTR,DWORD); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathA)(LPCSTR); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); -static DWORD (WINAPI *pSearchPathA)(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*); -static DWORD (WINAPI *pSearchPathW)(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); static BOOL (WINAPI *pSetSearchPathMode)(DWORD); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); @@ -1812,24 +1810,18 @@ static void test_SearchPathA(void) HANDLE handle; DWORD ret; - if (!pSearchPathA) - { - win_skip("SearchPathA isn't available\n"); - return; - } - GetWindowsDirectoryA(pathA, ARRAY_SIZE(pathA)); /* NULL filename */ SetLastError(0xdeadbeef); - ret = pSearchPathA(pathA, NULL, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); + ret = SearchPathA(pathA, NULL, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* empty filename */ SetLastError(0xdeadbeef); - ret = pSearchPathA(pathA, fileA, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); + ret = SearchPathA(pathA, fileA, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); @@ -1845,38 +1837,38 @@ static void test_SearchPathA(void) delete_manifest_file("main.manifest"); /* search fails without active context */ - ret = pSearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret == 0, "got %d\n", ret); - ret = pSearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); ok(ret && ret == strlen(path2A), "got %d\n", ret); ret = pActivateActCtx(handle, &cookie); ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ - ret = pSearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep.dll", ".ext", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep.dll", ".ext", ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep", ".dll", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep", ".dll", ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep", ".ext", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep", ".ext", ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* name contains path */ - ret = pSearchPathA(NULL, testdeprelA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdeprelA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* fails with specified path that doesn't contain this file */ - ret = pSearchPathA(pathA, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(pathA, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* path is redirected for wellknown names too */ - ret = pSearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); ok(strcmp(buffA, path2A), "got wrong path %s, %s\n", buffA, path2A); @@ -1902,23 +1894,17 @@ static void test_SearchPathW(void) HANDLE handle; DWORD ret; - if (!pSearchPathW) - { - win_skip("SearchPathW isn't available\n"); - return; - } - if (0) { /* NULL filename, crashes on nt4 */ - pSearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); + SearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); } GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); /* empty filename */ SetLastError(0xdeadbeef); - ret = pSearchPathW(pathW, fileW, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); + ret = SearchPathW(pathW, fileW, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); @@ -1934,15 +1920,15 @@ if (0) delete_manifest_file("main.manifest"); /* search fails without active context */ - ret = pSearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret == 0, "got %d\n", ret); - ret = pSearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(path2W), path2W, NULL); + ret = SearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(path2W), path2W, NULL); ok(ret && ret == lstrlenW(path2W), "got %d\n", ret); /* full path, name without 'dll' extension */ GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); - ret = pSearchPathW(pathW, kernel32W, NULL, ARRAY_SIZE(path2W), path2W, NULL); + ret = SearchPathW(pathW, kernel32W, NULL, ARRAY_SIZE(path2W), path2W, NULL); ok(ret == 0, "got %d\n", ret); GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); @@ -1951,33 +1937,33 @@ if (0) ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ - ret = pSearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdepW, extW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, extW, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdep1W, dllW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdep1W, dllW, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdep1W, extW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdep1W, extW, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* name contains path */ - ret = pSearchPathW(NULL, testdeprelW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdeprelW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* fails with specified path that doesn't contain this file */ - ret = pSearchPathW(pathW, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(pathW, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* path is redirected for wellknown names too, meaning it takes precedence over normal search order */ - ret = pSearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); ok(lstrcmpW(buffW, path2W), "got wrong path %s, %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(path2W)); /* path is built using on manifest file name */ - ret = pSearchPathW(NULL, ole32W, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, ole32W, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); ret = pDeactivateActCtx(0, cookie); @@ -2118,8 +2104,6 @@ static void init_pointers(void) MAKEFUNC(GetLongPathNameW); MAKEFUNC(NeedCurrentDirectoryForExePathA); MAKEFUNC(NeedCurrentDirectoryForExePathW); - MAKEFUNC(SearchPathA); - MAKEFUNC(SearchPathW); MAKEFUNC(SetSearchPathMode); MAKEFUNC(ActivateActCtx); MAKEFUNC(CreateActCtxW); -- 2.19.1

1 1

[PATCH] dxgi: Support IID_IDXGIDevice in dxgi_adapter_CheckInterfaceSupport().
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/adapter.c | 3 ++- dlls/dxgi/tests/dxgi.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 4bc57a244d..0079759568 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -218,7 +218,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda TRACE("iface %p, guid %s, umd_version %p.\n", iface, debugstr_guid(guid), umd_version); /* This method works only for D3D10 interfaces. */ - if (!(IsEqualGUID(guid, &IID_ID3D10Device) + if (!(IsEqualGUID(guid, &IID_IDXGIDevice) + || IsEqualGUID(guid, &IID_ID3D10Device) || IsEqualGUID(guid, &IID_ID3D10Device1))) { WARN("Returning DXGI_ERROR_UNSUPPORTED for %s.\n", debugstr_guid(guid)); diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f2bc9ed229..bd5c574ec8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -838,6 +838,10 @@ static void test_check_interface_support(void) hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, &driver_version); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, &driver_version); -- 2.19.1

3 2

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-devel