March 2021 - Wine-Commits - list.winehq.org

Jacek Caban : jscript: Print source location in backtraces.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 2986821b933c239b1b16def8eb87bc0df3ed1d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2986821b933c239b1b16def8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 10 14:59:57 2021 +0100 jscript: Print source location in backtraces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 14 ++++++++++++++ dlls/jscript/engine.c | 5 +++-- dlls/jscript/engine.h | 2 ++ dlls/jscript/jscript.c | 14 ++++---------- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index a1d1171e2ec..dea8db1f37e 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2236,6 +2236,20 @@ static void resolve_labels(compiler_ctx_t *ctx, unsigned off) ctx->labels_cnt = 0; } +unsigned get_location_line(bytecode_t *code, unsigned loc, unsigned *char_pos) +{ + unsigned line = code->start_line; + const WCHAR *nl, *p; + + for(nl = p = code->source; p < code->source + loc; p++) { + if(*p != '\n') continue; + line++; + nl = p + 1; + } + *char_pos = loc - (nl - code->source); + return line; +} + void release_bytecode(bytecode_t *code) { unsigned i; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0fdcb13f142..e1c3783196f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2703,7 +2703,7 @@ static void pop_call_frame(script_ctx_t *ctx) static void print_backtrace(script_ctx_t *ctx) { - unsigned depth = 0, i; + unsigned depth = 0, i, line, char_pos; call_frame_t *frame; for(frame = ctx->call_ctx; frame; frame = frame->prev_frame) { @@ -2724,7 +2724,8 @@ static void print_backtrace(script_ctx_t *ctx) }else { WARN("[detached frame]"); } - WARN(")\n"); + line = get_location_line(frame->bytecode, frame->bytecode->instrs[frame->ip].loc, &char_pos); + WARN(") context %s line %u char %u\n", wine_dbgstr_longlong(frame->bytecode->source_context), line, char_pos); if(!(frame->flags & EXEC_RETURN_TO_INTERP)) { WARN("%u\t[native code]\n", depth); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 2a8e405a28f..eca27cb1460 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -201,6 +201,8 @@ struct _bytecode_t { HRESULT compile_script(script_ctx_t*,const WCHAR*,UINT64,unsigned,const WCHAR*,const WCHAR*,BOOL,BOOL,named_item_t*,bytecode_t**) DECLSPEC_HIDDEN; void release_bytecode(bytecode_t*) DECLSPEC_HIDDEN; +unsigned get_location_line(bytecode_t *code, unsigned loc, unsigned *char_pos) DECLSPEC_HIDDEN; + static inline bytecode_t *bytecode_addref(bytecode_t *code) { code->ref++; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8e729a04324..c5c23889f04 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -257,8 +257,7 @@ static HRESULT WINAPI JScriptError_GetSourcePosition(IActiveScriptError *iface, { JScriptError *This = impl_from_IActiveScriptError(iface); bytecode_t *code = This->ei.code; - const WCHAR *nl, *p; - unsigned l; + unsigned line_pos, char_pos; TRACE("(%p)->(%p %p %p)\n", This, source_context, line, character); @@ -272,16 +271,11 @@ static HRESULT WINAPI JScriptError_GetSourcePosition(IActiveScriptError *iface, if(!line && !character) return S_OK; - l = code->start_line; - for(nl = p = code->source; p < code->source + This->ei.loc; p++) { - if(*p != '\n') continue; - l++; - nl = p + 1; - } + line_pos = get_location_line(code, This->ei.loc, &char_pos); if(line) - *line = l; + *line = line_pos; if(character) - *character = code->source + This->ei.loc - nl; + *character = char_pos; return S_OK; }

1 0

Jacek Caban : mshtml: Add animationstart and animationend event support.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: cdb264e871c273abb70022a40dbf890de45bc483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb264e871c273abb70022a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 10 14:59:20 2021 +0100 mshtml: Add animationstart and animationend event support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 6 ++++++ dlls/mshtml/htmlevent.h | 2 ++ dlls/mshtml/tests/dom.js | 14 ++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 1befd94c742..da2d59bc894 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -109,6 +109,10 @@ typedef struct { static const event_info_t event_info[] = { {L"abort", EVENT_TYPE_EVENT, DISPID_EVMETH_ONABORT, EVENT_BIND_TO_TARGET}, + {L"animationend", EVENT_TYPE_EVENT, DISPID_EVPROP_ONANIMATIONEND, + EVENT_DEFAULTLISTENER | EVENT_BUBBLES}, + {L"animationstart", EVENT_TYPE_EVENT, DISPID_EVPROP_ONANIMATIONSTART, + EVENT_DEFAULTLISTENER | EVENT_BUBBLES}, {L"beforeactivate", EVENT_TYPE_EVENT, DISPID_EVMETH_ONBEFOREACTIVATE, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {L"beforeunload", EVENT_TYPE_EVENT, DISPID_EVMETH_ONBEFOREUNLOAD, @@ -185,6 +189,8 @@ static const event_info_t event_info[] = { EVENT_FIXME} }; +C_ASSERT(ARRAY_SIZE(event_info) == EVENTID_LAST); + static eventid_t str_to_eid(const WCHAR *str) { int i; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index c5d9753722a..69655d2a4ee 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -18,6 +18,8 @@ typedef enum { EVENTID_ABORT, + EVENTID_ANIMATIONEND, + EVENTID_ANIMATIONSTART, EVENTID_BEFOREACTIVATE, EVENTID_BEFOREUNLOAD, EVENTID_BLUR, diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 0064690ee36..7fc6b87882c 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -401,3 +401,17 @@ sync_test("storage", function() { ok(typeof(window.localStorage) === "object", "typeof(window.localStorage) = " + typeof(window.localStorage)); }); + +async_test("animation", function() { + document.body.innerHTML = + "<style>" + + " @keyframes testAnimation {0% { opacity: 0; } 100% { opacity: 1; }}" + + " .testAnimation { animation-name: testAnimation; animation-duration: 0.01s; }" + + "</style>"; + var div = document.createElement("div"); + div.addEventListener("animationstart", function() { + div.addEventListener("animationend", next_test); + }); + document.body.appendChild(div); + div.className = "testAnimation"; +});

1 0

Owen Rudge : winspool: Filter invalid characters when creating the PPD filename.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 6b906e82371513e9f5b94fa2d67ad8e0ee865335 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b906e82371513e9f5b94fa2… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 10 12:26:50 2021 +0000 winspool: Filter invalid characters when creating the PPD filename. Fixes potential crash when trying to print if a CUPS printer name contains an asterisk. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fb9c1599d38..4d0542d20e3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -721,13 +721,18 @@ fail: static WCHAR *get_ppd_filename( const WCHAR *dir, const WCHAR *file_name ) { static const WCHAR dot_ppd[] = {'.','p','p','d',0}; - int len = (strlenW( dir ) + strlenW( file_name )) * sizeof(WCHAR) + sizeof(dot_ppd); - WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ); + static const WCHAR invalid_chars[] = {'*','?','<','>','|','"','/','\\',0}; + int dir_len = strlenW( dir ), file_len = strlenW( file_name ); + int len = (dir_len + file_len + ARRAY_SIZE( dot_ppd )) * sizeof(WCHAR); + WCHAR *ppd = HeapAlloc( GetProcessHeap(), 0, len ), *p; if (!ppd) return NULL; - strcpyW( ppd, dir ); - strcatW( ppd, file_name ); - strcatW( ppd, dot_ppd ); + memcpy( ppd, dir, dir_len * sizeof(WCHAR) ); + memcpy( ppd + dir_len, file_name, file_len * sizeof(WCHAR) ); + memcpy( ppd + dir_len + file_len, dot_ppd, sizeof(dot_ppd) ); + + p = ppd + dir_len; + while ((p = strpbrkW( p, invalid_chars ))) *p++ = '_'; return ppd; }

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_constant_buffer().
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 01bcca637023a20c3cb4a2fbea7fb02ffdf380ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=01bcca637023a20c3cb4a2fb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 20:08:57 2021 -0600 wined3d: Introduce wined3d_device_context_set_constant_buffer(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 46 +++++++++++++++++++++++++++------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1edbd23e7e4..338b489c9b9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2107,27 +2107,13 @@ void CDECL wined3d_device_context_set_shader(struct wined3d_device_context *cont wined3d_shader_decref(prev); } -void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) -{ - TRACE("device %p, shader %p.\n", device, shader); - - return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, shader); -} - -struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) -{ - TRACE("device %p.\n", device); - - return device->cs->c.state->shader[WINED3D_SHADER_TYPE_VERTEX]; -} - -void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, - enum wined3d_shader_type type, UINT idx, struct wined3d_buffer *buffer) +void CDECL wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, + enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer) { - struct wined3d_state *state = device->cs->c.state; + struct wined3d_state *state = context->state; struct wined3d_buffer *prev; - TRACE("device %p, type %#x, idx %u, buffer %p.\n", device, type, idx, buffer); + TRACE("context %p, type %#x, idx %u, buffer %p.\n", context, type, idx, buffer); if (idx >= MAX_CONSTANT_BUFFERS) { @@ -2142,11 +2128,33 @@ void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, if (buffer) wined3d_buffer_incref(buffer); state->cb[type][idx] = buffer; - wined3d_device_context_emit_set_constant_buffer(&device->cs->c, type, idx, buffer); + wined3d_device_context_emit_set_constant_buffer(context, type, idx, buffer); if (prev) wined3d_buffer_decref(prev); } +void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) +{ + TRACE("device %p, shader %p.\n", device, shader); + + return wined3d_device_context_set_shader(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, shader); +} + +struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return device->cs->c.state->shader[WINED3D_SHADER_TYPE_VERTEX]; +} + +void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, + enum wined3d_shader_type type, UINT idx, struct wined3d_buffer *buffer) +{ + TRACE("device %p, type %#x, idx %u, buffer %p.\n", device, type, idx, buffer); + + return wined3d_device_context_set_constant_buffer(&device->cs->c, type, idx, buffer); +} + struct wined3d_buffer * CDECL wined3d_device_get_constant_buffer(const struct wined3d_device *device, enum wined3d_shader_type shader_type, unsigned int idx) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f5fa1d3d7e5..d88817d6551 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -167,6 +167,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ba9e8642ea2..0bdf53c651e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2549,6 +2549,8 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, + enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader);

1 0

Rémi Bernon : winedbg: Don't dereference possibly NULL thread pointer.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 6eff0342ad6f8c262112e6aeb083bb386d37cf04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eff0342ad6f8c262112e6ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 9 22:54:55 2021 +0100 winedbg: Don't dereference possibly NULL thread pointer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 3c1b3e85df8..a19b5950ccc 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -112,11 +112,11 @@ struct gdb_context static void gdbctx_delete_xpoint(struct gdb_context *gdbctx, struct dbg_thread *thread, dbg_ctx_t *ctx, struct gdb_xpoint *x) { - struct dbg_process *process = thread->process; + struct dbg_process *process = gdbctx->process; struct backend_cpu *cpu = process->be_cpu; if (!cpu->remove_Xpoint(process->handle, process->process_io, ctx, x->type, x->addr, x->value, x->size)) - ERR("%04x:%04x: Couldn't remove breakpoint at:%p/%x type:%d\n", process->pid, thread->tid, x->addr, x->size, x->type); + ERR("%04x:%04x: Couldn't remove breakpoint at:%p/%x type:%d\n", process->pid, thread ? thread->tid : ~0, x->addr, x->size, x->type); list_remove(&x->entry); HeapFree(GetProcessHeap(), 0, x);

1 0

Jacek Caban : mshtml: Expose IHTMLElement7 to scripts.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 926d662e3607bfb7b7cc59fb98460f36466f6858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=926d662e3607bfb7b7cc59fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 10 14:58:17 2021 +0100 mshtml: Expose IHTMLElement7 to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 3 +++ dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 2d4a8e8113f..b7aca01c3c1 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6273,6 +6273,9 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) dispex_info_add_interface(info, IHTMLElement6_tid, NULL); dispex_info_add_interface(info, IElementTraversal_tid, NULL); } + + if(mode >= COMPAT_MODE_IE10) + dispex_info_add_interface(info, IHTMLElement7_tid, NULL); } static const tid_t HTMLElement_iface_tids[] = { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 75ebe082ce0..d61d3658151 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -42,6 +42,8 @@ sync_test("elem_props", function() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); + test_exposed("msSetPointerCapture", v >= 10); + if (v >= 9) test_exposed("spellcheck", v >= 10); }); sync_test("doc_props", function() {

1 0

Jactry Zeng : ole32: Handle CF_HDROP format.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 1a82fbf4333a5f04f2b2a82344eb3279e4b33ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a82fbf4333a5f04f2b2a823… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Mar 10 10:41:30 2021 +0000 ole32: Handle CF_HDROP format. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 1 + dlls/ole32/tests/clipboard.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index a28dcef9eee..e61b3076883 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1138,6 +1138,7 @@ static DWORD get_tymed_from_nonole_cf(UINT cf) case CF_TEXT: case CF_OEMTEXT: case CF_UNICODETEXT: + case CF_HDROP: return TYMED_ISTREAM | TYMED_HGLOBAL; case CF_ENHMETAFILE: return TYMED_ENHMF; diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 0a087aff840..fd8f287680b 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -28,6 +28,8 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "shellapi.h" +#include "shlobj.h" #include "wine/test.h" @@ -1513,6 +1515,24 @@ static HENHMETAFILE create_emf(void) return CloseEnhMetaFile(hdc); } +static HDROP create_dropped_file(void) +{ + WCHAR path[] = L"C:\\testfile1\0"; + DROPFILES *dropfiles; + DWORD offset; + HDROP hdrop; + + offset = sizeof(DROPFILES); + hdrop = GlobalAlloc(GHND, offset + sizeof(path)); + dropfiles = GlobalLock(hdrop); + dropfiles->pFiles = offset; + dropfiles->fWide = TRUE; + memcpy((char *)dropfiles + offset, path, sizeof(path)); + GlobalUnlock(hdrop); + + return hdrop; +} + static void test_nonole_clipboard(void) { HRESULT hr; @@ -1524,6 +1544,7 @@ static void test_nonole_clipboard(void) HENHMETAFILE emf; STGMEDIUM med; DWORD obj_type; + HDROP hdrop; r = OpenClipboard(NULL); ok(r, "gle %d\n", GetLastError()); @@ -1552,6 +1573,7 @@ static void test_nonole_clipboard(void) hblob = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE|GMEM_ZEROINIT, 10); emf = create_emf(); hstorage = create_storage(); + hdrop = create_dropped_file(); r = OpenClipboard(NULL); ok(r, "gle %d\n", GetLastError()); @@ -1563,6 +1585,8 @@ static void test_nonole_clipboard(void) ok(h == emf, "got %p\n", h); h = SetClipboardData(cf_storage, hstorage); ok(h == hstorage, "got %p\n", h); + h = SetClipboardData(CF_HDROP, hdrop); + ok(h == hdrop, "got %p\n", h); r = CloseClipboard(); ok(r, "gle %d\n", GetLastError()); @@ -1608,6 +1632,14 @@ static void test_nonole_clipboard(void) ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == CF_HDROP, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); ok(hr == S_OK, "got %08x\n", hr); /* User32 adds some synthesised formats */

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_blend_state().
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: cd17163265abbefad4b045218901a7b8b53eca01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd17163265abbefad4b04521… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 20:09:00 2021 -0600 wined3d: Introduce wined3d_device_context_set_blend_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 41 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8ea7351f5fc..d5179f68cd6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1740,25 +1740,10 @@ static void resolve_depth_buffer(struct wined3d_device *device) void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state, const struct wined3d_color *blend_factor, unsigned int sample_mask) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_blend_state *prev; - TRACE("device %p, blend_state %p, blend_factor %s, sample_mask %#x.\n", device, blend_state, debug_color(blend_factor), sample_mask); - prev = state->blend_state; - if (prev == blend_state && !memcmp(blend_factor, &state->blend_factor, sizeof(*blend_factor)) - && sample_mask == state->sample_mask) - return; - - if (blend_state) - wined3d_blend_state_incref(blend_state); - state->blend_state = blend_state; - state->blend_factor = *blend_factor; - state->sample_mask = sample_mask; - wined3d_device_context_emit_set_blend_state(&device->cs->c, blend_state, blend_factor, sample_mask); - if (prev) - wined3d_blend_state_decref(prev); + wined3d_device_context_set_blend_state(&device->cs->c, blend_state, blend_factor, sample_mask); } struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct wined3d_device *device, @@ -2133,6 +2118,30 @@ void CDECL wined3d_device_context_set_constant_buffer(struct wined3d_device_cont wined3d_buffer_decref(prev); } +void CDECL wined3d_device_context_set_blend_state(struct wined3d_device_context *context, + struct wined3d_blend_state *blend_state, const struct wined3d_color *blend_factor, unsigned int sample_mask) +{ + struct wined3d_state *state = context->state; + struct wined3d_blend_state *prev; + + TRACE("context %p, blend_state %p, blend_factor %p, sample_mask %#x.\n", + context, blend_state, blend_factor, sample_mask); + + prev = state->blend_state; + if (prev == blend_state && !memcmp(blend_factor, &state->blend_factor, sizeof(*blend_factor)) + && sample_mask == state->sample_mask) + return; + + if (blend_state) + wined3d_blend_state_incref(blend_state); + state->blend_state = blend_state; + state->blend_factor = *blend_factor; + state->sample_mask = sample_mask; + wined3d_device_context_emit_set_blend_state(context, blend_state, blend_factor, sample_mask); + if (prev) + wined3d_blend_state_decref(prev); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d88817d6551..17cff7ffb9f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -167,6 +167,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0bdf53c651e..ead427a13f6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2549,6 +2549,8 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, + struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context,

1 0

Jacek Caban : mshtml/tests: Use more winetest.js helpers in more places.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: e06c541cb6ccaf9140c9b7637170194d1f8041c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e06c541cb6ccaf9140c9b763… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 10 14:59:02 2021 +0100 mshtml/tests: Use more winetest.js helpers in more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.js | 113 +++++++++++------------------------ dlls/mshtml/tests/events.js | 142 ++++++++++++++------------------------------ 2 files changed, 80 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e06c541cb6ccaf9140c9…

1 0

Jacek Caban : mshtml: Add IHTMLElement7::spellcheck property implementation.
by Alexandre Julliard March 10, 2021

March 10, 2021

Module: wine Branch: master Commit: 44dbb88ce417deb8515991aa0a82bc7b344185e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44dbb88ce417deb8515991aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 10 14:58:29 2021 +0100 mshtml: Add IHTMLElement7::spellcheck property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 35 +++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b7aca01c3c1..f93e015f559 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5414,15 +5414,42 @@ static HRESULT WINAPI HTMLElement7_get_xmsAcceleratorKey(IHTMLElement7 *iface, B static HRESULT WINAPI HTMLElement7_put_spellcheck(IHTMLElement7 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(!This->html_element) { + FIXME("non-HTML element\n"); + return E_NOTIMPL; + } + + if(V_VT(&v) != VT_BOOL) { + FIXME("unsupported argument %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + return map_nsresult(nsIDOMHTMLElement_SetSpellcheck(This->html_element, !!V_BOOL(&v))); } static HRESULT WINAPI HTMLElement7_get_spellcheck(IHTMLElement7 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool spellcheck; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->html_element) { + FIXME("non-HTML element\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLElement_GetSpellcheck(This->html_element, &spellcheck); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + V_VT(p) = VT_BOOL; + V_BOOL(p) = spellcheck ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLElement7_put_onmsmanipulationstatechanged(IHTMLElement7 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 94923d83add..ebed27b48e8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8369,6 +8369,48 @@ static void test_iframe_elem(IHTMLElement *elem) IHTMLDocument2_Release(content_doc); } +static void test_elem_spellcheck(IHTMLElement *iface) +{ + IHTMLElement7 *elem; + VARIANT v; + HRESULT hres; + + hres = IUnknown_QueryInterface(iface, &IID_IHTMLElement7, (void**)&elem); + if(hres == E_NOINTERFACE) { + win_skip("IHTMLElement7 not supported\n"); + return; + } + ok(hres == S_OK, "Could not get IHTMLElement7 interface: %08x\n", hres); + + V_VT(&v) = VT_ERROR; + hres = IHTMLElement7_get_spellcheck(elem, &v); + ok(hres == S_OK, "get_spellcheck failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL && !V_BOOL(&v), "spellcheck = %s\n", wine_dbgstr_variant(&v)); + + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = VARIANT_TRUE; + hres = IHTMLElement7_put_spellcheck(elem, v); + ok(hres == S_OK, "put_spellcheck failed: %08x\n", hres); + + V_VT(&v) = VT_ERROR; + hres = IHTMLElement7_get_spellcheck(elem, &v); + ok(hres == S_OK, "get_spellcheck failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL && V_BOOL(&v) == VARIANT_TRUE, "spellcheck = %s\n", + wine_dbgstr_variant(&v)); + + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = VARIANT_FALSE; + hres = IHTMLElement7_put_spellcheck(elem, v); + ok(hres == S_OK, "put_spellcheck failed: %08x\n", hres); + + V_VT(&v) = VT_ERROR; + hres = IHTMLElement7_get_spellcheck(elem, &v); + ok(hres == S_OK, "get_spellcheck failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL && !V_BOOL(&v), "spellcheck = %s\n", wine_dbgstr_variant(&v)); + + IHTMLElement7_Release(elem); +} + #define test_stylesheet_csstext(a,b,c) _test_stylesheet_csstext(__LINE__,a,b,c) static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const WCHAR *exstr, BOOL is_todo) { @@ -8981,6 +9023,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_client_size((IUnknown*)elem); test_input_type(input, L"text"); test_elem_istextedit(elem, VARIANT_TRUE); + test_elem_spellcheck(elem); test_node_get_value_str((IUnknown*)elem, NULL); test_node_put_value_str((IUnknown*)elem, L"test");

1 0