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

[PATCH 3/3] shell32: fix pasting from the shellview context menu

by Damjan Jovanovic

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(-)

May 3, 2021

[PATCH 2/3] shell32: implement some of the missing shellview IContextMenu command verbs

by Damjan Jovanovic

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(-)

May 3, 2021

[PATCH 1/3] shell32: implement IID_IContextMenu in CreateViewObject() methods for shell folders that support it

by Damjan Jovanovic

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39841 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/shell32/cpanelfolder.c | 6 +-- dlls/shell32/recyclebin.c | 2 + dlls/shell32/shfldr_desktop.c | 3 +- dlls/shell32/shfldr_fs.c | 3 +- dlls/shell32/shfldr_mycomp.c | 3 +- dlls/shell32/shfldr_netplaces.c | 10 ++--- dlls/shell32/shfldr_printers.c | 5 ++- dlls/shell32/shfldr_unixfs.c | 2 + dlls/shell32/tests/shlfolder.c | 72 +++++++++++++++++++++++++++++++++ 9 files changed, 91 insertions(+), 15 deletions(-)

May 3, 2021

Re: WineTest failure patterns preview

by Zebediah Figura (she/her)

On 5/2/21 7:07 PM, Francois Gouget wrote: > On Sat, 1 May 2021, Zebediah Figura (she/her) wrote: > [...] >> Looks like a more sophisticated version of >> <https://www.winehq.org/~jwhite/2deb8c2825af.html>, which is definitely a nice >> resource when I'm trying to put effort into fixing test failures. > > Right. I should probably have mentioned this bug which says Jer's > page was part of the inspiration. But that page did not do what I > need so I tweaked it. > > https://bugs.winehq.org/show_bug.cgi?id=48164 > > Oh. And now the official pages are online and getting more feature > complete. > > https://test.winehq.org/data/patterns-tb-win.html > https://test.winehq.org/data/patterns-tb-wine.html > > >> I guess the tests are color-coded by number of failures, modulo some constant? > > Right. Each failure type (timeout, crash, etc) has its own color. And > then I use a gradient to attribute a color to each 'vanilla' failure > count. > > Note that what counts for allocating the colors is not the actual > failure counts, but the number of different failure counts. That is a > test with 4, 5 or 6 failures will get the same colors as one with 1, 2 > or 100 failures because in both cases there are only 3 different values. > > I'll add a description of the patterns on the pages at some point. > > >> I like the idea. I will note though that some of those colours seem >> hard to tell apart, e.g. the shades of green in wine d3d9:device. > > Yes. When a test unit has 30 different failure counts it's hard to find > enough easy to distinguish colors. It's probably possible to do better > by tweaking the colors the gradient goes through. > > https://source.winehq.org/git/tools.git/blob/HEAD:/winetest/build-patterns#… > > The cyan-green-yellow part of the gradient produces colors that are not > very easy to distinguish. The colors in the yellow-red part seem easier > to identify but that gradient is given the same weight as the other two. > I've experimented a bit with a darker cyan but going too dark does not > look very nice. > > >> Also I guess they aren't consistent across tests for some reason? > > The goal is to maximize the contrast in the colors used by each pattern. > But if I used a single 'color map' for all test units, I would need to > allocate a hundred different colors. Then many test units with just a > few failures would end up only using very similar colors. > > Allocating one color map per test unit limits this issue to just a few > patterns. And the best fix would be to reduce the number of failures in > these tests ;-) > I'll admit I don't fully follow your logic. I guess if it were me, I'd use a fixed colormap of a small fixed number (16? I'm guessing there) of colors that are easy to distinguish, and then universally assign colors by (n % 16). I'd also pick out those colors manually instead of trying to generate them. Yeah, you won't be able to distinguish between 1 failure and 17 failures, but hopefully that contrast won't come up very much. Plus, that way, you could even learn a mental association, I guess, for whatever that's worth. Or you could assign 1-16 to individual colors and anthing greater than 16 to another color. Of course many tests have very large numbers of failures (usually repeated of course). That's kind of splitting hairs of course. Now, another thing that occurs to me that would be very useful, and which doesn't necessarily preclude any of the above but does sort of obviate its usefulness, is to generate a list of failures by line, or even by line + failure message. I'd envision this as one per row, with "X" flags on each machine + day that displays it. Of course I'm sure you already have plenty of ideas on expanding the page; I'm just throwing out one of my own here.

May 3, 2021

Re: WineTest failure patterns preview

by Francois Gouget

On Sat, 1 May 2021, Zebediah Figura (she/her) wrote: [...] > Looks like a more sophisticated version of > <https://www.winehq.org/~jwhite/2deb8c2825af.html>, which is definitely a nice > resource when I'm trying to put effort into fixing test failures. Right. I should probably have mentioned this bug which says Jer's page was part of the inspiration. But that page did not do what I need so I tweaked it. https://bugs.winehq.org/show_bug.cgi?id=48164 Oh. And now the official pages are online and getting more feature complete. https://test.winehq.org/data/patterns-tb-win.html https://test.winehq.org/data/patterns-tb-wine.html > I guess the tests are color-coded by number of failures, modulo some constant? Right. Each failure type (timeout, crash, etc) has its own color. And then I use a gradient to attribute a color to each 'vanilla' failure count. Note that what counts for allocating the colors is not the actual failure counts, but the number of different failure counts. That is a test with 4, 5 or 6 failures will get the same colors as one with 1, 2 or 100 failures because in both cases there are only 3 different values. I'll add a description of the patterns on the pages at some point. > I like the idea. I will note though that some of those colours seem > hard to tell apart, e.g. the shades of green in wine d3d9:device. Yes. When a test unit has 30 different failure counts it's hard to find enough easy to distinguish colors. It's probably possible to do better by tweaking the colors the gradient goes through. https://source.winehq.org/git/tools.git/blob/HEAD:/winetest/build-patterns#… The cyan-green-yellow part of the gradient produces colors that are not very easy to distinguish. The colors in the yellow-red part seem easier to identify but that gradient is given the same weight as the other two. I've experimented a bit with a darker cyan but going too dark does not look very nice. > Also I guess they aren't consistent across tests for some reason? The goal is to maximize the contrast in the colors used by each pattern. But if I used a single 'color map' for all test units, I would need to allocate a hundred different colors. Then many test units with just a few failures would end up only using very similar colors. Allocating one color map per test unit limits this issue to just a few patterns. And the best fix would be to reduce the number of failures in these tests ;-) -- Francois Gouget <fgouget(a)codeweavers.com>

May 3, 2021

[PATCH 2/2] ntdll/tests: Use FindClose() to close handles returned by FindFirstFileW() (Valgrind).

by Sven Baars

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d469b449a74..b7b46365911 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2319,7 +2319,7 @@ static void test_file_link_information(void) "Link did not change casing on existing target file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } - CloseHandle( handle ); + FindClose( handle ); HeapFree( GetProcessHeap(), 0, fli ); delete_object( oldpath ); delete_object( newpath ); @@ -2904,7 +2904,7 @@ static void test_file_link_information(void) "Link did not change casing on same file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } - CloseHandle( handle ); + FindClose( handle ); HeapFree( GetProcessHeap(), 0, fli ); delete_object( oldpath ); } -- 2.30.0.335.ge6362826a0

May 2, 2021

[PATCH 1/2] ntdll: Fix some memory leaks (Valgrind).

by Sven Baars

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/file.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index fc5c462e04f..3ac1ed9ab63 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -912,7 +912,7 @@ static void rebuild_argv(void) */ static void prepend_argv( const char **args, int count ) { - char **new_argv = malloc( (main_argc + count) * sizeof(*new_argv) ); + char **new_argv; char *p, *end; BOOL write_strings = FALSE; int i, total = 0, new_argc = main_argc + count - 1; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 2f18325fb90..c033bb06fa3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3298,7 +3298,12 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char /* check if prefix exists (except for DOS drives to avoid extra stat calls) */ - if (wcschr( prefix, '/' )) return STATUS_OBJECT_PATH_NOT_FOUND; + if (wcschr( prefix, '/' )) + { + free( unix_name ); + return STATUS_OBJECT_PATH_NOT_FOUND; + } + if (prefix_len != 2 || prefix[1] != ':') { unix_name[pos] = 0; -- 2.30.0.335.ge6362826a0

May 2, 2021

[PATCH] pdh/tests: Add test for PdhOpenLog

by Nipun Garg

Signed-off-by: Nipun Garg <nipung271(a)gmail.com> --- dlls/pdh/pdh.spec | 6 ++--- dlls/pdh/pdh_main.c | 35 ++++++++++++++++++++++++ dlls/pdh/tests/pdh.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ include/pdh.h | 23 ++++++++++++++++ 4 files changed, 124 insertions(+), 3 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 5f61a8a42ca..0448cdde800 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -12,7 +12,7 @@ @ stub PdhBrowseCountersHW @ stub PdhBrowseCountersW @ stdcall PdhCalculateCounterFromRawValue(ptr long ptr ptr ptr) -@ stub PdhCloseLog +@ stdcall PdhCloseLog(ptr long) @ stdcall PdhCloseQuery(ptr) @ stdcall PdhCollectQueryData(ptr) @ stdcall PdhCollectQueryDataWithTime(ptr ptr) @@ -81,8 +81,8 @@ @ stdcall PdhLookupPerfNameByIndexW(wstr long ptr ptr) @ stdcall PdhMakeCounterPathA(ptr ptr ptr long) @ stdcall PdhMakeCounterPathW(ptr ptr ptr long) -@ stub PdhOpenLogA -@ stub PdhOpenLogW +@ stdcall PdhOpenLogA(str long ptr long long str ptr) +@ stdcall PdhOpenLogW(wstr long ptr long long wstr ptr) @ stdcall PdhOpenQuery(wstr long ptr) PdhOpenQueryW @ stdcall PdhOpenQueryA(str long ptr) @ stub PdhOpenQueryH diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 73d4fef2a14..2d3ff71fbf4 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -358,6 +358,15 @@ PDH_STATUS WINAPI PdhCalculateCounterFromRawValue( PDH_HCOUNTER handle, DWORD fo return ret; } +/*********************************************************************** + * PdhCloseLog (PDH.@) + */ +PDH_STATUS WINAPI PdhCloseLog( PDH_HLOG log, DWORD flags ) +{ + FIXME("(%p, %d): stub\n", log, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return PDH_NOT_IMPLEMENTED; +} /*********************************************************************** * PdhCloseQuery (PDH.@) @@ -963,6 +972,32 @@ PDH_STATUS WINAPI PdhOpenQueryW( LPCWSTR source, DWORD_PTR userdata, PDH_HQUERY return PDH_MEMORY_ALLOCATION_FAILURE; } +/********************************************************************** + * PdhOpenLogA (PDH.@) + */ +PDH_STATUS WINAPI PdhOpenLogA( LPCSTR log_name, DWORD access_flags, + LPDWORD log_type, PDH_HQUERY query, DWORD max_size, + LPCSTR user_caption, PDH_HLOG *log ) +{ + FIXME("(%s, %d, %p, %p, %d, %s, %p): stub\n", log_name, access_flags, + log_type, query, max_size, user_caption, log); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return PDH_NOT_IMPLEMENTED; +} + +/********************************************************************** + * PdhOpenLogW (PDH.@) + */ +PDH_STATUS WINAPI PdhOpenLogW( LPCWSTR log_name, DWORD access_flags, + LPDWORD log_type, PDH_HQUERY query, DWORD max_size, + LPCWSTR user_caption, PDH_HLOG *log ) +{ + FIXME("(%s, %d, %p, %p, %d, %s, %p): stub\n", log_name, access_flags, + log_type, query, max_size, user_caption, log); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return PDH_NOT_IMPLEMENTED; +} + /*********************************************************************** * PdhRemoveCounter (PDH.@) */ diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 71603f8c6ba..4e5b13d2c67 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -126,6 +126,66 @@ static void test_PdhOpenQueryW( void ) ok(ret == PDH_INVALID_HANDLE, "PdhCloseQuery failed 0x%08x\n", ret); } +static void test_PdhOpenLogA( void ) +{ + PDH_STATUS ret; + PDH_HLOG log; + PDH_HQUERY query; + PDH_HCOUNTER counter; + DWORD log_type = PDH_LOG_TYPE_CSV; + + PdhOpenQueryA( NULL, 0, &query ); + PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); + + ret = PdhOpenLogA( NULL, PDH_LOG_WRITE_ACCESS, &log_type, NULL, 0, NULL, NULL ); + todo_wine ok(ret == PDH_INVALID_ARGUMENT, "PdhOpenLogA failed 0x%08x\n", ret); + + ret = PdhOpenLogA( "test_log", PDH_LOG_WRITE_ACCESS | PDH_LOG_CREATE_ALWAYS, &log_type, query, 0, NULL, &log ); + todo_wine ok(ret == ERROR_SUCCESS, "PdhOpenLogA failed 0x%08x\n", ret); + + ret = PdhCloseLog( NULL, 0 ); + todo_wine ok(ret == PDH_CSTATUS_VALID_DATA, "PdhCloseLog failed 0x%08x\n", ret); + + ret = PdhCloseLog( &log, 0 ); + todo_wine ok(ret == PDH_INVALID_HANDLE, "PdhCloseLog failed 0x%08x\n", ret); + + ret = PdhCloseLog( log, 0 ); + todo_wine ok(ret == ERROR_SUCCESS, "PdhCloseLog failed 0x%08x\n", ret); + + ret = PdhCloseLog( log, 0 ); + todo_wine ok(ret == PDH_INVALID_HANDLE, "PdhCloseLog failed 0x%08x\n", ret); +} + +static void test_PdhOpenLogW( void ) +{ + PDH_STATUS ret; + PDH_HLOG log; + PDH_HQUERY query; + PDH_HCOUNTER counter; + DWORD log_type = PDH_LOG_TYPE_CSV; + + PdhOpenQueryW( NULL, 0, &query ); + PdhAddCounterW( query, L"\\System\\System Up Time", 0, &counter ); + + ret = PdhOpenLogW( NULL, PDH_LOG_WRITE_ACCESS, &log_type, NULL, 0, NULL, NULL ); + todo_wine ok(ret == PDH_INVALID_ARGUMENT, "PdhOpenLogW failed 0x%08x\n", ret); + + ret = PdhOpenLogW( L"test_log", PDH_LOG_WRITE_ACCESS | PDH_LOG_CREATE_ALWAYS, &log_type, query, 0, NULL, &log ); + todo_wine ok(ret == ERROR_SUCCESS, "PdhOpenLogW failed 0x%08x\n", ret); + + ret = PdhCloseLog( NULL, 0 ); + todo_wine ok(ret == PDH_CSTATUS_VALID_DATA, "PdhCloseLog failed 0x%08x\n", ret); + + ret = PdhCloseLog( &log, 0 ); + todo_wine ok(ret == PDH_INVALID_HANDLE, "PdhCloseLog failed 0x%08x\n", ret); + + ret = PdhCloseLog( log, 0 ); + todo_wine ok(ret == ERROR_SUCCESS, "PdhCloseLog failed 0x%08x\n", ret); + + ret = PdhCloseLog( log, 0 ); + todo_wine ok(ret == PDH_INVALID_HANDLE, "PdhCloseLog failed 0x%08x\n", ret); +} + static void test_PdhAddCounterA( void ) { PDH_STATUS ret; @@ -982,6 +1042,9 @@ START_TEST(pdh) test_PdhOpenQueryA(); test_PdhOpenQueryW(); + test_PdhOpenLogA(); + test_PdhOpenLogW(); + test_PdhAddCounterA(); test_PdhAddCounterW(); diff --git a/include/pdh.h b/include/pdh.h index 3d688bd8ded..caecd7ce528 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -57,6 +57,25 @@ typedef PDH_HLOG HLOG; #define DATA_SOURCE_LOGFILE 0x00000002 #define DATA_SOURCE_WBEM 0x00000004 +#define PDH_LOG_READ_ACCESS 0x00010000 +#define PDH_LOG_WRITE_ACCESS 0x00020000 +#define PDH_LOG_UPDATE_ACCESS 0x00040000 + +#define PDH_LOG_CREATE_NEW 0x00000001 +#define PDH_LOG_CREATE_ALWAYS 0x00000002 +#define PDH_LOG_OPEN_ALWAYS 0x00000003 +#define PDH_LOG_OPEN_EXISTING 0x00000004 +#define PDH_LOG_OPT_USER_STRING 0x01000000 +#define PDH_LOG_OPT_CIRCULAR 0x02000000 + +#define PDH_LOG_TYPE_UNDEFINED 0x00000000 +#define PDH_LOG_TYPE_CSV 0x00000001 +#define PDH_LOG_TYPE_TSV 0x00000002 +#define PDH_LOG_TYPE_SQL 0x00000007 +#define PDH_LOG_TYPE_BINARY 0x00000008 + +#define PDH_FLAG_CLOSE_QUERY 0x00000001 + #ifdef WINE_NO_UNICODE_MACROS # define DECL_PDH_TYPE_AW(name) /* nothing */ #else /* WINE_NO_UNICODE_MACROS */ @@ -203,6 +222,7 @@ PDH_STATUS WINAPI PdhAddEnglishCounterW(PDH_HQUERY, LPCWSTR, DWORD_PTR, PDH_HCOU PDH_STATUS WINAPI PdhBindInputDataSourceA(PDH_HLOG *, const char *); PDH_STATUS WINAPI PdhBindInputDataSourceW(PDH_HLOG *, const WCHAR *); #define PdhBindInputDataSource WINELIB_NAME_AW(PdhBindInputDataSource) +PDH_STATUS WINAPI PdhCloseLog(PDH_HLOG, DWORD); PDH_STATUS WINAPI PdhCloseQuery(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryData(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryDataEx(PDH_HQUERY, DWORD, HANDLE); @@ -229,6 +249,9 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexW(LPCWSTR, DWORD, LPWSTR, LPDWORD); PDH_STATUS WINAPI PdhMakeCounterPathA(PDH_COUNTER_PATH_ELEMENTS_A *, LPSTR, LPDWORD, DWORD); PDH_STATUS WINAPI PdhMakeCounterPathW(PDH_COUNTER_PATH_ELEMENTS_W *, LPWSTR, LPDWORD, DWORD); #define PdhMakeCounterPath WINELIB_NAME_AW(PdhMakeCounterPath) +PDH_STATUS WINAPI PdhOpenLogA(LPCSTR, DWORD, LPDWORD, PDH_HQUERY, DWORD, LPCSTR, PDH_HLOG *); +PDH_STATUS WINAPI PdhOpenLogW(LPCWSTR, DWORD, LPDWORD, PDH_HQUERY, DWORD, LPCWSTR, PDH_HLOG *); +#define PdhOpenLog WINELIB_NAME_AW(PdhOpenLog) PDH_STATUS WINAPI PdhOpenQueryA(LPCSTR, DWORD_PTR, PDH_HQUERY *); PDH_STATUS WINAPI PdhOpenQueryW(LPCWSTR, DWORD_PTR, PDH_HQUERY *); #define PdhOpenQuery WINELIB_NAME_AW(PdhOpenQuery) -- 2.31.1

May 2, 2021

Re: [PATCH] msxml3: Refcount the domdoc/xmldoc properties.

by Nikolay Sivov

On 4/29/21 4:16 PM, Francois Gouget wrote: > -static void free_properties(domdoc_properties* properties) > +LONG properties_add_ref(domdoc_properties* properties) > { > - if (properties) > + LONG ref = InterlockedExchangeAdd(&properties->refs, 1) + 1; > + TRACE("(%p)->(%d)\n", properties, ref); > + return ref; > +} > + > +static LONG properties_release(domdoc_properties* properties) > +{ > + LONG ref = InterlockedExchangeAdd(&properties->refs, -1) - 1; > + TRACE("(%p)->(%d)\n", properties, ref); > + > + if (ref < 0) > + WARN("negative refcount, expect troubles\n"); > + Could we use InterlockedIncrement for that?

May 2, 2021

Re: [PATCH v2] winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT.

by Nikolay Sivov

Hi, Just add a single line for CREATE_IGNORE_SYSTEM_DEFAULT, other changes do not look useful.

May 2, 2021