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

Michael Stefaniuc : d3d9: Actually test two return values.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: bb99ba7447208b6e602c47ed43fab252da61a80a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb99ba7447208b6e602c47ed… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 26 20:41:37 2019 +0100 d3d9: Actually test two return values. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ffeb6b4..f79f261 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13341,7 +13341,7 @@ static void test_get_display_mode(void) hr = IDirect3DDevice9_GetDisplayMode(device, 0, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); @@ -13371,7 +13371,7 @@ static void test_get_display_mode(void) ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height);

1 0

Alexandre Julliard : user32: Add a dummy _wassert implementation to avoid a Mingw build issue.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 5aa83bee08e4049a5738c47c83b14dd7fa8a0e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aa83bee08e4049a5738c47c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 16:50:21 2019 +0100 user32: Add a dummy _wassert implementation to avoid a Mingw build issue. _wassert references __imp__MessageBoxW(a)16 which causes a duplicate definition of MessageBoxW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 007cb68..8300975 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -55,6 +55,10 @@ static DWORD exiting_thread_id; extern void WDML_NotifyThreadDetach(void); +#ifdef __MINGW32__ +/* work around a Mingw build issue where _wassert causes a duplicate reference to MessageBoxW */ +void __cdecl _wassert( const WCHAR *msg, const WCHAR *file, unsigned line) { abort(); } +#endif /*********************************************************************** * USER_Lock

1 0

Alexandre Julliard : libwine: Move string functions to libwine_port.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 47242d25f5b2964c9a61956345d1fe0ad39b96d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47242d25f5b2964c9a619563… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 10:03:38 2019 +0100 libwine: Move string functions to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/{wine => port}/string.c | 3 +-- libs/wine/Makefile.in | 3 +-- libs/wine/port.c | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index ef3b23f..18cbf79 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -101,6 +101,7 @@ C_SRCS = \ sortkey.c \ spawn.c \ statvfs.c \ + string.c \ strnlen.c \ symlink.c \ usleep.c \ diff --git a/libs/wine/string.c b/libs/port/string.c similarity index 99% rename from libs/wine/string.c rename to libs/port/string.c index 7aa981f..c3388bc 100644 --- a/libs/wine/string.c +++ b/libs/port/string.c @@ -23,7 +23,6 @@ #include <limits.h> #include <stdio.h> -#define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) @@ -473,7 +472,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) *fmta = '\0'; if (*iter == 'a' || *iter == 'A' || *iter == 'e' || *iter == 'E' || - *iter == 'f' || *iter == 'F' || + *iter == 'f' || *iter == 'F' || *iter == 'g' || *iter == 'G') sprintf(bufaiter, fmtbufa, va_arg(valist, double)); else diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index bd8a937..6525a53 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -6,8 +6,7 @@ C_SRCS = \ ldt.c \ loader.c \ mmap.c \ - port.c \ - string.c + port.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index 666c4ca..e954e5b 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -25,6 +25,7 @@ #include <string.h> #include <sys/types.h> +#define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" #include "wine/library.h" @@ -33,6 +34,8 @@ #ifndef __ANDROID__ const void *libwine_port_functions[] = { + strtolW, + vsnprintfW, wine_compare_string, wine_cp_enum_table, wine_cp_get_table,

1 0

Piotr Caban : kernel32: Don't use strcasecmp.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 2eb1849100e741f3d936bf3f2d52ea09367f9867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb1849100e741f3d936bf3f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 14:08:12 2019 +0100 kernel32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/oldconfig.c | 4 ++-- dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ed7543e..00006d4 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -339,7 +339,7 @@ static const union cptable *get_codepage_table( unsigned int codepage ) static int charset_cmp( const void *name, const void *entry ) { const struct charset_entry *charset = entry; - return strcasecmp( name, charset->charset_name ); + return _strnicmp( name, charset->charset_name, -1 ); } /*********************************************************************** diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 219ecc5..dcce1aa 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -301,8 +301,8 @@ static void create_hardware_branch(void) fgets(cStr, sizeof(cStr), procfile); fclose(procfile); nType = DRIVE_UNKNOWN; - if (strncasecmp(cStr, "disk", 4) == 0) nType = DRIVE_FIXED; - if (strncasecmp(cStr, "cdrom", 5) == 0) nType = DRIVE_CDROM; + if (_strnicmp(cStr, "disk", 4) == 0) nType = DRIVE_FIXED; + if (_strnicmp(cStr, "cdrom", 5) == 0) nType = DRIVE_CDROM; if (nType == DRIVE_UNKNOWN) continue; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6062cfb..0ff695a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1391,7 +1391,7 @@ @ cdecl -private _strcmpi(str str) _stricmp @ cdecl -private _stricmp(str str) @ cdecl -private _strlwr(str) -@ cdecl -private _strnicmp(str str long) +@ cdecl _strnicmp(str str long) #add _strnicmp to importlib so it can be used instead of strncasecmp @ cdecl -private _strupr(str) @ cdecl -private _tolower(long) NTDLL__tolower @ cdecl -private _toupper(long) NTDLL__toupper diff --git a/include/winternl.h b/include/winternl.h index 147cb1d..2b3fb94 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2886,6 +2886,8 @@ NTSYSAPI NTSTATUS WINAPI RtlpUnWaitCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,__ms_va_list); NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_va_list); +NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t); + /* 32-bit only functions */ #ifndef _WIN64

1 0

Piotr Caban : winmm: Don't use toupper.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: b602787a9332ea20d7d00f42054d060ae0c21760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b602787a9332ea20d7d00f42… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 14:08:28 2019 +0100 winmm: Don't use toupper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mmio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index b4155b6..6f14301 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -38,6 +38,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "winternl.h" #include "mmsystem.h" #include "winemm.h" @@ -1054,7 +1055,7 @@ FOURCC WINAPI mmioStringToFOURCCA(LPCSTR sz, UINT uFlags) for (i = 0; i < 4 && sz[i]; i++) { if (uFlags & MMIO_TOUPPER) { - cc[i] = toupper(sz[i]); + cc[i] = RtlUpperChar(sz[i]); } else { cc[i] = sz[i]; }

1 0

Jacek Caban : mshtml: Expose getComputedStyle to scripts.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 3886fa60e0fceff3f1f439445fdd886997a26985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3886fa60e0fceff3f1f43944… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:52:27 2019 +0100 mshtml: Expose getComputedStyle to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 8 +------- dlls/mshtml/tests/documentmode.js | 16 ++++++++++++++++ dlls/mshtml/tests/elements.js | 17 +++++++++++++++++ 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 55c03df..a2aa90a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3499,14 +3499,8 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { - /* FIXME: Expose getComputedStyle once it's implemented. - * Stubs break existing web sites. */ - static const dispex_hook_t window7_hooks[] = { - {DISPID_IHTMLWINDOW7_GETCOMPUTEDSTYLE, NULL}, - {DISPID_UNKNOWN} - }; if(compat_mode >= COMPAT_MODE_IE9) - dispex_info_add_interface(info, IHTMLWindow7_tid, window7_hooks); + dispex_info_add_interface(info, IHTMLWindow7_tid, NULL); dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); EventTarget_init_dispex_info(info, compat_mode); } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 63dad76..aa60cd4 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -105,6 +105,7 @@ function test_window_props() { test_exposed("dispatchEvent", v >= 9); test_exposed("getSelection", v >= 9); test_exposed("onfocusout", v >= 9); + test_exposed("getComputedStyle", v >= 9); if(v >= 9) /* FIXME: native exposes it in all compat modes */ test_exposed("performance", true); @@ -167,6 +168,21 @@ function test_style_props() { test_exposed("removeProperty", v >= 9); test_exposed("background-clip", v >= 9); + if(window.getComputedStyle) { + style = window.getComputedStyle(document.body); + + test_exposed("removeAttribute", false); + test_exposed("zIndex", true); + test_exposed("z-index", true); + test_exposed("pixelTop", false); + test_exposed("float", true); + test_exposed("css-float", false); + test_exposed("style-float", false); + test_exposed("setProperty", v >= 9); + test_exposed("removeProperty", v >= 9); + test_exposed("background-clip", v >= 9); + } + next_test(); } diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 47a8dcc..1498e1f 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -235,6 +235,7 @@ function test_document_owner() { function test_style_properties() { var style = document.body.style; var current_style = document.body.currentStyle; + var computed_style = window.getComputedStyle(document.body); var val; style.cssFloat = "left"; @@ -300,6 +301,22 @@ function test_style_properties() { ok(style.clip === "rect(1px, 1px, 10px, 10px)", "style.clip = " + style.clip); ok(current_style.clip === "rect(1px, 1px, 10px, 10px)", "current_style.clip = " + current_style.clip); + ok(computed_style.clip === "rect(1px, 1px, 10px, 10px)", + "computed_style.clip = " + current_style.clip); + + document.body.style.zIndex = 2; + ok(current_style.zIndex === 2, "current_style.zIndex = " + current_style.zIndex); + ok(computed_style.zIndex === 2, "computed_style.zIndex = " + computed_style.zIndex); + + try { + current_style.zIndex = 1; + ok(false, "expected exception"); + }catch(e) {} + + try { + computed_style.zIndex = 1; + ok(false, "expected exception"); + }catch(e) {} next_test(); }

1 0

Jacek Caban : mshtml: Add IHTMLRectCollection implementation.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 46de3fcf1d4a950c02692143be97462460503010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46de3fcf1d4a950c02692143… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:52:57 2019 +0100 mshtml: Add IHTMLRectCollection implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 83 +++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/elements.js | 18 ++++++++++ 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b14ecc1..da7b6cf 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -650,8 +650,15 @@ static HRESULT WINAPI HTMLRectCollection_Invoke(IHTMLRectCollection *iface, DISP static HRESULT WINAPI HTMLRectCollection_get_length(IHTMLRectCollection *iface, LONG *p) { HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 length; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMClientRectList_GetLength(This->rect_list, &length); + assert(nsres == NS_OK); + *p = length; + return S_OK; } static HRESULT WINAPI HTMLRectCollection_get__newEnum(IHTMLRectCollection *iface, IUnknown **p) @@ -681,12 +688,82 @@ static const IHTMLRectCollectionVtbl HTMLRectCollectionVtbl = { HTMLRectCollection_item }; +static inline HTMLRectCollection *HTMLRectCollection_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLRectCollection, dispex); +} + +static HRESULT HTMLRectCollection_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +{ + HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex); + UINT32 len = 0; + DWORD idx = 0; + WCHAR *ptr; + + for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + idx = idx*10 + (*ptr-'0'); + if(*ptr) + return DISP_E_UNKNOWNNAME; + + nsIDOMClientRectList_GetLength(This->rect_list, &len); + if(idx >= len) + return DISP_E_UNKNOWNNAME; + + *dispid = MSHTML_DISPID_CUSTOM_MIN + idx; + TRACE("ret %x\n", *dispid); + return S_OK; +} + +static HRESULT HTMLRectCollection_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex); + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + nsIDOMClientRect *rect; + IHTMLRect *html_rect; + nsresult nsres; + HRESULT hres; + + nsres = nsIDOMClientRectList_Item(This->rect_list, id - MSHTML_DISPID_CUSTOM_MIN, &rect); + if(NS_FAILED(nsres) || !rect) { + WARN("Unknown item\n"); + return DISP_E_UNKNOWNNAME; + } + + hres = create_html_rect(rect, &html_rect); + nsIDOMClientRect_Release(rect); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)html_rect; + break; + } + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static const dispex_static_data_vtbl_t HTMLRectCollection_dispex_vtbl = { + NULL, + HTMLRectCollection_get_dispid, + HTMLRectCollection_invoke, + NULL +}; static const tid_t HTMLRectCollection_iface_tids[] = { IHTMLRectCollection_tid, 0 }; static dispex_static_data_t HTMLRectCollection_dispex = { - NULL, + &HTMLRectCollection_dispex_vtbl, IHTMLRectCollection_tid, HTMLRectCollection_iface_tids }; diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 1498e1f..5077885 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -211,6 +211,23 @@ function test_compare_position() { next_test(); } +function test_rects() { + document.body.innerHTML = '<div>test</div>'; + var elem = document.body.firstChild; + var rects = elem.getClientRects(); + var rect = elem.getBoundingClientRect(); + + ok(rects.length === 1, "rect.length = " + rects.length); + ok(rects[0].top === rect.top, "rects[0].top = " + rects[0].top + " rect.top = " + rect.top); + ok(rects[0].bottom === rect.bottom, "rects[0].bottom = " + rects[0].bottom + " rect.bottom = " + rect.bottom); + + elem = document.createElement("style"); + rects = elem.getClientRects(); + ok(rects.length === 0, "rect.length = " + rects.length); + + next_test(); +} + function test_document_owner() { var node; @@ -339,6 +356,7 @@ var tests = [ test_anchor, test_query_selector, test_compare_position, + test_rects, test_document_owner, test_style_properties, test_storage

1 0

Henri Verbeet : wined3d: Do not take "draw_rect" into account when comparing attachment sizes in ffp_blitter_clear().
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 7551f01bd0ed1ac6a82663305bc2dfe9bc07d034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7551f01bd0ed1ac6a8266330… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 27 15:46:31 2019 +0430 wined3d: Do not take "draw_rect" into account when comparing attachment sizes in ffp_blitter_clear(). The scissor rectangle and viewport shouldn't affect whether attachment sizes are equal. The Intel i965 driver will do a fast clear when the scissor rectangle overlaps the intersection of the attachments, and that behaviour is allowed by the OpenGL spec. This commit fixes failures in the d3d8 and d3d9 depth_buffer_test() tests on the Intel i965 driver. See also commit 0530f33cc1644cd782ee2028966721bddf28c5d4. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4d5b777..11d0255 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2052,12 +2052,11 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { - BOOL have_previous_rect = FALSE, have_identical_size = TRUE; - struct wined3d_rendertarget_view *view; + struct wined3d_rendertarget_view *view, *previous = NULL; + BOOL have_identical_size = TRUE; struct wined3d_fb_state tmp_fb; unsigned int next_rt_count = 0; struct wined3d_blitter *next; - RECT previous_rect, rect; DWORD next_flags = 0; unsigned int i; @@ -2101,23 +2100,17 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if (!(view = fb->render_targets[i])) continue; - SetRect(&rect, 0, 0, view->width, view->height); - IntersectRect(&rect, draw_rect, &rect); - if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + if (previous && (previous->width != view->width || previous->height != view->height)) have_identical_size = FALSE; - previous_rect = rect; - have_previous_rect = TRUE; + previous = view; } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { view = fb->depth_stencil; - SetRect(&rect, 0, 0, view->width, view->height); - IntersectRect(&rect, draw_rect, &rect); - if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + if (previous && (previous->width != view->width || previous->height != view->height)) have_identical_size = FALSE; - previous_rect = rect; - have_previous_rect = TRUE; + previous = view; } if (have_identical_size)

1 0

Detlef Riekenberg : wer: Fix WER_REPORT_TYPE failures on recent win10.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 6202cf456016a25829a05d1e627175bb739462e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6202cf456016a25829a05d1e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Mar 26 19:21:55 2019 +0100 wer: Fix WER_REPORT_TYPE failures on recent win10. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/main.c | 2 +- dlls/wer/tests/main.c | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 75a22a5..e4bda46 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -278,7 +278,7 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE } if (phandle) *phandle = NULL; - if (!eventtype || !eventtype[0] || !phandle) { + if (!eventtype || !eventtype[0] || !phandle || (reporttype >= WerReportInvalid)) { return E_INVALIDARG; } diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index 11a02fb..7fa9a8c 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -1,7 +1,7 @@ /* * Unit test suite for windows error reporting in Vista and above * - * Copyright 2010 Detlef Riekenberg + * Copyright 2010,2019 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -207,8 +207,8 @@ static void test_WerReportCreate(void) hr = WerReportCreate(empty, WerReportCritical, NULL, &report); ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); - /* WER_REPORT_TYPE is not checked during WerReportCreate */ - for (i = 0; i <= WerReportInvalid + 1; i++) { + /* a valid WER_REPORT_TYPE works */ + for (i = 0; i < WerReportInvalid; i++) { report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, i, NULL, &report); ok(hr == S_OK, "%d: got 0x%x and %p (expected S_OK)\n", i, hr, report); @@ -217,9 +217,27 @@ static void test_WerReportCreate(void) ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); } + + /* values for WER_REPORT_TYPE are checked and invalid values are rejected since recent win10, + but older windows versions did not check the report type and WerReportCreate always succeeded */ + + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, WerReportInvalid, NULL, &report); + ok((hr == E_INVALIDARG) | broken(hr == S_OK), + "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); + if (hr == S_OK) { + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); + } + report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, 42, NULL, &report); - ok(hr == S_OK, "42: got 0x%x and %p (expected S_OK)\n", hr, report); + ok((hr == E_INVALIDARG) | broken(hr == S_OK), + "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); + if (hr == S_OK) { + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); + } /* multiple active reports are possible */ memset(table, 0, sizeof(table));

1 0

Jacek Caban : mshtml: Handle removeAttribute("filter") calls on detached style objects.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 3dd1fd9c8b28ade3cc35bfc2aeb7e9a1ecd730dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dd1fd9c8b28ade3cc35bfc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:52:34 2019 +0100 mshtml: Handle removeAttribute("filter") calls on detached style objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 441346b..1a3f7b9 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -3158,6 +3158,8 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri /* filter property is a special case */ if(style_entry->compat_dispid == DISPID_IHTMLSTYLE_FILTER) { + if(!This->elem) + return E_UNEXPECTED; *pfSuccess = variant_bool(This->elem->filter && *This->elem->filter); heap_free(This->elem->filter); This->elem->filter = NULL;

1 0