mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against c16ef729db50209a626b743f5847a24dff5688a4.
This commit is contained in:
Sebastian Lackner
parent
ce01adb3ed
commit
7a557fe8fd
@ -1,110 +0,0 @@
|
||||
From 620c5dbb2b9ca7f1f382f5c8e8d16409f2fb7339 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 30 Jul 2017 21:13:57 +0200
|
||||
Subject: kernel32: Add stub for GetProcessWorkingSetSizeEx.
|
||||
|
||||
---
|
||||
.../api-ms-win-core-memory-l1-1-1.spec | 2 +-
|
||||
.../api-ms-win-core-memory-l1-1-2.spec | 2 +-
|
||||
dlls/kernel32/kernel32.spec | 2 +-
|
||||
dlls/kernel32/process.c | 20 ++++++++++++++++----
|
||||
dlls/kernelbase/kernelbase.spec | 2 +-
|
||||
5 files changed, 20 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec
|
||||
index 959e65d2ee1..42630c10489 100644
|
||||
--- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec
|
||||
+++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec
|
||||
@@ -4,7 +4,7 @@
|
||||
@ stdcall CreateMemoryResourceNotification(long) kernel32.CreateMemoryResourceNotification
|
||||
@ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile
|
||||
@ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum
|
||||
-@ stub GetProcessWorkingSetSizeEx
|
||||
+@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx
|
||||
@ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize
|
||||
@ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch
|
||||
@ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile
|
||||
diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec
|
||||
index 866d20e7fca..6100213eb7b 100644
|
||||
--- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec
|
||||
+++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec
|
||||
@@ -8,7 +8,7 @@
|
||||
@ stdcall FreeUserPhysicalPages(long ptr ptr) kernel32.FreeUserPhysicalPages
|
||||
@ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum
|
||||
@ stub GetMemoryErrorHandlingCapabilities
|
||||
-@ stub GetProcessWorkingSetSizeEx
|
||||
+@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx
|
||||
@ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize
|
||||
@ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch
|
||||
@ stub MapUserPhysicalPages
|
||||
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
|
||||
index 8d3751ffa65..608a89da3bd 100644
|
||||
--- a/dlls/kernel32/kernel32.spec
|
||||
+++ b/dlls/kernel32/kernel32.spec
|
||||
@@ -793,7 +793,7 @@
|
||||
# @ stub GetProcessUserModeExceptionPolicy
|
||||
@ stdcall GetProcessVersion(long)
|
||||
@ stdcall GetProcessWorkingSetSize(long ptr ptr)
|
||||
-# @ stub GetProcessWorkingSetSizeEx
|
||||
+@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr)
|
||||
@ stdcall GetProductInfo(long long long long ptr)
|
||||
@ stub GetProductName
|
||||
@ stdcall GetProfileIntA(str str long)
|
||||
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
|
||||
index 99849166bcd..00b93348855 100644
|
||||
--- a/dlls/kernel32/process.c
|
||||
+++ b/dlls/kernel32/process.c
|
||||
@@ -3553,21 +3553,33 @@ BOOL WINAPI K32EmptyWorkingSet(HANDLE hProcess)
|
||||
return SetProcessWorkingSetSize(hProcess, (SIZE_T)-1, (SIZE_T)-1);
|
||||
}
|
||||
|
||||
+
|
||||
/***********************************************************************
|
||||
- * GetProcessWorkingSetSize (KERNEL32.@)
|
||||
+ * GetProcessWorkingSetSizeEx (KERNEL32.@)
|
||||
*/
|
||||
-BOOL WINAPI GetProcessWorkingSetSize(HANDLE hProcess, PSIZE_T minset,
|
||||
- PSIZE_T maxset)
|
||||
+BOOL WINAPI GetProcessWorkingSetSizeEx(HANDLE process, SIZE_T *minset,
|
||||
+ SIZE_T *maxset, DWORD *flags)
|
||||
{
|
||||
- FIXME("(%p,%p,%p): stub\n",hProcess,minset,maxset);
|
||||
+ FIXME("(%p,%p,%p,%p): stub\n", process, minset, maxset, flags);
|
||||
/* 32 MB working set size */
|
||||
if (minset) *minset = 32*1024*1024;
|
||||
if (maxset) *maxset = 32*1024*1024;
|
||||
+ if (flags) *flags = QUOTA_LIMITS_HARDWS_MIN_DISABLE |
|
||||
+ QUOTA_LIMITS_HARDWS_MAX_DISABLE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
+ * GetProcessWorkingSetSize (KERNEL32.@)
|
||||
+ */
|
||||
+BOOL WINAPI GetProcessWorkingSetSize(HANDLE process, SIZE_T *minset, SIZE_T *maxset)
|
||||
+{
|
||||
+ return GetProcessWorkingSetSizeEx(process, minset, maxset, NULL);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/***********************************************************************
|
||||
* SetProcessShutdownParameters (KERNEL32.@)
|
||||
*/
|
||||
BOOL WINAPI SetProcessShutdownParameters(DWORD level, DWORD flags)
|
||||
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
|
||||
index 010cd02cc28..e1c485eac38 100644
|
||||
--- a/dlls/kernelbase/kernelbase.spec
|
||||
+++ b/dlls/kernelbase/kernelbase.spec
|
||||
@@ -637,7 +637,7 @@
|
||||
@ stdcall GetProcessShutdownParameters(ptr ptr) kernel32.GetProcessShutdownParameters
|
||||
@ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes
|
||||
@ stdcall GetProcessVersion(long) kernel32.GetProcessVersion
|
||||
-# @ stub GetProcessWorkingSetSizeEx
|
||||
+@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx
|
||||
# @ stub GetProcessorSystemCycleTime
|
||||
@ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo
|
||||
@ stub GetPtrCalData
|
||||
--
|
||||
2.13.1
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "6144addcf0fc26f187aa05e6bac6c4a0c3542199"
|
||||
echo "c16ef729db50209a626b743f5847a24dff5688a4"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -192,7 +192,6 @@ patch_enable_all ()
|
||||
enable_kernel32_Cwd_Startup_Info="$1"
|
||||
enable_kernel32_Debugger="$1"
|
||||
enable_kernel32_FindFirstFile="$1"
|
||||
enable_kernel32_GetProcessWorkingSetSizeEx="$1"
|
||||
enable_kernel32_GetShortPathName="$1"
|
||||
enable_kernel32_K32GetPerformanceInfo="$1"
|
||||
enable_kernel32_LocaleNameToLCID="$1"
|
||||
@ -852,9 +851,6 @@ patch_enable ()
|
||||
kernel32-FindFirstFile)
|
||||
enable_kernel32_FindFirstFile="$2"
|
||||
;;
|
||||
kernel32-GetProcessWorkingSetSizeEx)
|
||||
enable_kernel32_GetProcessWorkingSetSizeEx="$2"
|
||||
;;
|
||||
kernel32-GetShortPathName)
|
||||
enable_kernel32_GetShortPathName="$2"
|
||||
;;
|
||||
@ -5236,19 +5232,6 @@ if test "$enable_kernel32_FindFirstFile" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-GetProcessWorkingSetSizeEx
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec, dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-
|
||||
# | core-memory-l1-1-2.spec, dlls/kernel32/kernel32.spec, dlls/kernel32/process.c, dlls/kernelbase/kernelbase.spec
|
||||
# |
|
||||
if test "$enable_kernel32_GetProcessWorkingSetSizeEx" -eq 1; then
|
||||
patch_apply kernel32-GetProcessWorkingSetSizeEx/0001-kernel32-Add-stub-for-GetProcessWorkingSetSizeEx.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "kernel32: Add stub for GetProcessWorkingSetSizeEx.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-GetShortPathName
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user