- Wine-Devel - list.winehq.org

[PATCH 1/2] ntdll: Fix some memory leaks (Valgrind).
by Sven Baars May 2, 2021

May 2, 2021

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

1 1

[PATCH] pdh/tests: Add test for PdhOpenLog
by Nipun Garg May 2, 2021

May 2, 2021

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

1 0

[PATCH v2] winbase.h: Add CREATE_IGNORE_SYSTEM_DEFAULT.
by Serge Gautherie May 2, 2021

May 2, 2021

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Exists since at least P.SDK 2003 R2. --- include/winbase.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 11a92fa..233afb4 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -647,8 +647,7 @@ typedef struct _PROCESS_INFORMATION{ DWORD dwThreadId; } PROCESS_INFORMATION, *PPROCESS_INFORMATION, *LPPROCESS_INFORMATION; -/* CreateProcess: dwCreationFlag values - */ +/* CreateProcess() dwCreationFlags values */ #define DEBUG_PROCESS 0x00000001 #define DEBUG_ONLY_THIS_PROCESS 0x00000002 #define CREATE_SUSPENDED 0x00000004 @@ -666,12 +665,13 @@ typedef struct _PROCESS_INFORMATION{ #define BELOW_NORMAL_PRIORITY_CLASS 0x00004000 #define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000 #define INHERIT_PARENT_AFFINITY 0x00010000 -#define INHERIT_CALLER_PRIORITY 0x00020000 +#define INHERIT_CALLER_PRIORITY 0x00020000 /* Deprecated. (As of WDK 7.1 already...) */ #define CREATE_PROTECTED_PROCESS 0x00040000 #define EXTENDED_STARTUPINFO_PRESENT 0x00080000 -#define PROCESS_MODE_BACKGROUND_BEGIN 0x00100000 -#define PROCESS_MODE_BACKGROUND_END 0x00200000 -#define CREATE_SECURE_PROCESS 0x00400000 +#define PROCESS_MODE_BACKGROUND_BEGIN 0x00100000 /* See SetPriorityClass() dwPriorityClass */ +#define PROCESS_MODE_BACKGROUND_END 0x00200000 /* See SetPriorityClass() dwPriorityClass */ +#define CREATE_SECURE_PROCESS 0x00400000 /* Documented, though not in MS file */ +/* #define Unknown/Inexistent 0x00800000 */ #define CREATE_BREAKAWAY_FROM_JOB 0x01000000 #define CREATE_PRESERVE_CODE_AUTHZ_LEVEL 0x02000000 #define CREATE_DEFAULT_ERROR_MODE 0x04000000 @@ -679,7 +679,10 @@ typedef struct _PROCESS_INFORMATION{ #define PROFILE_USER 0x10000000 #define PROFILE_KERNEL 0x20000000 #define PROFILE_SERVER 0x40000000 +#define CREATE_IGNORE_SYSTEM_DEFAULT 0x80000000 +/* CreateThread() dwCreationFlags values */ +/* #define CREATE_SUSPENDED 0x00000004 // Already defined, for CreateProcess() */ #define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 /* File object type definitions -- 2.10.0.windows.1

2 1

[PATCH] atl: Implement AtlAxDialogBox().
by Zebediah Figura May 2, 2021

May 2, 2021

From: Qian Hong <qhong(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32749 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/atl/atl_ax.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 69d42f55813..fe70d0a3229 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1404,22 +1404,52 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) * AtlAxDialogBoxW [atl100.35] * */ -INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInstance, LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, - LPARAM dwInitParam) +INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE instance, const WCHAR *name, + HWND owner, DLGPROC proc, LPARAM param) { - FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_w(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); - return 0; + HRSRC resource; + HGLOBAL global; + DLGTEMPLATE *template; + INT_PTR ret; + + TRACE("instance %p, name %s, owner %p, proc %p, param %#Ix\n", + instance, debugstr_w(name), owner, proc, param); + + if (!(resource = FindResourceW(instance, name, (const WCHAR *)RT_DIALOG))) + return 0; + + if (!(global = LoadResource(instance, resource))) + return 0; + + if (!(template = AX_ConvertDialogTemplate(LockResource(global)))) + return 0; + + ret = DialogBoxIndirectParamW(instance, template, owner, proc, param); + HeapFree(GetProcessHeap(), 0, template); + return ret; } /*********************************************************************** * AtlAxDialogBoxA [atl100.36] * */ -INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, - LPARAM dwInitParam) +INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE instance, const char *name, + HWND owner, DLGPROC proc, LPARAM param) { - FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); - return 0; + WCHAR *nameW; + int len; + INT_PTR ret; + + if (IS_INTRESOURCE(name)) + return AtlAxDialogBoxW(instance, (const WCHAR *)name, owner, proc, param); + + len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); + if (!(nameW = malloc(len * sizeof(WCHAR)))) + return 0; + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, len); + ret = AtlAxDialogBoxW(instance, nameW, owner, proc, param); + free(nameW); + return ret; } /*********************************************************************** -- 2.30.2

1 0

[PATCH v2] ntdll: Stub RtlQueryProcessPlaceholderCompatibilityMode().
by Zebediah Figura May 2, 2021

May 2, 2021

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50026 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Fix the definition of PHCM_DISGUISE_FULL_PLACEHOLDERS. dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/ntifs.h | 10 ++++++++++ 4 files changed, 22 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c9cd6fb59fd..2534d2503de 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -900,6 +900,7 @@ @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation @ stub RtlQueryProcessLockInformation +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() @ stub RtlQueryProperties @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index cf21c980a45..d7740a7a044 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -37,6 +37,7 @@ #include "ntdll_misc.h" #include "in6addr.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DECLARE_DEBUG_CHANNEL(debugstr); @@ -2165,3 +2166,12 @@ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *f FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged); return STATUS_NOT_FOUND; } + +/********************************************************************* + * RtlQueryProcessPlaceholderCompatibilityMode [NTDLL.@] + */ +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) +{ + FIXME("stub\n"); + return PHCM_APPLICATION_DEFAULT; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4272004a298..43ef617880e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1215,6 +1215,7 @@ @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() ntdll.RtlQueryProcessPlaceholderCompatibilityMode @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) @ stdcall RtlQueryRegistryValuesEx(long ptr ptr ptr ptr) RtlQueryRegistryValues @ stdcall RtlQueryTimeZoneInformation(ptr) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 9928911f451..22657c01315 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -21,6 +21,15 @@ #include "ntddk.h" +#define PHCM_ERROR_INVALID_PARAMETER ((char)-1) +#define PHCM_ERROR_NO_TEB ((char)-2) +#define PHCM_ERROR_NO_PEB ((char)-3) +#define PHCM_APPLICATION_DEFAULT ((char)0) +#define PHCM_DISGUISE_PLACEHOLDERS ((char)1) +#define PHCM_EXPOSE_PLACEHOLDERS ((char)2) +#define PHCM_DISGUISE_FULL_PLACEHOLDERS ((char)3) +#define PHCM_MAX ((char)3) + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; typedef enum _FS_FILTER_SECTION_SYNC_TYPE @@ -140,5 +149,6 @@ BOOLEAN WINAPI PsIsSystemThread(PETHREAD); NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*); NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void); #endif -- 2.30.2

2 1

[PATCH] ntdll: Stub RtlQueryProcessPlaceholderCompatibilityMode().
by Zebediah Figura May 1, 2021

May 1, 2021

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50026 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/ntifs.h | 10 ++++++++++ 4 files changed, 22 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c9cd6fb59fd..2534d2503de 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -900,6 +900,7 @@ @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation @ stub RtlQueryProcessLockInformation +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() @ stub RtlQueryProperties @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index cf21c980a45..d7740a7a044 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -37,6 +37,7 @@ #include "ntdll_misc.h" #include "in6addr.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DECLARE_DEBUG_CHANNEL(debugstr); @@ -2165,3 +2166,12 @@ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *f FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged); return STATUS_NOT_FOUND; } + +/********************************************************************* + * RtlQueryProcessPlaceholderCompatibilityMode [NTDLL.@] + */ +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) +{ + FIXME("stub\n"); + return PHCM_APPLICATION_DEFAULT; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4272004a298..43ef617880e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1215,6 +1215,7 @@ @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() ntdll.RtlQueryProcessPlaceholderCompatibilityMode @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) @ stdcall RtlQueryRegistryValuesEx(long ptr ptr ptr ptr) RtlQueryRegistryValues @ stdcall RtlQueryTimeZoneInformation(ptr) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 9928911f451..53d8ea7eed8 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -21,6 +21,15 @@ #include "ntddk.h" +#define PHCM_ERROR_INVALID_PARAMETER ((char)-1) +#define PHCM_ERROR_NO_TEB ((char)-2) +#define PHCM_ERROR_NO_PEB ((char)-3) +#define PHCM_APPLICATION_DEFAULT ((char)0) +#define PHCM_DISGUISE_PLACEHOLDERS ((char)1) +#define PHCM_EXPOSE_PLACEHOLDERS ((char)2) +#define PHCM_DISGUISE_FULL_PLACEHOLDERS ((char)2) +#define PHCM_MAX ((char)3) + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; typedef enum _FS_FILTER_SECTION_SYNC_TYPE @@ -140,5 +149,6 @@ BOOLEAN WINAPI PsIsSystemThread(PETHREAD); NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*); NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void); #endif -- 2.30.2

2 1

[PATCH v2 1/2] ntdll/tests: Add a test for segment register contents in x86_64 exception handlers.
by Zebediah Figura May 1, 2021

May 1, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Test the contents of %es, %fs, %gs as well. dlls/ntdll/tests/exception.c | 40 +++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index da88ca449fb..7c75606dd32 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2812,7 +2812,7 @@ static void test___C_specific_handler(void) /* This is heavily based on the i386 exception tests. */ static const struct exception { - BYTE code[18]; /* asm code */ + BYTE code[40]; /* asm code */ BYTE offset; /* offset of faulting instruction */ BYTE length; /* length of faulting instruction */ NTSTATUS status; /* expected status code */ @@ -2921,6 +2921,34 @@ static const struct exception /* 35 */ { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffffffffffff; ret */ 0, 9, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffffffffffff } }, + + /* test exception with cleared segment registers */ + { { + 0x8c, 0xc0, /* mov %es,%eax */ + 0x50, /* push %rax */ + 0x8c, 0xd8, /* mov %ds,%eax */ + 0x50, /* push %rax */ + 0x8c, 0xe0, /* mov %fs,%eax */ + 0x50, /* push %rax */ + 0x8c, 0xe8, /* mov %gs,%eax */ + 0x50, /* push %rax */ + 0x31, 0xc0, /* xor %eax,%eax */ + 0x8e, 0xc0, /* mov %eax,%es */ + 0x8e, 0xd8, /* mov %eax,%ds */ + 0x8e, 0xe0, /* mov %eax,%fs */ + 0x8e, 0xe8, /* mov %eax,%gs */ + 0xfa, /* cli */ + 0x58, /* pop %rax */ + 0x8e, 0xe8, /* mov %eax,%gs */ + 0x58, /* pop %rax */ + 0x8e, 0xe0, /* mov %eax,%fs */ + 0x58, /* pop %rax */ + 0x8e, 0xd8, /* mov %eax,%ds */ + 0x58, /* pop %rax */ + 0x8e, 0xc0, /* mov %eax,%es */ + 0xc3, /* retq */ + }, 22, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, + { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ 1, 1, STATUS_SINGLE_STEP, 0 }, { { 0xcd, 0x2c, 0xc3 }, @@ -2992,6 +3020,16 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, "%u: Unexpected exception address %p/%p\n", entry, rec->ExceptionAddress, (char*)context->Rip ); + todo_wine ok( context->SegDs == context->SegSs, + "%u: ds %#x does not match ss %#x\n", entry, context->SegDs, context->SegSs ); + todo_wine ok( context->SegEs == context->SegSs, + "%u: es %#x does not match ss %#x\n", entry, context->SegEs, context->SegSs ); + todo_wine ok( context->SegGs == context->SegSs, + "%u: ds %#x does not match ss %#x\n", entry, context->SegGs, context->SegSs ); + + todo_wine ok( context->SegFs && context->SegFs != context->SegSs, + "%u: got fs %#x\n", entry, context->SegFs ); + if (except->status == STATUS_BREAKPOINT && is_wow64) parameter_count = 1; else if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) -- 2.30.2

4 6

[PATCH] ntoskrnl/tests: Open the HID device with FILE_SHARE_READ | FILE_SHARE_WRITE.
by Zebediah Figura May 1, 2021

May 1, 2021

Fixes a test failure on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 68dbbc60806..59d9dcfb3bf 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1726,7 +1726,8 @@ static void test_hid_device(void) todo_wine ok(found, "didn't find device\n"); - file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS, 0, NULL, OPEN_EXISTING, 0, NULL); + file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); CloseHandle(file); -- 2.30.2

2 1

[PATCH v2 1/4] ntoskrnl: Remove the device from the root device list in IRP_MN_REMOVE_DEVICE.
by Zebediah Figura May 1, 2021

May 1, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: No changes. dlls/ntoskrnl.exe/pnp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 0d9d816e3c0..095344b1073 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -955,10 +955,13 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) break; case IRP_MN_START_DEVICE: case IRP_MN_SURPRISE_REMOVAL: - case IRP_MN_REMOVE_DEVICE: /* Nothing to do. */ irp->IoStatus.u.Status = STATUS_SUCCESS; break; + case IRP_MN_REMOVE_DEVICE: + list_remove( &root_device->entry ); + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; case IRP_MN_QUERY_CAPABILITIES: irp->IoStatus.u.Status = STATUS_SUCCESS; break; -- 2.30.2

3 5

[PATCH v3] mountmgr.sys: Implement StorageDeviceSeekPenaltyProperty
by David Koolhoven May 1, 2021

May 1, 2021

Allows programs to query if disk has a seek penalty. Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- v3: Linux side/sysfs logic is contained file. --- dlls/mountmgr.sys/Makefile.in | 1 + dlls/mountmgr.sys/device.c | 24 +++ dlls/mountmgr.sys/unix/device_seek_penalty.c | 145 +++++++++++++++++++ include/ntddstor.h | 9 +- 4 files changed, 178 insertions(+), 1 deletion(-) create mode 100644 dlls/mountmgr.sys/unix/device_seek_penalty.c diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 83204e66504..61b462ddd7b 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -7,6 +7,7 @@ EXTRALIBS = $(DISKARBITRATION_LIBS) $(SYSTEMCONFIGURATION_LIBS) $(CORESERVICES_L C_SRCS = \ dbus.c \ + unix/device_seek_penalty.c \ device.c \ diskarb.c \ mountmgr.c diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 04e8fe3c0f5..90c73b13139 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1894,6 +1894,30 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp ) break; } + case StorageDeviceSeekPenaltyProperty: + { + DEVICE_SEEK_PENALTY_DESCRIPTOR *descriptor; + int ret; + + memset( irp->AssociatedIrp.SystemBuffer, 0, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + descriptor = irp->AssociatedIrp.SystemBuffer; + descriptor->Version = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + descriptor->Size = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + irp->IoStatus.Information = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + + ret = device_seek_penalty(device->unix_mount); + if (ret < 0) { + FIXME( "Unsupported property StorageDeviceSeekPenalty\n" ); + status = STATUS_NOT_SUPPORTED; + } else if (ret == 0) { + descriptor->IncursSeekPenalty = FALSE; + status = STATUS_SUCCESS; + } else if (ret == 1) { + descriptor->IncursSeekPenalty = TRUE; + status = STATUS_SUCCESS; + } + break; + } default: FIXME( "Unsupported property %#x\n", query->PropertyId ); status = STATUS_NOT_SUPPORTED; diff --git a/dlls/mountmgr.sys/unix/device_seek_penalty.c b/dlls/mountmgr.sys/unix/device_seek_penalty.c new file mode 100644 index 00000000000..eefb4d67e65 --- /dev/null +++ b/dlls/mountmgr.sys/unix/device_seek_penalty.c @@ -0,0 +1,145 @@ +/* + * System information APIs + * + * Copyright 1996-1998 Marcus Meissner + * + * 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 "config.h" +#include "wine/port.h" + +#ifdef linux +#include <assert.h> +#include <errno.h> +#include <stdarg.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/sysmacros.h> + +#define NONAMELESSUNION +#include "ntstatus.h" +#include "mountmgr.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#endif +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); + +int device_seek_penalty (char *unix_mount) +{ +#ifdef linux + FILE *fp; + char isrotapathstr[260]; + char evpath[260]; + char ueventbufstr[260]; + char isrotastrbuf[2]; + char *fgetsret = NULL; + int ret = 0; + char *rptr = NULL; + char *sptr = NULL; + char *devstr_edited = NULL; + char mountpath[260]; + char *part_dev = NULL; + int c = 0; + struct stat statbuf; + int seekpen; + + const char *home = getenv( "HOME" ); + const char *prefix = getenv( "WINEPREFIX" ); + size_t len = (prefix ? strlen(prefix) : strlen(home) + strlen("/.wine")) + sizeof("/dosdevices/com256"); + char *path = HeapAlloc( GetProcessHeap(), 0, len ); + + if (path) + { + if (prefix) strcpy( path, prefix ); + else + { + strcpy( path, home ); + strcat( path, "/.wine" ); + } + strcat( path, "/dosdevices/" ); + } + + if (!unix_mount) { + return -1; + } + + snprintf (mountpath, 260, "%s%s", path, unix_mount); + ret = stat (mountpath, &statbuf); + if (ret == -1) { + return -1; + } + HeapFree( GetProcessHeap(), 0, path ); + sprintf (evpath, "/sys/dev/block/%d:%d/uevent", major(statbuf.st_dev), minor(statbuf.st_dev)); + fp = fopen(evpath, "r"); + if (!fp) { + return -1; + } + while ((rptr = fgets (ueventbufstr, 260, fp))) { + sptr = strstr (rptr, "DEVNAME="); + if (sptr) { + sptr += strlen ("DEVNAME="); + break; + } + } + fclose (fp); + devstr_edited = sptr; + if (!devstr_edited) { + return -1; + } + /* Find first character after forwardslash '/' */ + part_dev = strrchr (devstr_edited, '/'); + if (!part_dev || (part_dev == devstr_edited)) part_dev = devstr_edited; + else part_dev++; + /* Trim off trailing digits and whitespace */ + c = strlen (devstr_edited); + c--; + while ((devstr_edited[c] >= '0' && devstr_edited[c] <= '9') + || (devstr_edited[c] == '\n' || devstr_edited[c] == '\r')) + devstr_edited[c--] = '\0'; + + ret = snprintf (isrotapathstr, 260, "/sys/block/%s/queue/rotational", part_dev); + if (ret < 1 || ret == 260) { + return -1; + } + + fp = fopen(isrotapathstr, "r"); + if (!fp) { + return -1; + } + + fgetsret = fgets(isrotastrbuf, 2, fp); + if (!fgetsret) { + return -1; + } + + fclose (fp); + + if (isrotastrbuf[0] == '1') { + seekpen = 1; + } else if (isrotastrbuf[0] == '0') { + seekpen = 0; + } else { + return -1; + } + + return seekpen; +#else + return -1; +#endif +} diff --git a/include/ntddstor.h b/include/ntddstor.h index b8c4bb73b0d..836def413fe 100644 --- a/include/ntddstor.h +++ b/include/ntddstor.h @@ -214,7 +214,8 @@ typedef enum _STORAGE_QUERY_TYPE { typedef enum _STORAGE_PROPERTY_ID { StorageDeviceProperty = 0, - StorageAdapterProperty + StorageAdapterProperty = 1, + StorageDeviceSeekPenaltyProperty = 7, } STORAGE_PROPERTY_ID, *PSTORAGE_PROPERTY_ID; typedef struct _STORAGE_PROPERTY_QUERY { @@ -272,6 +273,12 @@ typedef struct _STORAGE_ADAPTER_DESCRIPTOR { USHORT BusMinorVersion; } STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR; +typedef struct _DEVICE_SEEK_PENALTY_DESCRIPTOR { + ULONG Version; + ULONG Size; + BOOLEAN IncursSeekPenalty; +} DEVICE_SEEK_PENALTY_DESCRIPTOR, *PDEVICE_SEEK_PENALTY_DESCRIPTOR; + #ifdef __cplusplus } #endif -- 2.19.1

2 3