Rebase against e13f59085f8a3787abd4e3f3eabae1a7e607a3c0

This commit is contained in:
Zebediah Figura
2018-04-24 18:57:07 -05:00
parent 6eb6431a82
commit bd3bf6c3b0
4 changed files with 14 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
From 69a28da617c7d5c361eae5ed056cac7984b4177c Mon Sep 17 00:00:00 2001
From aa4d3f847be7541b846438956ca988d3456054b2 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.
@@ -10,19 +10,19 @@ Subject: ntdll: Add stub for ApiSetQueryApiSetPresence.
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 6d63b5bf43..1d99dd7132 100644
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 8f0c51cea9..1a0087ae14 100644
index 88e8b33..85b0e32 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -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;
@@ -484,3 +484,14 @@ void WINAPI DbgUiRemoteBreakin( void *arg )
{
FIXME("stub\n");
}
+
+/*********************************************************************
@@ -36,7 +36,7 @@ index 8f0c51cea9..1a0087ae14 100644
+ return TRUE;
+}
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 9adf1edd4a..adfb2fc7ef 100644
index c260b0d..01836a3 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -3,6 +3,7 @@
@@ -48,5 +48,5 @@ index 9adf1edd4a..adfb2fc7ef 100644
@ stub CsrAllocateCapturePointer
@ stub CsrAllocateMessagePointer
--
2.12.2
2.7.4