From f3f4f80a014bbf443e66332167cfd8cec9fc7b49 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 25 Oct 2018 08:43:57 +1100 Subject: [PATCH] Rebase against 363326678cd2f473b6fcf3d141846fa79007837d --- ...ead-to-update-user_shared_data-time-.patch | 28 +++++++++---------- patches/patchinstall.sh | 2 +- ...ct-type-behavior-for-different-windo.patch | 22 +++++++-------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/patches/ntdll-User_Shared_Data/0003-ntdll-Create-thread-to-update-user_shared_data-time-.patch b/patches/ntdll-User_Shared_Data/0003-ntdll-Create-thread-to-update-user_shared_data-time-.patch index ac545938..c388d455 100644 --- a/patches/ntdll-User_Shared_Data/0003-ntdll-Create-thread-to-update-user_shared_data-time-.patch +++ b/patches/ntdll-User_Shared_Data/0003-ntdll-Create-thread-to-update-user_shared_data-time-.patch @@ -1,4 +1,4 @@ -From 40ccadf41bd61db2af9fb0b25e52384d859bbb82 Mon Sep 17 00:00:00 2001 +From a6f1c5b7034160cb86659f59c929fb227e53dac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 5 May 2017 05:40:50 +0200 Subject: [PATCH] ntdll: Create thread to update user_shared_data time values @@ -6,14 +6,14 @@ Subject: [PATCH] ntdll: Create thread to update user_shared_data time values --- dlls/kernel32/cpu.c | 4 +-- - dlls/ntdll/loader.c | 31 ++++++++++++++++++ - dlls/ntdll/ntdll_misc.h | 3 ++ - dlls/ntdll/thread.c | 70 ++++++++++++++++++++++++++++++++++++----- - dlls/ntdll/virtual.c | 17 ++++++++++ + dlls/ntdll/loader.c | 31 ++++++++++++++++++++++ + dlls/ntdll/ntdll_misc.h | 3 +++ + dlls/ntdll/thread.c | 70 ++++++++++++++++++++++++++++++++++++++++++++----- + dlls/ntdll/virtual.c | 17 ++++++++++++ 5 files changed, 116 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c -index a8f014c6efd..e2780aa52fc 100644 +index a8f014c..e2780aa 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -46,7 +46,7 @@ @@ -35,7 +35,7 @@ index a8f014c6efd..e2780aa52fc 100644 return FALSE; } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 3e95e517469..cceb6b0b4bb 100644 +index 3e95e51..cceb6b0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3436,6 +3436,36 @@ static void load_global_options(void) @@ -84,12 +84,12 @@ index 3e95e517469..cceb6b0b4bb 100644 virtual_set_large_address_space(); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index a723f907567..c71d5e1dd1a 100644 +index 5def773..661ba8b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -189,6 +189,9 @@ extern void VIRTUAL_SetForceExec( BOOL enable ) DECLSPEC_HIDDEN; - extern void virtual_release_address_space(void) DECLSPEC_HIDDEN; - extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; +@@ -191,6 +191,9 @@ extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; + extern void virtual_fill_image_information( const pe_image_info_t *pe_info, + SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; +extern struct _KUSER_SHARED_DATA *user_shared_data_external DECLSPEC_HIDDEN; +extern void create_user_shared_data_thread(void) DECLSPEC_HIDDEN; @@ -98,7 +98,7 @@ index a723f907567..c71d5e1dd1a 100644 /* completion */ extern NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue, diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index 9fd44222d42..d8b4032195b 100644 +index c034d70..d6523f7 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -44,6 +44,7 @@ @@ -207,7 +207,7 @@ index 9fd44222d42..d8b4032195b 100644 /* allocate and initialize the PEB */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index 384ea82c1cf..7dad0c89ab1 100644 +index b200d0d..fd6e3cb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2013,6 +2013,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) @@ -243,5 +243,5 @@ index 384ea82c1cf..7dad0c89ab1 100644 } -- -2.19.1 +1.9.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 0098679c..032fcb06 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "82dbf75dc064bb03b5dfc5d8a82b9782a7272ce2" + echo "363326678cd2f473b6fcf3d141846fa79007837d" } # Show version information diff --git a/patches/server-Object_Types/0010-ntdll-Mimic-object-type-behavior-for-different-windo.patch b/patches/server-Object_Types/0010-ntdll-Mimic-object-type-behavior-for-different-windo.patch index 5602d019..707decd0 100644 --- a/patches/server-Object_Types/0010-ntdll-Mimic-object-type-behavior-for-different-windo.patch +++ b/patches/server-Object_Types/0010-ntdll-Mimic-object-type-behavior-for-different-windo.patch @@ -1,4 +1,4 @@ -From f3f0a7694d6b6d130f569cad2f7ffc0681d9c425 Mon Sep 17 00:00:00 2001 +From 1fe3ee5e7cc9efd49203f9b9b67354823f4fe66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Wed, 8 Mar 2017 19:39:29 +0100 Subject: [PATCH] ntdll: Mimic object type behavior for different windows @@ -11,7 +11,7 @@ Subject: [PATCH] ntdll: Mimic object type behavior for different windows 3 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c -index b382a48..f059c9f 100644 +index 14c2435..b9a2b93 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -127,6 +127,19 @@ struct smbios_chassis { @@ -34,7 +34,7 @@ index b382a48..f059c9f 100644 /* * Token */ -@@ -2645,7 +2658,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( +@@ -2658,7 +2671,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( shi->Handle[i].OwnerPid = info[i].owner; shi->Handle[i].HandleValue = info[i].handle; shi->Handle[i].AccessMask = info[i].access; @@ -43,7 +43,7 @@ index b382a48..f059c9f 100644 /* FIXME: Fill out HandleFlags, ObjectPointer */ } } -@@ -2697,7 +2710,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( +@@ -2710,7 +2723,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( shi->Handle[i].UniqueProcessId = info[i].owner; shi->Handle[i].HandleValue = info[i].handle; shi->Handle[i].GrantedAccess = info[i].access; @@ -69,18 +69,18 @@ index 629f785..060b502 100644 } } diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c -index efe7d3b..be137b8 100644 +index d22ef05..6c039ba 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c -@@ -69,6 +69,7 @@ static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, c - static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); +@@ -70,6 +70,7 @@ static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, c static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI *pNtOpenIoCompletion)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); + static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, void *, ULONG, FILE_INFORMATION_CLASS); +static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 -@@ -1542,13 +1543,31 @@ static void test_query_object(void) +@@ -1620,13 +1621,31 @@ static void test_query_object(void) pRtlFreeUnicodeString( &session ); } @@ -113,7 +113,7 @@ index efe7d3b..be137b8 100644 buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(OBJECT_TYPES_INFORMATION) ); ok( buffer != NULL, "Failed to allocate memory\n" ); -@@ -1576,11 +1595,54 @@ static void test_query_object_types(void) +@@ -1654,11 +1673,54 @@ static void test_query_object_types(void) ok( type->TypeName.Length == sizeof(typeW) && !strncmpW(typeW, type->TypeName.Buffer, 4), "Expected 'Type' as first type, got %s\n", wine_dbgstr_us(&type->TypeName) ); } @@ -168,10 +168,10 @@ index efe7d3b..be137b8 100644 } static void test_type_mismatch(void) -@@ -2087,6 +2149,7 @@ START_TEST(om) - pNtReleaseKeyedEvent = (void *)GetProcAddress(hntdll, "NtReleaseKeyedEvent"); +@@ -2173,6 +2235,7 @@ START_TEST(om) pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); pNtOpenIoCompletion = (void *)GetProcAddress(hntdll, "NtOpenIoCompletion"); + pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); + pNtQuerySystemInformation = (void *)GetProcAddress(hntdll, "NtQuerySystemInformation"); test_case_sensitive();