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

[PATCH 03/10] gdi32: Handle EMFs recording directly in LineTo implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Those are similar to old-style makefiles in a sense that recording is done in user space, rather than kernel space. However, they have an actual special king DC associated and some parts of the implementation (like bounding rect handling) uses driver interface. dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/graphics.c | 28 +++++++++++++++------------- dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/gdi_private.h | 12 ++++++++++-- dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/objects.c | 2 +- include/ntgdi.h | 1 + 7 files changed, 45 insertions(+), 28 deletions(-)

2 1

[PATCH 01/10] gdi32/tests: Silence noisy traces.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 112 +++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 47 deletions(-)

1 0

[PATCH v2 1/4] mshtml: Add stub for HTMLElement classList property.
by Paul Gofman 19 Jul '21

19 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 88 ++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/mshtml_private_iface.idl | 13 ++++ dlls/mshtml/tests/documentmode.js | 1 + 4 files changed, 104 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b9677ec867a..961e4e79e08 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6065,6 +6065,8 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IProvideMultipleClassInfo_iface; }else if(IsEqualGUID(&IID_IProvideMultipleClassInfo, riid)) { *ppv = &This->IProvideMultipleClassInfo_iface; + }else if(IsEqualGUID(&IID_IWineHTMLElementPrivate, riid)) { + *ppv = &This->IWineHTMLElementPrivate_iface; }else { return HTMLDOMNode_QI(&This->node, riid, ppv); } @@ -6366,7 +6368,10 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) } if(mode >= COMPAT_MODE_IE10) + { dispex_info_add_interface(info, IHTMLElement7_tid, NULL); + dispex_info_add_interface(info, IWineHTMLElementPrivate_tid, NULL); + } } static const tid_t HTMLElement_iface_tids[] = { @@ -6390,6 +6395,88 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_set_current_event }; +static inline HTMLElement *impl_from_IWineHTMLElementPrivateVtbl(IWineHTMLElementPrivate *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IWineHTMLElementPrivate_iface); +} + +static HRESULT WINAPI htmlelement_private_QueryInterface(IWineHTMLElementPrivate *iface, + REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI htmlelement_private_AddRef(IWineHTMLElementPrivate *iface) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI htmlelement_private_Release(IWineHTMLElementPrivate *iface) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI htmlelement_private_GetTypeInfoCount(IWineHTMLElementPrivate *iface, UINT *pctinfo) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetTypeInfoCount(&This->IHTMLElement_iface, pctinfo); +} + +static HRESULT WINAPI htmlelement_private_GetTypeInfo(IWineHTMLElementPrivate *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetTypeInfo(&This->IHTMLElement_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI htmlelement_private_GetIDsOfNames(IWineHTMLElementPrivate *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetIDsOfNames(&This->IHTMLElement_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI htmlelement_private_Invoke(IWineHTMLElementPrivate *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_Invoke(&This->IHTMLElement_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI htmlelement_private_get_classList(IWineHTMLElementPrivate *iface, IDispatch **class_list) +{ + FIXME("iface %p, class_list %p stub.\n", iface, class_list); + + *class_list = NULL; + + return S_OK; +} + +static const IWineHTMLElementPrivateVtbl WineHTMLElementPrivateVtbl = { + htmlelement_private_QueryInterface, + htmlelement_private_AddRef, + htmlelement_private_Release, + htmlelement_private_GetTypeInfoCount, + htmlelement_private_GetTypeInfo, + htmlelement_private_GetIDsOfNames, + htmlelement_private_Invoke, + htmlelement_private_get_classList, +}; + static dispex_static_data_t HTMLElement_dispex = { &HTMLElement_event_target_vtbl.dispex_vtbl, DispHTMLUnknownElement_tid, @@ -6409,6 +6496,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n This->IElementSelector_iface.lpVtbl = &ElementSelectorVtbl; This->IElementTraversal_iface.lpVtbl = &ElementTraversalVtbl; This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; + This->IWineHTMLElementPrivate_iface.lpVtbl = &WineHTMLElementPrivateVtbl; if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_event_target_vtbl.dispex_vtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e2c1f221372..56bef40b4d0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -273,6 +273,7 @@ typedef struct EventTarget EventTarget; XIID(ISVGTextContentElement) #define PRIVATE_TID_LIST \ + XIID(IWineHTMLElementPrivate) \ XIID(IWineHTMLWindowPrivate) \ XIID(IWineMSHTMLConsole) @@ -828,6 +829,7 @@ typedef struct { IElementSelector IElementSelector_iface; IElementTraversal IElementTraversal_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; + IWineHTMLElementPrivate IWineHTMLElementPrivate_iface; nsIDOMElement *dom_element; /* NULL for legacy comments represented as HTML elements */ nsIDOMHTMLElement *html_element; /* NULL for non-HTML elements (like SVG elements) */ diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 6c5c5db991f..9ca7e0d7421 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -89,4 +89,17 @@ interface IWineHTMLWindowPrivate : IDispatch HRESULT console([retval, out] IDispatch **console); } +[ + odl, + oleautomation, + dual, + hidden, + uuid(465908fd-f394-489f-b7a3-4c00fbbe9eec) +] +interface IWineHTMLElementPrivate : IDispatch +{ + [propget, id(1)] + HRESULT classList([retval, out] IDispatch **class_list); +} + } /* library MSHTML_private */ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 859e1fe53db..c20f6ee18df 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -57,6 +57,7 @@ sync_test("elem_props", function() { test_exposed("sheet", v >= 9); test_exposed("readyState", v < 11); test_exposed("styleSheet", v < 11); + test_exposed("classList", v >= 10); }); sync_test("doc_props", function() { -- 2.31.1

3 11

[PATCH 1/4] mshtml: Add stub for HTMLElement classList property.
by Paul Gofman 19 Jul '21

19 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 88 ++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/mshtml_private_iface.idl | 13 ++++ dlls/mshtml/tests/documentmode.js | 1 + 4 files changed, 104 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b9677ec867a..961e4e79e08 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6065,6 +6065,8 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IProvideMultipleClassInfo_iface; }else if(IsEqualGUID(&IID_IProvideMultipleClassInfo, riid)) { *ppv = &This->IProvideMultipleClassInfo_iface; + }else if(IsEqualGUID(&IID_IWineHTMLElementPrivate, riid)) { + *ppv = &This->IWineHTMLElementPrivate_iface; }else { return HTMLDOMNode_QI(&This->node, riid, ppv); } @@ -6366,7 +6368,10 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) } if(mode >= COMPAT_MODE_IE10) + { dispex_info_add_interface(info, IHTMLElement7_tid, NULL); + dispex_info_add_interface(info, IWineHTMLElementPrivate_tid, NULL); + } } static const tid_t HTMLElement_iface_tids[] = { @@ -6390,6 +6395,88 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_set_current_event }; +static inline HTMLElement *impl_from_IWineHTMLElementPrivateVtbl(IWineHTMLElementPrivate *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IWineHTMLElementPrivate_iface); +} + +static HRESULT WINAPI htmlelement_private_QueryInterface(IWineHTMLElementPrivate *iface, + REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI htmlelement_private_AddRef(IWineHTMLElementPrivate *iface) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI htmlelement_private_Release(IWineHTMLElementPrivate *iface) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI htmlelement_private_GetTypeInfoCount(IWineHTMLElementPrivate *iface, UINT *pctinfo) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetTypeInfoCount(&This->IHTMLElement_iface, pctinfo); +} + +static HRESULT WINAPI htmlelement_private_GetTypeInfo(IWineHTMLElementPrivate *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetTypeInfo(&This->IHTMLElement_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI htmlelement_private_GetIDsOfNames(IWineHTMLElementPrivate *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetIDsOfNames(&This->IHTMLElement_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI htmlelement_private_Invoke(IWineHTMLElementPrivate *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_Invoke(&This->IHTMLElement_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI htmlelement_private_get_classList(IWineHTMLElementPrivate *iface, IDispatch **class_list) +{ + FIXME("iface %p, class_list %p stub.\n", iface, class_list); + + *class_list = NULL; + + return S_OK; +} + +static const IWineHTMLElementPrivateVtbl WineHTMLElementPrivateVtbl = { + htmlelement_private_QueryInterface, + htmlelement_private_AddRef, + htmlelement_private_Release, + htmlelement_private_GetTypeInfoCount, + htmlelement_private_GetTypeInfo, + htmlelement_private_GetIDsOfNames, + htmlelement_private_Invoke, + htmlelement_private_get_classList, +}; + static dispex_static_data_t HTMLElement_dispex = { &HTMLElement_event_target_vtbl.dispex_vtbl, DispHTMLUnknownElement_tid, @@ -6409,6 +6496,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n This->IElementSelector_iface.lpVtbl = &ElementSelectorVtbl; This->IElementTraversal_iface.lpVtbl = &ElementTraversalVtbl; This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; + This->IWineHTMLElementPrivate_iface.lpVtbl = &WineHTMLElementPrivateVtbl; if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_event_target_vtbl.dispex_vtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e2c1f221372..56bef40b4d0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -273,6 +273,7 @@ typedef struct EventTarget EventTarget; XIID(ISVGTextContentElement) #define PRIVATE_TID_LIST \ + XIID(IWineHTMLElementPrivate) \ XIID(IWineHTMLWindowPrivate) \ XIID(IWineMSHTMLConsole) @@ -828,6 +829,7 @@ typedef struct { IElementSelector IElementSelector_iface; IElementTraversal IElementTraversal_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; + IWineHTMLElementPrivate IWineHTMLElementPrivate_iface; nsIDOMElement *dom_element; /* NULL for legacy comments represented as HTML elements */ nsIDOMHTMLElement *html_element; /* NULL for non-HTML elements (like SVG elements) */ diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 6c5c5db991f..9ca7e0d7421 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -89,4 +89,17 @@ interface IWineHTMLWindowPrivate : IDispatch HRESULT console([retval, out] IDispatch **console); } +[ + odl, + oleautomation, + dual, + hidden, + uuid(465908fd-f394-489f-b7a3-4c00fbbe9eec) +] +interface IWineHTMLElementPrivate : IDispatch +{ + [propget, id(1)] + HRESULT classList([retval, out] IDispatch **class_list); +} + } /* library MSHTML_private */ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 859e1fe53db..c20f6ee18df 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -57,6 +57,7 @@ sync_test("elem_props", function() { test_exposed("sheet", v >= 9); test_exposed("readyState", v < 11); test_exposed("styleSheet", v < 11); + test_exposed("classList", v >= 10); }); sync_test("doc_props", function() { -- 2.31.1

3 7

[PATCH v2] kernel32/tests: Allow failure when loading the 268 bytes minimal PE image.
by Francois Gouget 19 Jul '21

19 Jul '21

Windows 10 1809+ rejects this minimal image so allow ERROR_BAD_EXE_FORMAT as a valid result. Also adjust the comment to reflect the range of Windows versions that usually accept this image and note that there are some exceptions which means there are other unidentified factors at play. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=51185 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Fixed v1's comment to match the platforms this test accutally succeeds on. w7u (32-bit Windows 7) rejects this image but not w7pro64. cw-rx460 (64-bit Windows 8.1) also rejects this image but not cw-gtx560, w8 and w864. So this image is sometimes rejected by Windows versions that are expected to accept it without the reason being known. https://test.winehq.org/data/patterns.html#kernel32:loader --- dlls/kernel32/tests/loader.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1db68a191a3..4ec77670f8c 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -860,7 +860,10 @@ static void test_Loader(void) 0, { ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT } /* vista is more strict */ }, - /* Minimal PE image that Windows7 is able to load: 268 bytes */ + /* Minimal PE image initially created for Windows 7 and accepted from + * Vista up to Windows 10 1709 with some unexplained exceptions: + * 268 bytes + */ { 0x04, 0, 0xf0, /* optional header size just forces 0xf0 bytes to be written, 0 or another number don't change the behaviour, what really @@ -868,7 +871,7 @@ static void test_Loader(void) 0x04 /* also serves as e_lfanew in the truncated MZ header */, 0x04, 0x40, /* minimal image size that Windows7 accepts */ 0, - { ERROR_SUCCESS } + { ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT } /* rejected by win10 1809+ */ }, /* the following data mimics the PE image which 8k demos have */ { 0x04, -- 2.20.1

2 2

RFC: Bugzilla keyword definitions
by Francois Gouget 19 Jul '21

19 Jul '21

I have some issues with the definitions of some Bugzilla keywords. Then they also have a lot of formatting inconsistencies and once we've come to a consensus I have no idea who can make changes (the definitions seem to be stored in some sort of database). Well. Here goes anyway: * testcase | Bugs that have a testcase attached, in source form but not | necessarily integrated into the Wine test suite. The definition does not say what a testcase is. Also, while I totally expect the source for most test cases to be available, I think the keyword should be usable even if the source code is not published. Specifying that the source is available should be the exclusive role of the 'source' keyword. So I would use a definition like: | Bugs where a minimal program dedicated to reproducing the bug, aka | a testcase, has been attached. The testcase need not be integrated | into the Wine test suite. If the source is available (which is | strongly recommended) add the source keyword too. * patch | Bugs in this keyword contain a patch that are waiting for approval. What is a 'patch that is waiting for approval'? Is it a patch which is referenced in https://source.winehq.org/patches/ ? What happens if the patch is rejected? (or drops off the list) Should the patch keyword be removed? What if the patch is in wine-staging? To me the patch keyword should make it possible to identify bugs where someone proposed a potential fix, even if it needs to be refined to be acceptable, may break other applications, etc. Essentially anything that's not a blatant hack that checks the executable filename or replaces a properly implemented function with a stub. So I would use the following definition: | Bugs with this keyword contain a proposed fix. The fix may be | incomplete, break other applications or be otherwise unacceptable as | long as it does fix the symptoms described in the bug and is not a | pure workaround (such as altering Wine's behavior based on the | executable filename, replacing an implemented function with a stub, | etc.). * regression | bugs relating to programs that were working at one time but stoped | working for some reason Except for the obvious typo, capitalization and missing full stop I'm fine with this definition. I take 'programs' to mean applications that users would actually want to use with Wine, not Wine's tests. So maybe the definition could be a bit more explicit: | Bugs relating to applications (excluding Wine's tests) that were | working at one time but stopped working for some reason. * Then there is the related 'Regression SHA1' property. I think it should be ok to use that property to identify the commit causing a bug, whether that bug is a regression or not. First note that only bugs that have the regression *keyword* appear on the regressions page: https://source.winehq.org/regressions So if a commit adds Wine tests that fail the 'regression' keyword is not applicable but I think it would still be valuable to set the "Regression SHA1" field: - The commit message may provide valuable insight into what was on the mind of the developer who wrote the tests. - Such commits can sometimes be a pain to track down when the test has seen a lot of churn. - The commit's author is likely to have insight into the bug. - Setting the 'Regression SHA1' field allows identifying the bugs for which the above information is available. - It also lets the patterns page put links to that commit and reference it as being the source of the test failures. Maybe a better name for 'Regression SHA1' would be something like 'Bad SHA1' or 'Introduced by SHA1'. I'm not sure renaming the field is worth it but the description could be changed from | SHA1 of the git commit that caused the regression. to | SHA1 of the git commit that causes the bug. * hardware | Issues communicating with HW such as serial/parallel/cdrom/usb s/HW/hardware/ + trailing full stop * obfuscation It looks like there is an extra space in "management techniques". * Integration | Bugs related to Wine integration into OS (menu, MIME-types, look) s/integration into OS/integration with the OS/ And I'd even argue that the integration is with the desktop environment (GNOME, KDE, etc) rather than the operating system. * dotnet | Bugs that appear in applications using dotNet and that are related | to this dotNet usage instead of being independent bugs. s/dotNet/.NET/g * The definitions for the following keywords also have formatting issues. Either the capitalization is wrong, or the trailing full stop is missing, or both: Abandoned? hardware integration localization performance source valgrind -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Theory is where you know everything but nothing works. Practice is where everything works but nobody knows why. Sometimes they go hand in hand: nothing works and nobody knows why.

9 19

[PATCH] winetest: Create the -d directory if it does not exist already.
by Francois Gouget 19 Jul '21

19 Jul '21

'winetest.exe' automatically creates '%TEMP%\wct' (or an alternative new directory). 'winetext.exe -x DIR' automatically creates DIR. 'winetest.exe -d DIR' now automatically creates DIR too. In all cases newly created directories are removed after the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/winetest/main.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 81c7de2a020..fa773e28d4f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1024,6 +1024,7 @@ run_tests (char *logname, char *outdir) DWORD strsize; SECURITY_ATTRIBUTES sa; char tmppath[MAX_PATH], tempdir[MAX_PATH+4]; + BOOL newdir; DWORD needed; HMODULE kernel32; @@ -1064,22 +1065,23 @@ run_tests (char *logname, char *outdir) if (logfile == INVALID_HANDLE_VALUE) report (R_FATAL, "Could not open logfile: %u", GetLastError()); - /* try stable path for ZoneAlarm */ - if (!outdir) { + if (outdir) + strcpy( tempdir, outdir); + else + { strcpy( tempdir, tmppath ); - strcat( tempdir, "wct" ); - - if (!CreateDirectoryA( tempdir, NULL )) - { - if (!GetTempFileNameA( tmppath, "wct", 0, tempdir )) - report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); - DeleteFileA( tempdir ); - if (!CreateDirectoryA( tempdir, NULL )) - report (R_FATAL, "Could not create directory: %s", tempdir); - } + strcat( tempdir, "wct" ); /* try stable path for ZoneAlarm */ } - else - strcpy( tempdir, outdir); + newdir = CreateDirectoryA( tempdir, NULL ); + if (!newdir && !outdir) + { + if (!GetTempFileNameA( tmppath, "wct", 0, tempdir )) + report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); + DeleteFileA( tempdir ); + newdir = CreateDirectoryA( tempdir, NULL ); + } + if (!newdir && (!outdir || GetLastError() != ERROR_ALREADY_EXISTS)) + report (R_FATAL, "Could not create directory %s (%d)", tempdir, GetLastError()); report (R_DIR, tempdir); @@ -1172,7 +1174,7 @@ run_tests (char *logname, char *outdir) report (R_STATUS, "Cleaning up - %u failures", failures); CloseHandle( logfile ); logfile = 0; - if (!outdir) + if (newdir) remove_dir (tempdir); heap_free(wine_tests); heap_free(curpath); -- 2.20.1

1 0

[PATCH] secur32: Set error flag on pull callback.
by Alistair Leslie-Hughes 19 Jul '21

19 Jul '21

Fixes a regression introduced in b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27 The poll function currently always returns 0 which signals to gnutls that no data is available. We should return -1 and set the the transport error to try again. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=51440 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bcf38e3f23f..3ed0fbea16e 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -292,7 +292,12 @@ static DWORD CDECL schan_get_enabled_protocols(void) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { - return 0; + struct schan_transport *t = (struct schan_transport*)transport; + gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); + + TRACE("\n"); + pgnutls_transport_set_errno(s, EAGAIN); + return -1; } static BOOL CDECL schan_create_session(schan_session *session, schan_credentials *cred) -- 2.30.2

2 1

[PATCH] kernel32/tests: Test whether console color attributes are copied to new screen buffers
by Hugh McMaster 19 Jul '21

19 Jul '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/tests/console.c | 81 +++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 918ecac8ac4..b1d2465c5ea 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -973,6 +973,86 @@ static void testScreenBuffer(HANDLE hConOut) SetConsoleOutputCP(oldcp); } +static void test_new_screen_buffer_color_attributes(HANDLE hConOut) +{ + CONSOLE_SCREEN_BUFFER_INFOEX csbi, csbi2; + BOOL ret; + HANDLE hConOut2; + WORD orig_attr, orig_popup, attr; + + csbi.cbSize = csbi2.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + ret = GetConsoleScreenBufferInfoEx(hConOut, &csbi); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + orig_attr = csbi.wAttributes; + orig_popup = csbi.wPopupAttributes; + trace("Character Attributes: %#x, Popup Attributes: %#x\n", orig_attr, orig_popup); + hConOut2 = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOut2 != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: error %u\n", GetLastError()); + + ret = GetConsoleScreenBufferInfoEx(hConOut2, &csbi2); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + + todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " + "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); + todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); + + CloseHandle(hConOut2); + + /* Test different Character Attributes */ + attr = FOREGROUND_BLUE|BACKGROUND_GREEN; + ret = SetConsoleTextAttribute(hConOut, attr); + ok(ret, "SetConsoleTextAttribute failed: error %u\n", GetLastError()); + + hConOut2 = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOut2 != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: error %u\n", GetLastError()); + + memset(&csbi2, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)); + csbi2.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + ret = GetConsoleScreenBufferInfoEx(hConOut2, &csbi2); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + + todo_wine ok(csbi2.wAttributes == attr, "Character Attributes should have been copied: " + "got %#x, expected %#x\n", csbi2.wAttributes, attr); + todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + todo_wine ok(csbi2.wPopupAttributes == attr, "Popup Attributes should match Character Attributes\n"); + + CloseHandle(hConOut2); + + ret = SetConsoleTextAttribute(hConOut, orig_attr); + ok(ret, "SetConsoleTextAttribute failed: error %u\n", GetLastError()); + + /* Test inheritance of different Popup Attributes */ + csbi.wPopupAttributes = attr; + ret = SetConsoleScreenBufferInfoEx(hConOut, &csbi); + ok(ret, "SetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + + hConOut2 = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOut2 != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: error %u\n", GetLastError()); + + memset(&csbi2, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)); + csbi2.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + ret = GetConsoleScreenBufferInfoEx(hConOut2, &csbi2); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + + todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " + "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); + todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); + + CloseHandle(hConOut2); + + csbi.wPopupAttributes = orig_popup; + ret = SetConsoleScreenBufferInfoEx(hConOut, &csbi); + ok(ret, "SetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); +} + static void CALLBACK signaled_function(void *p, BOOLEAN timeout) { HANDLE event = p; @@ -4506,6 +4586,7 @@ START_TEST(console) testScroll(hConOut, sbi.dwSize); /* will test sb creation / modification / codepage handling */ if (!test_current) testScreenBuffer(hConOut); + test_new_screen_buffer_color_attributes(hConOut); /* Test waiting for a console handle */ testWaitForConsoleInput(hConIn); test_wait(hConIn, hConOut); -- 2.32.0

2 2

[PATCH] ntdll: Add stub for ProcessInstrumentationCallback info class in NtSetInformationProcess().
by Paul Gofman 19 Jul '21

19 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 11 +++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 45 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c873a224a7c..40e01917d9a 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -3232,6 +3232,32 @@ static void test_debug_object(void) ok( event.u.LoadDll.fUnicode == TRUE, "event not updated %x\n", event.u.LoadDll.fUnicode ); } +static void test_process_instrumentation_callback(void) +{ + PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION info; + NTSTATUS status; + + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, NULL, 0 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH /* Win10 */ || status == STATUS_INVALID_INFO_CLASS + || status == STATUS_NOT_SUPPORTED, "Got unexpected status %#x.\n", status ); + if (status != STATUS_INFO_LENGTH_MISMATCH) + { + win_skip( "ProcessInstrumentationCallback is not supported.\n" ); + return; + } + + memset(&info, 0, sizeof(info)); + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, sizeof(info) ); + ok( status == STATUS_SUCCESS /* Win 10 */ || broken( status == STATUS_PRIVILEGE_NOT_HELD ) + || broken( status == STATUS_INFO_LENGTH_MISMATCH ), "Got unexpected status %#x.\n", status ); + + memset(&info, 0, sizeof(info)); + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, 2 * sizeof(info) ); + ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH + || broken( status == STATUS_PRIVILEGE_NOT_HELD ) /* some versions and machines before Win10 */, + "Got unexpected status %#x.\n", status ); +} + START_TEST(info) { char **argv; @@ -3298,4 +3324,5 @@ START_TEST(info) test_NtGetCurrentProcessorNumber(); test_ThreadEnableAlignmentFaultFixup(); + test_process_instrumentation_callback(); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 77fb81fe404..141720565dc 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1507,6 +1507,17 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, break; } + case ProcessInstrumentationCallback: + { + PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION *instr = info; + + FIXME( "ProcessInstrumentationCallback stub.\n" ); + + if (size < sizeof(*instr)) return STATUS_INFO_LENGTH_MISMATCH; + ret = STATUS_SUCCESS; + break; + } + case ProcessWineMakeProcessSystem: if (size != sizeof(HANDLE *)) return STATUS_INFO_LENGTH_MISMATCH; SERVER_START_REQ( make_process_system ) diff --git a/include/winternl.h b/include/winternl.h index f832729f985..a97cfdf0231 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1472,6 +1472,13 @@ typedef struct _FILE_IO_COMPLETION_NOTIFICATION_INFORMATION { #define FILE_SKIP_SET_EVENT_ON_HANDLE 0x2 #define FILE_SKIP_SET_USER_EVENT_ON_FAST_IO 0x4 +typedef struct _PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION +{ + ULONG Version; + ULONG Reserved; + VOID *Callback; +} PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION, *PPROCESS_INSTRUMENTATION_CALLBACK_INFORMATION; + typedef enum _FSINFOCLASS { FileFsVolumeInformation = 1, FileFsLabelInformation, -- 2.31.1

1 0