You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against a6e1adb8b701c390b248f8c4d74bef1ed5557599.
[shlwapi-IStream_fnRead] Removed patch to fix IStream::Read() return value for partial reads (accepted upstream). [wined3d-Fix_Typos] Removed patch to fix a typo in a wined3d TRACE message (accepted upstream). [ws2_32-getaddrinfo] Removed patch to ignore invalid protocol IPPROTO_IPV6 in getaddrinfo (accepted upstream).
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 29ed0b32254cac13e07daea09b4288ce774688cc Mon Sep 17 00:00:00 2001
|
||||
From a5276ddb1a933f10f4f9334a791404276d64cd43 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 28 Oct 2015 22:36:01 +0100
|
||||
Subject: hal: Implement KeQueryPerformanceCounter.
|
||||
@@ -9,12 +9,12 @@ Subject: hal: Implement KeQueryPerformanceCounter.
|
||||
2 files changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c
|
||||
index bca688e..84942ca 100644
|
||||
index 0b2e422..be3a48b 100644
|
||||
--- a/dlls/hal/hal.c
|
||||
+++ b/dlls/hal/hal.c
|
||||
@@ -161,3 +161,13 @@ ULONG WINAPI READ_PORT_ULONG(ULONG *port)
|
||||
FIXME("(%p) stub!\n", port);
|
||||
return 0;
|
||||
@@ -172,3 +172,13 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value)
|
||||
{
|
||||
FIXME("(%p %d) stub!\n", port, value);
|
||||
}
|
||||
+
|
||||
+ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency)
|
||||
@@ -27,7 +27,7 @@ index bca688e..84942ca 100644
|
||||
+ return counter.QuadPart;
|
||||
+}
|
||||
diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec
|
||||
index 02f778c..821084d 100644
|
||||
index c21806c..243c67b 100644
|
||||
--- a/dlls/hal/hal.spec
|
||||
+++ b/dlls/hal/hal.spec
|
||||
@@ -72,7 +72,7 @@
|
||||
@@ -40,5 +40,5 @@ index 02f778c..821084d 100644
|
||||
@ stub KeRaiseIrqlToDpcLevel
|
||||
@ stub KeRaiseIrqlToSynchLevel
|
||||
--
|
||||
2.6.4
|
||||
2.8.0
|
||||
|
||||
|
Reference in New Issue
Block a user