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 9d7d68747b06a03893df99c4beea36b762508603
This commit is contained in:
@@ -1,19 +1,19 @@
|
||||
From 9685685419231b0a3f8a2e454e4c963564629332 Mon Sep 17 00:00:00 2001
|
||||
From 8bf339727f8c444f72a9b0c26d08a80f227e6b9a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 19 Feb 2017 05:38:40 +0100
|
||||
Subject: kernel32: Make K32GetPerformanceInfo faster.
|
||||
Subject: [PATCH] kernel32: Make K32GetPerformanceInfo faster.
|
||||
|
||||
---
|
||||
dlls/kernel32/cpu.c | 68 ++++++++++++++++++++---------------------------------
|
||||
server/process.c | 18 ++++++++++++++
|
||||
server/protocol.def | 9 +++++++
|
||||
3 files changed, 52 insertions(+), 43 deletions(-)
|
||||
dlls/kernel32/cpu.c | 68 +++++++++++++++++----------------------------
|
||||
server/process.c | 18 ++++++++++++
|
||||
server/protocol.def | 8 ++++++
|
||||
3 files changed, 51 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
|
||||
index 5fb806746a0..01cb469b8db 100644
|
||||
index 9445d0bc056..6e198badb66 100644
|
||||
--- a/dlls/kernel32/cpu.c
|
||||
+++ b/dlls/kernel32/cpu.c
|
||||
@@ -216,14 +216,8 @@ BOOL WINAPI IsProcessorFeaturePresent (
|
||||
@@ -209,14 +209,8 @@ BOOL WINAPI IsProcessorFeaturePresent ( DWORD feature )
|
||||
*/
|
||||
BOOL WINAPI K32GetPerformanceInfo(PPERFORMANCE_INFORMATION info, DWORD size)
|
||||
{
|
||||
@@ -30,7 +30,7 @@ index 5fb806746a0..01cb469b8db 100644
|
||||
NTSTATUS status;
|
||||
|
||||
TRACE( "(%p, %d)\n", info, size );
|
||||
@@ -237,53 +231,41 @@ BOOL WINAPI K32GetPerformanceInfo(PPERFORMANCE_INFORMATION info, DWORD size)
|
||||
@@ -230,53 +224,41 @@ BOOL WINAPI K32GetPerformanceInfo(PPERFORMANCE_INFORMATION info, DWORD size)
|
||||
memset( info, 0, sizeof(*info) );
|
||||
info->cb = sizeof(*info);
|
||||
|
||||
@@ -108,12 +108,12 @@ index 5fb806746a0..01cb469b8db 100644
|
||||
{
|
||||
SetLastError( RtlNtStatusToDosError( status ) );
|
||||
diff --git a/server/process.c b/server/process.c
|
||||
index eaf61eaea99..a59be6cfad7 100644
|
||||
index 6690b9d2f26..f0b44a8c6f4 100644
|
||||
--- a/server/process.c
|
||||
+++ b/server/process.c
|
||||
@@ -1754,3 +1754,21 @@ DECL_HANDLER(set_job_completion_port)
|
||||
|
||||
release_object( job );
|
||||
@@ -1852,3 +1852,21 @@ DECL_HANDLER(resume_process)
|
||||
release_object( process );
|
||||
}
|
||||
}
|
||||
+
|
||||
+/* Retrieve process, thread and handle count */
|
||||
@@ -134,14 +134,13 @@ index eaf61eaea99..a59be6cfad7 100644
|
||||
+ }
|
||||
+}
|
||||
diff --git a/server/protocol.def b/server/protocol.def
|
||||
index c26b24edc5f..85137ab3b52 100644
|
||||
index dc5186c877b..3ed38245d4a 100644
|
||||
--- a/server/protocol.def
|
||||
+++ b/server/protocol.def
|
||||
@@ -3866,3 +3866,12 @@ struct handle_info
|
||||
obj_handle_t handle; /* handle to the job */
|
||||
int status; /* process exit code */
|
||||
@END
|
||||
+
|
||||
@@ -4042,3 +4042,11 @@ enum esync_type
|
||||
ESYNC_MANUAL_SERVER,
|
||||
ESYNC_QUEUE,
|
||||
};
|
||||
+
|
||||
+/* Return system information values */
|
||||
+@REQ(get_system_info)
|
||||
@@ -151,5 +150,5 @@ index c26b24edc5f..85137ab3b52 100644
|
||||
+ unsigned int handles; /* number of handles */
|
||||
+@END
|
||||
--
|
||||
2.11.0
|
||||
2.20.1
|
||||
|
||||
|
Reference in New Issue
Block a user