May 2021 - Wine-devel - list.winehq.org

[tools] winetest/build-patterns: Fix detecting transitions in non-run-time failures.
by Francois Gouget 03 May '21

03 May '21

Record the first failure type so changes can be detected later on. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 460c17c1b..a84e2a7ea 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -480,12 +480,15 @@ foreach my $testname (keys %tests) } next if ($status eq "skipped"); # same as if WineTest was not run - # It is not an error if the dll is missing (or other similar - # error) _and_ it has always been so. my $failtype = fail_type($status); - next if ($testreport->{failtype} eq "" and $failtype ne "random"); - - if ($testreport->{failtype} ne $failtype) + if ($testreport->{failtype} eq "" and $failtype ne "random") + { + # It is not an error if the dll is missing (or other similar + # error) _and_ it has always been so. So just record failtype + # for now. + $testreport->{failtype} = $failtype; + } + elsif ($testreport->{failtype} ne $failtype) { # Either there was no failure before; or the failure type # changed in a way that cannot be explained by randomness; e.g. -- 2.20.1

1 0

[PATCH] comctl32/listview: Initialize marqueeRect from left-click coordinates before starting a marquee highlight
by Hugh McMaster 03 May '21

03 May '21

The infoPtr->marqueeRect structure is not currently initialized before the marquee highlight sequence starts, resulting in the RECT having initial coordinates of (0,0)-(0,0). These coordinates cause the first item in the listview control to be identified as being within the range of the marqueeRect's coordinates. That item is then set to LVIS_SELECTED even though it is not part of the marquee selection. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/comctl32/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 799ec509f33..7d2b7874b84 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4113,6 +4113,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN /* Begin selection and capture mouse */ infoPtr->bMarqueeSelect = TRUE; + infoPtr->marqueeRect = rect; SetCapture(infoPtr->hwndSelf); } } -- 2.31.1

2 3

[PATCH] msvcrt: Fix round implementation when 24-bit precision is used.
by Piotr Caban 03 May '21

03 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-)

1 0

[PATCH 1/6] user32: Add a default ActivateKeyboardLayout implementation.
by Rémi Bernon 03 May '21

03 May '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/driver.c | 2 +- dlls/user32/input.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index c075a49a350..f683cf25b7e 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -189,7 +189,7 @@ void USER_unload_driver(void) static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { - return 0; + return (HKL)~0; /* use default implementation */ } static void CDECL nulldrv_Beep(void) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 97be83369d9..ff90bc6f343 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1310,11 +1310,16 @@ INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, /********************************************************************** * ActivateKeyboardLayout (USER32.@) */ -HKL WINAPI ActivateKeyboardLayout(HKL hLayout, UINT flags) +HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags ) { - TRACE_(keyboard)("(%p, %d)\n", hLayout, flags); + HKL old_layout; - return USER_Driver->pActivateKeyboardLayout(hLayout, flags); + TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags ); + + if ((old_layout = USER_Driver->pActivateKeyboardLayout( layout, flags )) != (HKL)~0) + return old_layout; + + return get_locale_kbd_layout(); } /********************************************************************** -- 2.31.0

2 11

[PATCH v3] winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT.
by Serge Gautherie 03 May '21

03 May '21

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Exists since at least P.SDK 2003 R2. --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 11a92fa..5e35c31 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -679,6 +679,7 @@ typedef struct _PROCESS_INFORMATION{ #define PROFILE_USER 0x10000000 #define PROFILE_KERNEL 0x20000000 #define PROFILE_SERVER 0x40000000 +#define CREATE_IGNORE_SYSTEM_DEFAULT 0x80000000 #define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 -- 2.10.0.windows.1

1 0

[PATCH] gdi32: Fix typos for GET_DC_PHYSDEV.
by Zhiyi Zhang 03 May '21

03 May '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/enhmfdrv/dc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index e8bff37a1bc..7fd404fc2cb 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -876,7 +876,7 @@ static BOOL CDECL windrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT b BOOL ret; lock_surface( physdev ); - dev = GET_NEXT_PHYSDEV( dev, pArc ); + dev = GET_NEXT_PHYSDEV( dev, pArcTo ); ret = dev->funcs->pArcTo( dev, left, top, right, bottom, xstart, ystart, xend, yend ); unlock_surface( physdev ); return ret; diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 1c87643ea96..67913f39f0c 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -365,7 +365,7 @@ BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetMapMode ); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetLayout ); EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSETLAYOUT emr; DWORD ret; -- 2.30.2

2 1

[PATCH] gdi32: Enumerate scalable fonts with zero charset mask as OEM.
by Nikolay Sivov 03 May '21

03 May '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51041 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 067d76ba9fd..5ae80e7b40f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2818,7 +2818,7 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi for (i = 0; i < count; i++) { - if (!face->scalable && face->fs.fsCsb[0] == 0) /* OEM bitmap */ + if (face->fs.fsCsb[0] == 0) /* OEM */ { elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; load_script_name( IDS_OEM_DOS - IDS_FIRST_SCRIPT, elf.elfScript ); -- 2.30.2

2 1

[PATCH v5] include: Add IXMLHTTPRequest2/3 interfaces
by Alistair Leslie-Hughes 03 May '21

03 May '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msxml6.idl | 108 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/include/msxml6.idl b/include/msxml6.idl index 5bfb21d04ae..3cd5300e831 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -52,6 +52,8 @@ interface IXMLDOMEntity; interface IXMLDOMEntityReference; interface IXMLDOMParseError; interface IXMLDOMParseErrorCollection; +interface IXMLHTTPRequest2Callback; +interface IXMLHTTPRequest3Callback; interface IXTLRuntime; interface IXSLTemplate; interface IXSLProcessor; @@ -254,6 +256,41 @@ typedef enum _SCHEMATYPEVARIETY } SCHEMATYPEVARIETY; cpp_quote("#endif /* __msxml_som_enums__ */") +typedef [v1_enum] enum _XHR_PROPERTY +{ + XHR_PROP_NO_CRED_PROMPT = 0x0, + XHR_PROP_NO_AUTH = 0x1, + XHR_PROP_TIMEOUT = 0x2, + XHR_PROP_NO_DEFAULT_HEADERS = 0x3, + XHR_PROP_REPORT_REDIRECT_STATUS = 0x4, + XHR_PROP_NO_CACHE = 0x5, + XHR_PROP_EXTENDED_ERROR = 0x6, + XHR_PROP_QUERY_STRING_UTF8 = 0x7, + XHR_PROP_IGNORE_CERT_ERRORS = 0x8, +} XHR_PROPERTY; + +typedef struct tagXHR_COOKIE +{ + [ref, string] + WCHAR *pwszUrl; + [ref, string] + WCHAR *pwszName; + [unique, string] + WCHAR *pwszValue; + [unique, string] + WCHAR *pwszP3PPolicy; + FILETIME ftExpires; + DWORD dwFlags; +} XHR_COOKIE; + +typedef struct tagXHR_CERT +{ + DWORD cbCert; + [ref, size_is(cbCert)] + BYTE *pbCert; +} +XHR_CERT; + [ local, object, @@ -1309,6 +1346,66 @@ interface IServerXMLHTTPRequest : IXMLHTTPRequest [in] VARIANT value); } +[ + object, + uuid(e5d37dc0-552a-4d52-9cc0-a14d546fbd04), +] +interface IXMLHTTPRequest2 : IUnknown +{ + HRESULT Open([in, string, ref] const WCHAR *method, [in, string, ref] const WCHAR *url, + [in] IXMLHTTPRequest2Callback *callback, + [in, string, unique] const WCHAR *username, [in, string, unique] const WCHAR *password, + [in, string, unique] const WCHAR *proxyuser, [in, string, unique] const WCHAR *proxypassword); + + HRESULT Send([in, unique] ISequentialStream *body, [in] ULONGLONG length); + HRESULT Abort(); + HRESULT SetCookie([in, ref] const XHR_COOKIE *cookie, [out] DWORD *state); + HRESULT SetCustomResponseStream([in] ISequentialStream *stream); + HRESULT SetProperty([in] XHR_PROPERTY property, [in] ULONGLONG value); + HRESULT SetRequestHeader([in, string, ref] const WCHAR *header, [in, string, unique] const WCHAR *value); + HRESULT GetAllResponseHeaders([out, string] WCHAR **headers); + HRESULT GetCookie( [in, ref, string] const WCHAR *url, [in, unique, string] const WCHAR *name, + [in] DWORD flags, [out] ULONG *cookies_cnt, [out, size_is(,*cookies_cnt)] XHR_COOKIE **cookies); + HRESULT GetResponseHeader([in, string, ref] const WCHAR *header, [out, string] WCHAR **value); +}; + +[ + object, + uuid(a1c9feee-0617-4f23-9d58-8961ea43567c) +] +interface IXMLHTTPRequest3 : IXMLHTTPRequest2 +{ + HRESULT SetClientCertificate([in] DWORD count, [in, unique, size_is(count)] const BYTE *hashes, + [in, string, unique] const WCHAR *pin); +}; + +[ + object, + uuid(a44a9299-e321-40de-8866-341b41669162), + pointer_default(ref) +] +interface IXMLHTTPRequest2Callback : IUnknown +{ + HRESULT OnRedirect([in] IXMLHTTPRequest2 *xhr, [in, string] const WCHAR *url); + HRESULT OnHeadersAvailable([in] IXMLHTTPRequest2 *xhr, [in] DWORD status, [in, string] const WCHAR *msg); + HRESULT OnDataAvailable([in] IXMLHTTPRequest2 *xhr, [in] ISequentialStream *stream); + HRESULT OnResponseReceived([in] IXMLHTTPRequest2 *xhr, [in] ISequentialStream *stream); + HRESULT OnError([in] IXMLHTTPRequest2 *xhr, [in] HRESULT error); +}; + +[ + object, + uuid(b9e57830-8c6c-4a6f-9c13-47772bb047bb) +] +interface IXMLHTTPRequest3Callback : IXMLHTTPRequest2Callback +{ + HRESULT OnServerCertificateReceived([in] IXMLHTTPRequest3 *xhr, [in] DWORD errors, + [in] DWORD count, [in, unique, size_is(count)] const XHR_CERT *certificates); + + HRESULT OnClientCertificateRequested([in] IXMLHTTPRequest3 *xhr, + [in] DWORD count, [in, string, unique, size_is(count)] const WCHAR **list); +}; + [ object, dual, @@ -1607,6 +1704,17 @@ interface ISAXDeclHandler : IUnknown [in] int nSystemId); } +[ + helpstring("Free Threaded XML HTTP Request class 6.0"), + progid("Msxml2.FreeThreadedXMLHTTP60.6.0"), + threading(both), + uuid(88d96a09-f192-11d4-a65f-0040963251e5) +] +coclass FreeThreadedXMLHTTP60 +{ + [default] interface IXMLHTTPRequest2; +} + [ object, local, -- 2.30.2

1 0

[PATCH 2/3] shell32: implement some of the missing shellview IContextMenu command verbs
by Damjan Jovanovic 03 May '21

03 May '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/shlview_cmenu.c | 82 ++++++++++++++++++++++++++-------- dlls/shell32/tests/shlfolder.c | 1 - 2 files changed, 64 insertions(+), 19 deletions(-)

2 1

[PATCH 3/3] shell32: fix pasting from the shellview context menu
by Damjan Jovanovic 03 May '21

03 May '21

Pasting from the shellview context menu is completely broken, as the desktop folder's BindToObject() always fails since the CIDA parent folder PIDL is an empty PIDL. The desktop shell folder doesn't support the ISFHelper interface either. Rather bind to each item's immediate parent, and copy each item individually. Also try get error handling to work a little better. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/shlview_cmenu.c | 65 +++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 23 deletions(-)

1 0