Rebase against b6a4b2f593503a105dde01e7bd11ffdde243117a.

This commit is contained in:
Sebastian Lackner
2017-05-09 05:33:36 +02:00
parent a36a97233a
commit c542f2432d
6 changed files with 54 additions and 56 deletions

View File

@ -1,4 +1,4 @@
From 07428b41767dfbbc3de78e32690527a9bc154260 Mon Sep 17 00:00:00 2001
From 69a28da617c7d5c361eae5ed056cac7984b4177c 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 6d63b5bf43..1d99dd7132 100644
-@ stub ApiSetQueryApiSetPresence
+@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index f6d95b7802..c20d0812d8 100644
index 8f0c51cea9..1a0087ae14 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -474,3 +474,14 @@ BOOLEAN WINAPI EtwEventEnabled( REGHANDLE handle, const EVENT_DESCRIPTOR *descri
FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor);
return FALSE;
@@ -476,3 +476,14 @@ ULONG WINAPI EtwEventWrite( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor
FIXME("(%s, %p, %u, %p): stub\n", wine_dbgstr_longlong(handle), descriptor, count, data);
return ERROR_SUCCESS;
}
+
+/*********************************************************************
@ -36,7 +36,7 @@ index f6d95b7802..c20d0812d8 100644
+ return TRUE;
+}
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index f8b139a458..59c9978986 100644
index 9adf1edd4a..adfb2fc7ef 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -3,6 +3,7 @@