- Wine-Devel - list.winehq.org

[PATCH 3/5] riched20: Handle WM_SETTEXT's unicode conversion in the host.
by Huw Davies March 10, 2021

March 10, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 2 +- dlls/riched20/txthost.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9ac5d49a3db..cacad463963 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3953,7 +3953,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_StreamInRTFString(editor, 0, (char *)lParam); } else - ME_SetText(editor, (void*)lParam, unicode); + ME_SetText( editor, (void*)lParam, TRUE ); } else TRACE("WM_SETTEXT - NULL\n"); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 14cb19e8f45..23c9962bb3a 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -863,6 +863,18 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, SetWindowLongW( hwnd, GWL_STYLE, style ); return res; } + case WM_SETTEXT: + { + char *textA = (char *)lparam; + WCHAR *text = (WCHAR *)lparam; + int len; + + if (!unicode && textA && strncmp( textA, "{\\rtf", 5 ) && strncmp( textA, "{\\urtf", 6 )) + text = ME_ToUnicode( CP_ACP, textA, &len ); + hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, (LPARAM)text, &res ); + if (text != (WCHAR *)lparam) ME_EndToUnicode( CP_ACP, text ); + break; + } default: res = ME_HandleMessage( editor, msg, wparam, lparam, unicode, &hr ); } -- 2.23.0

2 1

[PATCH] ntdll: Initialize USR1 handler XSTATE buffer (valgrind).
by Rémi Bernon March 10, 2021

March 10, 2021

Conditional jump or move depends on uninitialised value(s) at 0x46AC989: NtGetContextThread (signal_x86_64.c:2002) Conditional jump or move depends on uninitialised value(s) at 0x46ABA1E: xstate_to_server (unix_private.h:342) by 0x46ABA1E: context_to_server (signal_x86_64.c:1698) Conditional jump or move depends on uninitialised value(s) at 0x46AC18F: NtSetContextThread (signal_x86_64.c:1859) There's still some uninitialized bytes being passed to writev, but that seems to come from the pushfd instruction, and could probably be flagged as false positive. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 2a030372fb7..d0f3ece266c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2642,6 +2642,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *ucontext ) DECLSPEC_ALIGN(64) XSTATE xs; context.c.ContextFlags = CONTEXT_FULL; context_init_xstate( &context.c, &xs ); + memset( &xs, 0, offsetof(XSTATE, YmmContext) ); NtGetContextThread( GetCurrentThread(), &context.c ); wait_suspend( &context.c ); -- 2.30.0

2 1

[PATCH 6/6] mshtml: Add animationstart and animationend event support.
by Jacek Caban March 10, 2021

March 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 6 ++++++ dlls/mshtml/htmlevent.h | 2 ++ dlls/mshtml/tests/dom.js | 14 ++++++++++++++ 3 files changed, 22 insertions(+)

2 1

[PATCH 5/6] mshtml/tests: Use more winetest.js helpers in more places.
by Jacek Caban March 10, 2021

March 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.js | 113 +++++++++------------------- dlls/mshtml/tests/events.js | 142 ++++++++++++------------------------ 2 files changed, 80 insertions(+), 175 deletions(-)

2 1

[PATCH 3/6] mshtml: Expose IHTMLElement7 to scripts.
by Jacek Caban March 10, 2021

March 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 3 +++ dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 5 insertions(+)

2 1

infosoft:infosoft spam
by Francois Gouget March 10, 2021

March 10, 2021

WineTest has not been running the infosoft:insoft test but that should change soon. Unfortunately on the latest Windows 10 it spams the report with failures. ~500 KB worth of it! https://testbot.winehq.org/JobDetails.pl?Key=86812 If we could avoid that it would be nice. https://test.winehq.org/data/tests/infosoft:infosoft.html -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ A black hole is just God dividing by zero.

1 0

[PATCH v2 01/10] ddraw: Store hardware_device flag in struct d3d_device.
by Paul Gofman March 10, 2021

March 10, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 200969-200979. v2: - no changes. dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/ddraw_private.h | 3 ++- dlls/ddraw/device.c | 12 +++++++----- dlls/ddraw/surface.c | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d616330c307..705d0335d95 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4330,7 +4330,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, target, (IUnknown *)surface, 7, &object, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, target, (IUnknown *)surface, 7, &object, NULL))) { *device = &object->IDirect3DDevice7_iface; } @@ -4359,7 +4359,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, return CLASS_E_NOAGGREGATION; wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice3_iface; } @@ -4385,7 +4385,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice2_iface; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6bbd62949ac..e25ab23c2bc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -317,6 +317,7 @@ struct d3d_device IUnknown IUnknown_inner; LONG ref; UINT version; + BOOL hardware_device; IUnknown *outer_unknown; struct wined3d_device *wined3d_device; @@ -364,7 +365,7 @@ struct d3d_device const struct wined3d_stateblock_state *stateblock_state; }; -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) DECLSPEC_HIDDEN; enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4d24c22650e..5e66007213d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6925,7 +6925,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw) wined3d_stateblock_set_scissor_rect(ddraw->state, &rect); } -static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, +static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { static const struct wined3d_matrix ident = @@ -6948,6 +6948,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->IUnknown_inner.lpVtbl = &d3d_device_inner_vtbl; device->ref = 1; device->version = version; + device->hardware_device = IsEqualGUID(&IID_IDirect3DTnLHalDevice, guid) + || IsEqualGUID(&IID_IDirect3DHALDevice, guid); if (outer_unknown) device->outer_unknown = outer_unknown; @@ -7006,14 +7008,14 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, return D3D_OK; } -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) { struct d3d_device *object; HRESULT hr; - TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n", - ddraw, target, version, device, outer_unknown); + TRACE("ddraw %p, guid %s, target %p, version %u, device %p, outer_unknown %p.\n", + ddraw, debugstr_guid(guid), target, version, device, outer_unknown); if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) @@ -7054,7 +7056,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_OUTOFMEMORY; } - if (FAILED(hr = d3d_device_init(object, ddraw, target, rt_iface, version, outer_unknown))) + if (FAILED(hr = d3d_device_init(object, ddraw, guid, target, rt_iface, version, outer_unknown))) { WARN("Failed to initialize device, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0ca19d4f8a5..b910fb6817e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -256,7 +256,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, { HRESULT hr; - if (FAILED(hr = d3d_device_create(This->ddraw, This, (IUnknown *)&This->IDirectDrawSurface_iface, + if (FAILED(hr = d3d_device_create(This->ddraw, riid, This, (IUnknown *)&This->IDirectDrawSurface_iface, 1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface))) { This->device1 = NULL; -- 2.29.2

3 23

Question about recommended clang option
by Dean Greer March 10, 2021

March 10, 2021

Hi all, I know https://wiki.winehq.org/Clang hasn’t been updated in forever so I’m wondering is it still recommended to to set CFLAGS=“-std=gnu89” I’m asking as I’m able to compile using clang with and without this option for both wine-devel and wine-staging, so is this really require or any drawbacks to using or not using this option?

2 1

[PATCH] winetest: Avoid duplicating the extract_test_proc() cleanup code.
by Francois Gouget March 10, 2021

March 10, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/winetest/main.c | 54 ++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 1731850bfdb..408e1b3c706 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -890,6 +890,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP DWORD err; HANDLE actctx; ULONG_PTR cookie; + BOOL run; if (aborting) return TRUE; @@ -941,50 +942,39 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP else dll = 0; } + run = TRUE; if (!dll) { xprintf (" %s=dll is missing\n", dllname); - if (actctx != INVALID_HANDLE_VALUE) - { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); - } - return TRUE; + run = FALSE; } - if(is_stub_dll(dllname)) + else { - FreeLibrary(dll); - xprintf (" %s=dll is a stub\n", dllname); - if (actctx != INVALID_HANDLE_VALUE) + if (is_stub_dll(dllname)) { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); + xprintf (" %s=dll is a stub\n", dllname); + run = FALSE; } - return TRUE; - } - if (is_native_dll(dll)) - { - FreeLibrary(dll); - xprintf (" %s=load error Configured as native\n", dllname); - nr_native_dlls++; - if (actctx != INVALID_HANDLE_VALUE) + else if (is_native_dll(dll)) { - pDeactivateActCtx(0, cookie); - pReleaseActCtx(actctx); + xprintf (" %s=load error Configured as native\n", dllname); + nr_native_dlls++; + run = FALSE; } - return TRUE; + FreeLibrary(dll); } - FreeLibrary(dll); - if (!(err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ))) + if (run) { - xprintf (" %s=%s\n", dllname, get_file_version(filename)); - nr_of_tests += wine_tests[nr_of_files].subtest_count; - nr_of_files++; - } - else - { - xprintf (" %s=load error %u\n", dllname, err); + err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); + if (!err) + { + xprintf (" %s=%s\n", dllname, get_file_version(filename)); + nr_of_tests += wine_tests[nr_of_files].subtest_count; + nr_of_files++; + } + else + xprintf (" %s=load error %u\n", dllname, err); } if (actctx != INVALID_HANDLE_VALUE) -- 2.20.1

1 0

[PATCH] widl: Allow runtimeclass to not have a default interface.
by Rémi Bernon March 10, 2021

March 10, 2021

Or any interfaces, as long as they have a static factory, as MIDL requires. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/header.c | 2 +- tools/widl/typetree.c | 11 ++++++----- tools/widl/typetree.h | 8 ++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 40c1f9d008e..a5e5d6c6fb3 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -488,7 +488,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i fprintf(h, "%s", type_get_qualified_name(t, name_type)); break; case TYPE_RUNTIMECLASS: - fprintf(h, "%s", type_get_name(type_runtimeclass_get_default_iface(t), name_type)); + fprintf(h, "%s", type_get_name(type_runtimeclass_get_default_iface(t, TRUE), name_type)); break; case TYPE_DELEGATE: fprintf(h, "%s", type_get_qualified_name(type_delegate_get_iface(t), name_type)); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 591a58b2849..a4e1696d2af 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -188,7 +188,7 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t n += strappend(buf, len, pos + n, "rc("); n += append_namespaces(buf, len, pos + n, type->namespace, "", ".", type->name, NULL); n += strappend(buf, len, pos + n, ";"); - n += append_type_signature(buf, len, pos + n, type_runtimeclass_get_default_iface(type)); + n += append_type_signature(buf, len, pos + n, type_runtimeclass_get_default_iface(type, TRUE)); n += strappend(buf, len, pos + n, ")"); return n; case TYPE_POINTER: @@ -379,7 +379,7 @@ static char *format_parameterized_type_impl_name(type_t *type, typeref_list_t *p { pos += strappend(&buf, &len, pos, "ABI::Windows::Foundation::Internal::AggregateType<%s", type->qualified_name); pos += append_pointer_stars(&buf, &len, pos, ref->type); - iface = type_runtimeclass_get_default_iface(type); + iface = type_runtimeclass_get_default_iface(type, TRUE); pos += strappend(&buf, &len, pos, ", %s", iface->qualified_name); pos += append_pointer_stars(&buf, &len, pos, ref->type); pos += strappend(&buf, &len, pos, " >"); @@ -843,10 +843,11 @@ type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, typer runtimeclass->attrs = check_runtimeclass_attrs(runtimeclass->name, attrs); runtimeclass->details.runtimeclass.ifaces = ifaces; runtimeclass->defined = TRUE; - if (!type_runtimeclass_get_default_iface(runtimeclass)) - error_loc("missing default interface on runtimeclass %s\n", runtimeclass->name); + if (!type_runtimeclass_get_default_iface(runtimeclass, FALSE) && + !get_attrp(runtimeclass->attrs, ATTR_STATIC)) + error_loc("runtimeclass %s must have a default interface or static factory\n", runtimeclass->name); - LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) + if (ifaces) LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) { /* FIXME: this should probably not be allowed, here or in coclass, */ /* but for now there's too many places in Wine IDL where it is to */ diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index b9833dc4e8f..b43b6bfbf79 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -20,6 +20,9 @@ #include "widltypes.h" #include <assert.h> +#include <stdio.h> + +#include "utils.h" #ifndef WIDL_TYPE_TREE_H #define WIDL_TYPE_TREE_H @@ -379,7 +382,7 @@ static inline typeref_list_t *type_runtimeclass_get_ifaces(const type_t *type) return type->details.runtimeclass.ifaces; } -static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) +static inline type_t *type_runtimeclass_get_default_iface(const type_t *type, int check) { typeref_list_t *ifaces = type_runtimeclass_get_ifaces(type); typeref_t *ref; @@ -389,7 +392,8 @@ static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) if (is_attr(ref->attrs, ATTR_DEFAULT)) return ref->type; - return NULL; + if (!check) return NULL; + error_loc_info(&type->loc_info, "runtimeclass %s needs a default interface\n", type->name); } static inline type_t *type_delegate_get_iface(const type_t *type) -- 2.30.0

2 1