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

[PATCH 3/3] wldap32/tests: Add ber_printf/scanf tests.
by Hans Leidekker 06 Apr '21

06 Apr '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wldap32/tests/Makefile.in | 1 + dlls/wldap32/tests/ber.c | 72 ++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 dlls/wldap32/tests/ber.c diff --git a/dlls/wldap32/tests/Makefile.in b/dlls/wldap32/tests/Makefile.in index 6df015083e8..05fe5b9af6d 100644 --- a/dlls/wldap32/tests/Makefile.in +++ b/dlls/wldap32/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = wldap32.dll IMPORTS = wldap32 C_SRCS = \ + ber.c \ parse.c diff --git a/dlls/wldap32/tests/ber.c b/dlls/wldap32/tests/ber.c new file mode 100644 index 00000000000..56d54fa6f5a --- /dev/null +++ b/dlls/wldap32/tests/ber.c @@ -0,0 +1,72 @@ +/* + * Copyright 2021 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winldap.h> +#include <winber.h> + +#include "wine/test.h" + +static void test_ber_printf(void) +{ + int ret; + BerElement *ber; + struct berval *bv; + + ber = ber_alloc_t( 0 ); + todo_wine ok( ber == NULL, "ber_alloc_t succeeded\n" ); + + ber = ber_alloc_t( LBER_USE_DER ); + ok( ber != NULL, "ber_alloc_t failed\n" ); + + ret = ber_printf( ber, (char *)"{i}", -1 ); + todo_wine ok( !ret, "got %d\n", ret ); + + ret = ber_flatten( ber, &bv ); + ok( !ret, "got %d\n", ret ); + todo_wine ok( bv->bv_len == 12, "got %d\n", bv->bv_len ); + if (bv->bv_len == 12) ok( !memcmp( bv->bv_val, "0\x84\x00\x00\x00\x06\x02\x04\xff\xff\xff\xff", 12 ), "got %s\n", + wine_dbgstr_an(bv->bv_val, 12) ); + ber_bvfree( bv ); + ber_free( ber, 1 ); +} + +static void test_ber_scanf(void) +{ + int ret; + BerElement *ber; + struct berval bv = { 12, (char *)"0\x84\x00\x00\x00\x06\x02\x04\xff\xff\xff\xff" }; + int i; + + ber = ber_init( &bv ); + ok( ber != NULL, "ber_init failed\n" ); + + i = 0; + ret = ber_scanf( ber, (char *)"{i}", &i ); + ok( !ret, "got %d\n", ret ); + ok( i == -1, "got %d\n", i ); + ber_free( ber, 1 ); +} + +START_TEST(ber) +{ + test_ber_printf(); + test_ber_scanf(); +} -- 2.30.2

1 0

[PATCH 2/3] include: Remove functions declarations from winldap.h that don't exist in the native header.
by Hans Leidekker 06 Apr '21

06 Apr '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/adsldp/adsldp.c | 1 + dlls/wldap32/tests/parse.c | 1 + include/winldap.h | 12 ------------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 63f800b5061..89d658c53ff 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -38,6 +38,7 @@ #include "lmcons.h" #include "lmapibuf.h" #include "winldap.h" +#include "winber.h" #include "adsldp_private.h" diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 9fdd4db03ad..8deebcbc6bf 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> #include <winldap.h> +#include <winber.h> #include "wine/test.h" diff --git a/include/winldap.h b/include/winldap.h index 2d41eaa3fa2..2cc29ef693c 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -632,19 +632,7 @@ ULONG CDECL ldap_value_freeW(PWCHAR*); #define ldap_value_free WINELIB_NAME_AW(ldap_value_free) ULONG CDECL ldap_value_free_len(struct berval**); -BerElement* CDECL ber_alloc_t(INT); -BERVAL* CDECL ber_bvdup(BERVAL*); -void CDECL ber_bvecfree(PBERVAL*); void CDECL ber_bvfree(BERVAL*); -ULONG CDECL ber_first_element(BerElement*,ULONG*,CHAR**); -INT CDECL ber_flatten(BerElement*,PBERVAL*); -void CDECL ber_free(BerElement*,INT); -BerElement* CDECL ber_init(BERVAL*); -ULONG CDECL ber_next_element(BerElement*,ULONG*,CHAR*); -ULONG CDECL ber_peek_tag(BerElement*,ULONG*); -INT WINAPIV ber_printf(BerElement*,PCHAR,...); -ULONG CDECL ber_skip_tag(BerElement*,ULONG*); -INT WINAPIV ber_scanf(BerElement*,PCHAR,...); ULONG CDECL LdapGetLastError(void); ULONG CDECL LdapMapErrorToWin32(ULONG); -- 2.30.2

1 0

[PATCH 1/3] include: Add winber.h
by Hans Leidekker 06 Apr '21

06 Apr '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/winber.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 include/winber.h diff --git a/include/winber.h b/include/winber.h new file mode 100644 index 00000000000..40ab0f40ed8 --- /dev/null +++ b/include/winber.h @@ -0,0 +1,37 @@ +/* + * Copyright 2021 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINBER_H +#define __WINE_WINBER_H + +#define LBER_ERROR (~0L) +#define LBER_DEFAULT (~0L) + +typedef int ber_int_t; +typedef unsigned int ber_tag_t; +typedef unsigned int ber_len_t; + +BerElement * CDECL ber_alloc_t( int ); +void CDECL ber_bvfree( BERVAL * ); +int CDECL ber_flatten( BerElement *, BERVAL ** ); +void CDECL ber_free( BerElement *, int ); +BerElement * CDECL ber_init( BERVAL * ); +int WINAPIV ber_printf( BerElement *, char *, ... ); +ULONG WINAPIV ber_scanf( BerElement *, char *, ... ); + +#endif /* __WINE_WINBER_H */ -- 2.30.2

1 0

[PATCH] reg: Remove unneeded ternary operator in RegDeleteValueW()
by Hugh McMaster 06 Apr '21

06 Apr '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index d6fb81d1cc4..db1ed0f5337 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -93,7 +93,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name } else if (value_name || value_empty) { - if (RegDeleteValueW(key, value_empty ? NULL : value_name) != ERROR_SUCCESS) + if (RegDeleteValueW(key, value_name)) { RegCloseKey(key); output_message(STRING_VALUE_NONEXIST); -- 2.31.0

1 0

[PATCH 1/2] msvcp90: Move type_info to a separate file.
by Arkadiusz Hiler 06 Apr '21

06 Apr '21

type_info is needed for RTTI, and in some cases pulling in whole exception.c is not an option due to its dependency on multiple MSVCRT_ functions. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/msvcirt/Makefile.in | 1 + dlls/msvcirt/msvcirt.c | 1 + dlls/msvcirt/msvcirt.h | 1 + dlls/msvcp100/Makefile.in | 1 + dlls/msvcp110/Makefile.in | 1 + dlls/msvcp120/Makefile.in | 1 + dlls/msvcp140/Makefile.in | 1 + dlls/msvcp60/Makefile.in | 1 + dlls/msvcp60/main.c | 1 + dlls/msvcp60/msvcp.h | 1 + dlls/msvcp70/Makefile.in | 1 + dlls/msvcp71/Makefile.in | 1 + dlls/msvcp80/Makefile.in | 1 + dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/exception.c | 31 ------------------ dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp_main.c | 1 + dlls/msvcp90/type_info.c | 67 +++++++++++++++++++++++++++++++++++++++ 18 files changed, 83 insertions(+), 31 deletions(-) create mode 100644 dlls/msvcp90/type_info.c diff --git a/dlls/msvcirt/Makefile.in b/dlls/msvcirt/Makefile.in index 1dee2b24c02..b792edabf09 100644 --- a/dlls/msvcirt/Makefile.in +++ b/dlls/msvcirt/Makefile.in @@ -6,5 +6,6 @@ IMPORTS = msvcrt EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ + type_info.c \ exception.c \ msvcirt.c diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index db4b736d272..87e1908c4a8 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -5213,6 +5213,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { case DLL_PROCESS_ATTACH: init_cxx_funcs(); + init_type_info(inst); init_exception(inst); init_io(inst); DisableThreadLibraryCalls( inst ); diff --git a/dlls/msvcirt/msvcirt.h b/dlls/msvcirt/msvcirt.h index 5b59b7862a3..e775eabb2fe 100644 --- a/dlls/msvcirt/msvcirt.h +++ b/dlls/msvcirt/msvcirt.h @@ -71,4 +71,5 @@ typedef enum { extern void* (__cdecl *MSVCRT_operator_new)(SIZE_T); extern void (__cdecl *MSVCRT_operator_delete)(void*); +void init_type_info(void*); void init_exception(void*); diff --git a/dlls/msvcp100/Makefile.in b/dlls/msvcp100/Makefile.in index 258aff4b770..0ee8fee26c8 100644 --- a/dlls/msvcp100/Makefile.in +++ b/dlls/msvcp100/Makefile.in @@ -6,6 +6,7 @@ PARENTSRC = ../msvcp90 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + type_info.c \ exception.c \ ios.c \ locale.c \ diff --git a/dlls/msvcp110/Makefile.in b/dlls/msvcp110/Makefile.in index 6b1998a68ea..01a22340b6d 100644 --- a/dlls/msvcp110/Makefile.in +++ b/dlls/msvcp110/Makefile.in @@ -6,6 +6,7 @@ PARENTSRC = ../msvcp90 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + type_info.c \ exception.c \ ios.c \ locale.c \ diff --git a/dlls/msvcp120/Makefile.in b/dlls/msvcp120/Makefile.in index 2a77859bf99..22923b61937 100644 --- a/dlls/msvcp120/Makefile.in +++ b/dlls/msvcp120/Makefile.in @@ -6,6 +6,7 @@ PARENTSRC = ../msvcp90 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + type_info.c \ exception.c \ ios.c \ locale.c \ diff --git a/dlls/msvcp140/Makefile.in b/dlls/msvcp140/Makefile.in index ea05d6b3456..00bc6e219ce 100644 --- a/dlls/msvcp140/Makefile.in +++ b/dlls/msvcp140/Makefile.in @@ -5,6 +5,7 @@ PARENTSRC = ../msvcp90 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + type_info.c \ exception.c \ ios.c \ locale.c \ diff --git a/dlls/msvcp60/Makefile.in b/dlls/msvcp60/Makefile.in index b43395b44d1..92188139b02 100644 --- a/dlls/msvcp60/Makefile.in +++ b/dlls/msvcp60/Makefile.in @@ -6,6 +6,7 @@ IMPORTS = msvcrt EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ + type_info.c \ exception.c \ ios.c \ locale.c \ diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index ab9a6a3179d..a553e1438c2 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -89,6 +89,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: init_cxx_funcs(); _Init_locks__Init_locks_ctor(NULL); + init_type_info(hinstDLL); init_exception(hinstDLL); init_locale(hinstDLL); init_io(hinstDLL); diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index 2507d9123d9..f078b33542a 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -465,6 +465,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_uint64(const num_put*, o ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_bool(const num_put*, ostreambuf_iterator_wchar*, ostreambuf_iterator_wchar, ios_base*, wchar_t, bool); +void init_type_info(void*); void init_exception(void*); void init_locale(void*); void init_io(void*); diff --git a/dlls/msvcp70/Makefile.in b/dlls/msvcp70/Makefile.in index a023d1b8e2a..57987596f50 100644 --- a/dlls/msvcp70/Makefile.in +++ b/dlls/msvcp70/Makefile.in @@ -6,6 +6,7 @@ PARENTSRC = ../msvcp90 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + type_info.c \ exception.c \ ios.c \ locale.c \ diff --git a/dlls/msvcp71/Makefile.in b/dlls/msvcp71/Makefile.in index 6713ab469d3..743b6d4751c 100644 --- a/dlls/msvcp71/Makefile.in +++ b/dlls/msvcp71/Makefile.in @@ -6,6 +6,7 @@ PARENTSRC = ../msvcp90 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + type_info.c \ exception.c \ ios.c \ locale.c \ diff --git a/dlls/msvcp80/Makefile.in b/dlls/msvcp80/Makefile.in index 22a18fcc66a..7c1947f2721 100644 --- a/dlls/msvcp80/Makefile.in +++ b/dlls/msvcp80/Makefile.in @@ -6,6 +6,7 @@ PARENTSRC = ../msvcp90 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + type_info.c \ exception.c \ ios.c \ locale.c \ diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in index b7e7b73423f..fe4bec04a9c 100644 --- a/dlls/msvcp90/Makefile.in +++ b/dlls/msvcp90/Makefile.in @@ -5,6 +5,7 @@ EXTRADEFS = -D_MSVCP_VER=90 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + type_info.c \ exception.c \ ios.c \ locale.c \ diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 8ea4e132a0f..e6c9227cc27 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -65,34 +65,6 @@ extern const vtable_ptr MSVCP_bad_cast_vtable; /* ??_7range_error(a)std@@6B@ */ extern const vtable_ptr MSVCP_range_error_vtable; -static void MSVCP_type_info_dtor(type_info * _this) -{ - free(_this->name); -} - -/* Unexported */ -DEFINE_THISCALL_WRAPPER(MSVCP_type_info_vector_dtor,8) -void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int flags) -{ - TRACE("(%p %x)\n", _this, flags); - if (flags & 2) - { - /* we have an array, with the number of elements stored before the first object */ - INT_PTR i, *ptr = (INT_PTR *)_this - 1; - - for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); - MSVCRT_operator_delete(ptr); - } - else - { - MSVCP_type_info_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); - } - return _this; -} - -DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) - /* ??0exception@@QAE(a)ABQBD@Z */ /* ??0exception@@QEAA(a)AEBQEBD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor,8) @@ -1022,8 +994,6 @@ void __cdecl __ExceptionPtrDestroy(exception_ptr *ep) #endif __ASM_BLOCK_BEGIN(exception_vtables) - __ASM_VTABLE(type_info, - VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); EXCEPTION_VTABLE(exception, VTABLE_ADD_FUNC(MSVCP_exception_vector_dtor) VTABLE_ADD_FUNC(MSVCP_exception_what)); @@ -1130,7 +1100,6 @@ void throw_exception(exception_type et, const char *str) void init_exception(void *base) { #ifdef __x86_64__ - init_type_info_rtti(base); init_exception_rtti(base); init_bad_alloc_rtti(base); init_logic_error_rtti(base); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index b2e0ae8b15c..c4908f24245 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -618,6 +618,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_uint64(const num_put*, o ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_bool(const num_put*, ostreambuf_iterator_wchar*, ostreambuf_iterator_wchar, ios_base*, wchar_t, bool); +void init_type_info(void*); void init_exception(void*); void init_locale(void*); void init_io(void*); diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 6bfd8b14367..b023a3573de 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -184,6 +184,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: init_cxx_funcs(); _Init_locks__Init_locks_ctor(NULL); + init_type_info(hinstDLL); init_exception(hinstDLL); init_locale(hinstDLL); init_io(hinstDLL); diff --git a/dlls/msvcp90/type_info.c b/dlls/msvcp90/type_info.c new file mode 100644 index 00000000000..38134ac5e86 --- /dev/null +++ b/dlls/msvcp90/type_info.c @@ -0,0 +1,67 @@ +/* + * Copyright 2021 Arkadiusz Hiler for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "msvcp90.h" +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); + +static void MSVCP_type_info_dtor(type_info * _this) +{ + free(_this->name); +} + +/* Unexported */ +DEFINE_THISCALL_WRAPPER(MSVCP_type_info_vector_dtor,8) +void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int flags) +{ + TRACE("(%p %x)\n", _this, flags); + if (flags & 2) + { + /* we have an array, with the number of elements stored before the first object */ + INT_PTR i, *ptr = (INT_PTR *)_this - 1; + + for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); + MSVCRT_operator_delete(ptr); + } + else + { + MSVCP_type_info_dtor(_this); + if (flags & 1) MSVCRT_operator_delete(_this); + } + return _this; +} + +DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) + +__ASM_BLOCK_BEGIN(type_info_vtables) + __ASM_VTABLE(type_info, + VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); +__ASM_BLOCK_END + +void init_type_info(void *base) +{ +#ifdef __x86_64__ + init_type_info_rtti(base); +#endif +} -- 2.31.1

2 8

[PATCH v2] taskmgr: Implement process page sorting.
by Haoyang Chen 06 Apr '21

06 Apr '21

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- programs/taskmgr/perfdata.c | 85 +++++++++++++++++++++++++++++++++++++ programs/taskmgr/perfdata.h | 1 + programs/taskmgr/procpage.c | 20 ++++----- 3 files changed, 94 insertions(+), 12 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 2cbd6b01669..5adea4db595 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -29,6 +29,7 @@ #include "taskmgr.h" #include "perfdata.h" +#include "column.h" static CRITICAL_SECTION PerfDataCriticalSection; static PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ @@ -833,3 +834,87 @@ ULONG PerfDataGetTotalThreadCount(void) return ThreadCount; } + +static BOOL bSortAscending = TRUE; +static UINT ColumnDataHintIndex = 0; +static INT ProcessPageCompareFunc(const VOID* first, const VOID* second) +{ + PPERFDATA pPerfData1 = NULL; + PPERFDATA pPerfData2 = NULL; + + if (bSortAscending) + { + pPerfData1 = (PPERFDATA) first; + pPerfData2 = (PPERFDATA) second; + } + else + { + pPerfData2 = (PPERFDATA) first; + pPerfData1 = (PPERFDATA) second; + } + + switch (ColumnDataHintIndex) + { + case COLUMN_IMAGENAME: + return lstrcmpW(pPerfData1->ImageName, pPerfData2->ImageName); + case COLUMN_PID: + return pPerfData1->ProcessId > pPerfData2->ProcessId; + case COLUMN_USERNAME: + return lstrcmpW(pPerfData1->UserName, pPerfData2->UserName); + case COLUMN_SESSIONID: + return pPerfData1->SessionId > pPerfData2->SessionId; + case COLUMN_CPUUSAGE: + return pPerfData1->CPUUsage > pPerfData2->CPUUsage; + case COLUMN_CPUTIME: + return pPerfData1->CPUTime.QuadPart > pPerfData2->CPUTime.QuadPart; + case COLUMN_MEMORYUSAGE: + return pPerfData1->vmCounters.WorkingSetSize > pPerfData2->vmCounters.WorkingSetSize; + case COLUMN_PEAKMEMORYUSAGE: + return pPerfData1->vmCounters.PeakWorkingSetSize > pPerfData2->vmCounters.PeakWorkingSetSize; + case COLUMN_MEMORYUSAGEDELTA: + return pPerfData1->WorkingSetSizeDelta > pPerfData2->WorkingSetSizeDelta; + case COLUMN_PAGEFAULTS: + return pPerfData1->vmCounters.PageFaultCount > pPerfData2->vmCounters.PageFaultCount; + case COLUMN_PAGEFAULTSDELTA: + return pPerfData1->PageFaultCountDelta > pPerfData2->PageFaultCountDelta; + case COLUMN_VIRTUALMEMORYSIZE: + return pPerfData1->vmCounters.VirtualSize > pPerfData2->vmCounters.VirtualSize; + case COLUMN_PAGEDPOOL: + return pPerfData1->vmCounters.QuotaPagedPoolUsage > pPerfData2->vmCounters.QuotaPagedPoolUsage; + case COLUMN_NONPAGEDPOOL: + return pPerfData1->vmCounters.QuotaNonPagedPoolUsage > pPerfData2->vmCounters.QuotaNonPagedPoolUsage; + case COLUMN_BASEPRIORITY: + return pPerfData1->BasePriority > pPerfData2->BasePriority; + case COLUMN_HANDLECOUNT: + return pPerfData1->HandleCount > pPerfData2->HandleCount; + case COLUMN_THREADCOUNT: + return pPerfData1->ThreadCount > pPerfData2->ThreadCount; + case COLUMN_USEROBJECTS: + return pPerfData1->USERObjectCount > pPerfData2->USERObjectCount; + case COLUMN_GDIOBJECTS: + return pPerfData1->GDIObjectCount > pPerfData2->GDIObjectCount; + case COLUMN_IOREADS: + return pPerfData1->IOCounters.ReadOperationCount > pPerfData2->IOCounters.ReadOperationCount; + case COLUMN_IOWRITES: + return pPerfData1->IOCounters.WriteOperationCount > pPerfData2->IOCounters.WriteOperationCount; + case COLUMN_IOREADBYTES: + return pPerfData1->IOCounters.ReadTransferCount > pPerfData2->IOCounters.ReadTransferCount; + case COLUMN_IOWRITEBYTES: + return pPerfData1->IOCounters.WriteTransferCount > pPerfData2->IOCounters.WriteTransferCount; + case COLUMN_IOOTHERBYTES: + return pPerfData1->IOCounters.OtherTransferCount > pPerfData2->IOCounters.OtherTransferCount; + } + return 0; +} + +VOID PerDataSort(UINT iColumnDataHintIndex) +{ + EnterCriticalSection(&PerfDataCriticalSection); + + bSortAscending = !bSortAscending; + ColumnDataHintIndex = iColumnDataHintIndex; + + qsort(pPerfData, ProcessCount, sizeof(PERFDATA), ProcessPageCompareFunc); + + LeaveCriticalSection(&PerfDataCriticalSection); +} diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index 615e7db2a64..22d2a1bf1ea 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -110,4 +110,5 @@ ULONG PerfDataGetSystemHandleCount(void); ULONG PerfDataGetTotalThreadCount(void); +VOID PerDataSort(UINT iColumnDataHintIndex); #endif /* __PERFDATA_H */ diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 5ea2e6b044f..b04e6c59b04 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -148,7 +148,7 @@ static void ProcessPageShowContextMenu(DWORD dwProcessId) static void ProcessPageOnNotify(LPARAM lParam) { - LPNMHDR pnmh; + LPNMHEADERW pnmh; NMLVDISPINFOW* pnmdi; LVITEMW lvitem; ULONG Index, Count; @@ -159,12 +159,12 @@ static void ProcessPageOnNotify(LPARAM lParam) static const WCHAR wszFmt02D[] = {'%','0','2','d',0}; static const WCHAR wszUnitK[] = {' ','K',0}; - pnmh = (LPNMHDR) lParam; + pnmh = (LPNMHEADERW) lParam; pnmdi = (NMLVDISPINFOW*) lParam; - if (pnmh->hwndFrom == hProcessPageListCtrl) + if (pnmh->hdr.hwndFrom == hProcessPageListCtrl) { - switch (pnmh->code) + switch (pnmh->hdr.code) { case LVN_GETDISPINFOW: @@ -337,18 +337,14 @@ static void ProcessPageOnNotify(LPARAM lParam) } } - else if (pnmh->hwndFrom == hProcessPageHeaderCtrl) + else if (pnmh->hdr.hwndFrom == hProcessPageHeaderCtrl) { - switch (pnmh->code) + switch (pnmh->hdr.code) { case HDN_ITEMCLICKW: - /* - * FIXME: Fix the column sorting - * - *ListView_SortItems(hApplicationPageListCtrl, ApplicationPageCompareFunc, NULL); - *bSortAscending = !bSortAscending; - */ + PerDataSort(ColumnDataHints[pnmh->iItem]); + InvalidateRect(hProcessPageListCtrl, NULL, TRUE); break; -- 2.20.1

2 1

[PATCH v2 2/2] msxml3: Don't unlink the XML declaration when saving document.
by Dmitry Timoshkov 06 Apr '21

06 Apr '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 3 --- dlls/msxml3/tests/domdoc.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 80c32e9ba99..a81ef5f16cb 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2534,7 +2534,6 @@ static HRESULT WINAPI domdoc_save( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); xmlSaveCtxtPtr ctx = NULL; - xmlNodePtr xmldecl; HRESULT ret = S_OK; TRACE("(%p)->(%s)\n", This, debugstr_variant(&destination)); @@ -2610,9 +2609,7 @@ static HRESULT WINAPI domdoc_save( return S_FALSE; } - xmldecl = xmldoc_unlink_xmldecl(get_doc(This)); if (xmlSaveDoc(ctx, get_doc(This)) == -1) ret = S_FALSE; - xmldoc_link_xmldecl(get_doc(This), xmldecl); /* will release resources through close callback */ xmlSaveClose(ctx); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5bc2fe1d5c3..72968fff11b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8524,6 +8524,7 @@ static void test_createProcessingInstruction(void) { static const WCHAR xml1[] = L"<?xml version=\"1.0\"?>\r\n<test/>\r\n"; static const char xml2[] = "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\r\n<test/>\r\n"; + static const char xml2_wine[] = "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\n<test/>\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; IXMLDOMNode *node; @@ -8582,8 +8583,7 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); p[GlobalSize(global)] = 0; -todo_wine - ok(!strcmp(p, xml2), "got %s\n", wine_dbgstr_a(p)); + ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); IStream_Release(stream); -- 2.30.2

2 7

[tools] testbot/PatchUtils: Document the make_* scripts indirect impacts.
by Francois Gouget 06 Apr '21

06 Apr '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 0d60fdb29..b33ad9bd1 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -443,6 +443,8 @@ sub GetPatchImpacts($) $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_requests essentially impacts every test but these + # indirect impacts are ignored (use test=all if it really matters). } elsif ($Line =~ m=^--- \w+/(dlls/dsound/make_fir)$=) { @@ -461,18 +463,30 @@ sub GetPatchImpacts($) $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeOpenGL} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_opengl impacts other dlls through header changes so + # it could make sense for the TestBot to rerun the corresponding tests + # when test=module. But that would require either hardcoding the list + # of impacted modules, or detecting changed source files (and thus the + # list of tests to run) at build time which is incompatible with the + # current architecture. + # So these indirect impacts are ignored for now. A workaround is to + # use test=all. } elsif ($Line =~ m=^--- \w+/(dlls/winevulkan/make_vulkan)$=) { $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeVulkan} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_vulkan impacts other dlls through header changes. + # See the make_opengl comment. } elsif ($Line =~ m=^--- \w+/(tools/make_unicode)$=) { $Path = $1; $Impacts->{BuildRoot} = $Impacts->{MakeUnicode} = 1; $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; + # Note that make_unicode changes the source for many dlls. + # See the make_opengl comment. } elsif ($Line =~ m=^--- /dev/null$=) { -- 2.20.1

1 0

[tools] testbot/PatchUtils: Take into account module subdirectories.
by Francois Gouget 06 Apr '21

06 Apr '21

Patches to files in in a subdirectory of a dll or program should be treated the same as regular dll/program patches. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Except for /tests/ which is the previous if of course. --- testbot/lib/WineTestBot/PatchUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index b33ad9bd1..a7d33f685 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -240,7 +240,7 @@ sub _HandleFile($$$) $Impacts->{MakeMakefiles} = 1; } } - elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~) + elsif ($FilePath =~ m~^(dlls|programs)/([^/\s]+)/((?:[^\s]+/)?[^/\s]+)$~) { my ($Root, $PatchedDir, $File) = ($1, $2, $3); -- 2.20.1

1 0

[PATCH] regedit: Scale UI according to screen DPI.
by Mark Harmstone 06 Apr '21

06 Apr '21

Regedit chooses UI sizes that aren't appropriate for high-DPI monitors; scale them to compensate. Signed-off-by: Mark Harmstone <mark(a)harmstone.com> --- programs/regedit/childwnd.c | 12 +++++++++++- programs/regedit/listview.c | 9 ++++++--- programs/regedit/main.h | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 582f3c0c177..d1d2dd6e47e 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -430,6 +430,16 @@ static int listview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam return 0; } +int get_dpi(void) +{ + HDC dc = GetDC(NULL); + int dpi = GetDeviceCaps(dc, LOGPIXELSX); + + ReleaseDC(NULL, dc); + + return dpi == 0 ? 96 : dpi; +} + #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) @@ -451,7 +461,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa g_pChildWnd = heap_xalloc(sizeof(ChildWnd)); if (!g_pChildWnd) return 0; LoadStringW(hInst, IDS_REGISTRY_ROOT_NAME, g_pChildWnd->szPath, MAX_PATH); - g_pChildWnd->nSplitPos = 250; + g_pChildWnd->nSplitPos = 250 * (float)get_dpi() / 96.0f; g_pChildWnd->hWnd = hWnd; g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, TREE_WINDOW); g_pChildWnd->hListWnd = CreateListView(hWnd, LIST_WINDOW/*, g_pChildWnd->szPath*/); diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 0132cfb8db8..7e27e3d0931 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -222,15 +222,18 @@ static BOOL CreateListColumns(HWND hWndListView) WCHAR szText[50]; int index; LVCOLUMNW lvC; + float dpi_multiplier; /* Create columns. */ lvC.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; lvC.pszText = szText; + dpi_multiplier = (float)get_dpi() / 96.0f; + /* Load the column labels from the resource file. */ for (index = 0; index < MAX_LIST_COLUMNS; index++) { lvC.iSubItem = index; - lvC.cx = default_column_widths[index]; + lvC.cx = default_column_widths[index] * dpi_multiplier; lvC.fmt = column_alignment[index]; LoadStringW(hInst, IDS_LIST_COLUMN_FIRST + index, szText, ARRAY_SIZE(szText)); if (ListView_InsertColumnW(hWndListView, index, &lvC) == -1) return FALSE; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index ae034405646..e3119ac7d54 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -121,6 +121,7 @@ void ShowAboutBox(HWND hWnd); /* childwnd.c */ LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull); LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); +int get_dpi(void); /* edit.c */ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); -- 2.26.3

2 1