Rebase against a83d5d3b83042d2305de0595c0d03e4e7bf1e29e.

This commit is contained in:
Sebastian Lackner 2016-08-20 14:40:39 +02:00
parent fbe5fa909a
commit c4d19a5e32
2 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
From cee15830660362c97d886ab9cc4e9a535b65491a Mon Sep 17 00:00:00 2001
From 2938cce25ce64f4a45feae7fc92a7b3497c2b68d 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:01:15 +0100
Subject: kernelbase: Add dll and add stub for QuirkIsEnabled.
@ -22,7 +22,7 @@ index b9caed0..2beb34b 100644
+C_SRCS = \
+ misc.c
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index 53ed586..8fdb80d 100644
index e35ef8b..70ddb5f 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1,3 +1,6 @@
@ -567,7 +567,7 @@ index 53ed586..8fdb80d 100644
+@ stub GetNextFgPolicyRefreshInfoInternal
+@ stdcall GetNumaHighestNodeNumber(ptr) kernel32.GetNumaHighestNodeNumber
+@ stub GetNumaNodeProcessorMaskEx
@ stub GetNumberFormatEx
@ stdcall GetNumberFormatEx(wstr long wstr ptr ptr long) kernel32.GetNumberFormatEx
@ stdcall GetNumberFormatW(long long wstr ptr ptr long) kernel32.GetNumberFormatW
+@ stdcall GetNumberOfConsoleInputEvents(long ptr) kernel32.GetNumberOfConsoleInputEvents
@ stdcall GetOEMCP() kernel32.GetOEMCP
@ -1770,10 +1770,10 @@ index 6b6ead2..7c2a9d1 100644
422 stdcall -noname SHGlobalCounterCreateNamedA(str long)
423 stdcall -noname SHGlobalCounterCreateNamedW(wstr long)
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 774687e..7c097c4 100755
index d658f30..c1a0f15 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -232,6 +232,7 @@ my @dll_groups =
@@ -195,6 +195,7 @@ my @dll_groups =
[
"kernel32",
"advapi32",
@ -1782,5 +1782,5 @@ index 774687e..7c097c4 100755
"kernelbase",
],
--
2.7.1
2.9.0

View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "60f8b516e2a6233eaee8ae58cd2eccce998dd81f"
echo "a83d5d3b83042d2305de0595c0d03e4e7bf1e29e"
}
# Show version information