Rebase against c698682b3286d72cc7c4c4624b4d14b03dbe6908.

This commit is contained in:
Zebediah Figura
2018-08-18 11:37:45 -05:00
parent 93e4c328d7
commit c58c70e961
12 changed files with 223 additions and 2244 deletions

View File

@ -1,4 +1,4 @@
From aa4d3f847be7541b846438956ca988d3456054b2 Mon Sep 17 00:00:00 2001
From 29ecd040a4524a81da6127c59dbb601c88dde1da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 15 Jan 2016 13:17:31 +0100
Subject: ntdll: Add stub for ApiSetQueryApiSetPresence.
@ -17,12 +17,12 @@ index 6d63b5b..1d99dd7 100644
-@ stub ApiSetQueryApiSetPresence
+@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index 88e8b33..85b0e32 100644
index 2431662..c84b004 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -484,3 +484,14 @@ void WINAPI DbgUiRemoteBreakin( void *arg )
{
FIXME("stub\n");
@@ -504,3 +504,14 @@ NTSTATUS WINAPI NtCreateLowBoxToken(HANDLE *token_handle, HANDLE existing_token_
*token_handle = NULL;
return STATUS_SUCCESS;
}
+
+/*********************************************************************
@ -36,7 +36,7 @@ index 88e8b33..85b0e32 100644
+ return TRUE;
+}
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index c260b0d..01836a3 100644
index 003e4f9..5e7c463 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -3,6 +3,7 @@