Rebase against 4931e6f92bc7e0c229a057ebf2e000f8f5aa1edd.

This commit is contained in:
Sebastian Lackner
2016-09-15 06:22:42 +02:00
parent 79af70fad1
commit 75760561c3
4 changed files with 46 additions and 96 deletions

View File

@@ -1,18 +1,26 @@
From 455be0d2473a895b51e83d4d8c882724fef6b118 Mon Sep 17 00:00:00 2001
From cf007e14398fed6d26eea0f5f78bebb22c9fc55c 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.
---
dlls/ntdll/misc.c | 11 +++++++++++
dlls/ntdll/ntdll.spec | 1 +
2 files changed, 12 insertions(+)
.../api-ms-win-core-apiquery-l1-1-0.spec | 2 +-
dlls/ntdll/misc.c | 11 +++++++++++
dlls/ntdll/ntdll.spec | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
index 6d63b5b..1d99dd7 100644
--- a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
+++ b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
@@ -1 +1 @@
-@ stub ApiSetQueryApiSetPresence
+@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index 4517aec..5ad121d 100644
index de14e80..2f4cfa0 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -444,3 +444,14 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress,
@@ -435,3 +435,14 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress,
debugstr_a(MofResourceName), RegistrationHandle);
return ERROR_SUCCESS;
}
@@ -28,7 +36,7 @@ index 4517aec..5ad121d 100644
+ return TRUE;
+}
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 0c23514..7cb46d3 100644
index d9937b3..11ca926 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -3,6 +3,7 @@
@@ -40,5 +48,5 @@ index 0c23514..7cb46d3 100644
@ stub CsrAllocateCapturePointer
@ stub CsrAllocateMessagePointer
--
2.6.4
2.9.0