mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Removed patch to implement stubs for [Get|Set]SystemFileCacheSize (accepted upstream).
This commit is contained in:
parent
9fb8420891
commit
5ce94e4f43
@ -100,7 +100,7 @@ Included bugfixes and improvements
|
||||
* Support for TOOLTIPS_GetTipText edge cases ([Wine Bug #30648](http://bugs.winehq.org/show_bug.cgi?id=30648))
|
||||
* Support for TransmitFile ([Wine Bug #5048](http://bugs.winehq.org/show_bug.cgi?id=5048))
|
||||
* Support for WTSEnumerateProcessesW ([Wine Bug #29903](http://bugs.winehq.org/show_bug.cgi?id=29903))
|
||||
* Support for [Get|Set]SystemFileCacheSize ([Wine Bug #35886](http://bugs.winehq.org/show_bug.cgi?id=35886))
|
||||
* ~~Support for [Get|Set]SystemFileCacheSize~~ ([Wine Bug #35886](http://bugs.winehq.org/show_bug.cgi?id=35886))
|
||||
* Support for extra large and jumbo icon lists in shell32 ([Wine Bug #24721](http://bugs.winehq.org/show_bug.cgi?id=24721))
|
||||
* Support for inherited file ACLs ([Wine Bug #34406](http://bugs.winehq.org/show_bug.cgi?id=34406))
|
||||
* Support for interface change notifications ([Wine Bug #32328](http://bugs.winehq.org/show_bug.cgi?id=32328))
|
||||
|
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -4,6 +4,7 @@ wine-compholio (1.7.29) UNRELEASED; urgency=low
|
||||
* Added patch to fix issues when executing pages with guard page / write watch permissions.
|
||||
* Removed patch to fix issues with drag image in ImageLists (accepted upstream).
|
||||
* Removed patch to set ldr.EntryPoint for main executable (accepted upstream).
|
||||
* Removed patch to implement stubs for [Get|Set]SystemFileCacheSize (accepted upstream).
|
||||
* Partially removed patches for WRITECOPY memory protection (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 06 Oct 2014 01:02:37 +0200
|
||||
|
||||
|
@ -36,7 +36,6 @@ PATCHLIST := \
|
||||
kernel32-GetSystemTimes.ok \
|
||||
kernel32-GetVolumePathName.ok \
|
||||
kernel32-Named_Pipe.ok \
|
||||
kernel32-SystemFileCacheSize.ok \
|
||||
libs-Unicode_Collation.ok \
|
||||
ntdll-ATL_Thunk.ok \
|
||||
ntdll-DOS_Attributes.ok \
|
||||
@ -481,24 +480,6 @@ kernel32-Named_Pipe.ok:
|
||||
echo '+ { "kernel32-Named_Pipe", "Dan Kegel", "Fix for ConnectNamedPort return value in overlapped mode." },'; \
|
||||
) > kernel32-Named_Pipe.ok
|
||||
|
||||
# Patchset kernel32-SystemFileCacheSize
|
||||
# |
|
||||
# | Included patches:
|
||||
# | * Add stub for [Get|Set]SystemFileCacheSize. [by Austin English]
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#35886] Support for [Get|Set]SystemFileCacheSize
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec, dlls/kernel32/heap.c, dlls/kernel32/kernel32.spec
|
||||
# |
|
||||
.INTERMEDIATE: kernel32-SystemFileCacheSize.ok
|
||||
kernel32-SystemFileCacheSize.ok:
|
||||
$(call APPLY_FILE,kernel32-SystemFileCacheSize/0001-kernel32-Add-stub-for-Get-Set-SystemFileCacheSize.patch)
|
||||
@( \
|
||||
echo '+ { "kernel32-SystemFileCacheSize", "Austin English", "Add stub for [Get|Set]SystemFileCacheSize." },'; \
|
||||
) > kernel32-SystemFileCacheSize.ok
|
||||
|
||||
# Patchset libs-Unicode_Collation
|
||||
# |
|
||||
# | Included patches:
|
||||
|
@ -1,78 +0,0 @@
|
||||
From e39e6d6e4d4b849c74a60c9fe9344883aa5b9f6e Mon Sep 17 00:00:00 2001
|
||||
From: Austin English <austinenglish@gmail.com>
|
||||
Date: Sun, 27 Jul 2014 10:33:33 -0600
|
||||
Subject: kernel32: Add stub for [Get|Set]SystemFileCacheSize.
|
||||
|
||||
---
|
||||
.../api-ms-win-core-memory-l1-1-1.spec | 4 ++--
|
||||
dlls/kernel32/heap.c | 14 ++++++++++++++
|
||||
dlls/kernel32/kernel32.spec | 2 ++
|
||||
3 files changed, 18 insertions(+), 2 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 891582a..5d3eb13 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
|
||||
@@ -5,7 +5,7 @@
|
||||
@ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile
|
||||
@ stub GetLargePageMinimum
|
||||
@ stub GetProcessWorkingSetSizeEx
|
||||
-@ stub GetSystemFileCacheSize
|
||||
+@ 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
|
||||
@ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx
|
||||
@@ -16,7 +16,7 @@
|
||||
@ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory
|
||||
@ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch
|
||||
@ stub SetProcessWorkingSetSizeEx
|
||||
-@ stub SetSystemFileCacheSize
|
||||
+@ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize
|
||||
@ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile
|
||||
@ stub UnmapViewOfFileEx
|
||||
@ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc
|
||||
diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
|
||||
index db1b401..9037f8e 100644
|
||||
--- a/dlls/kernel32/heap.c
|
||||
+++ b/dlls/kernel32/heap.c
|
||||
@@ -1447,3 +1447,17 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer )
|
||||
lpBuffer->dwAvailPhys, lpBuffer->dwTotalPageFile, lpBuffer->dwAvailPageFile,
|
||||
lpBuffer->dwTotalVirtual, lpBuffer->dwAvailVirtual );
|
||||
}
|
||||
+
|
||||
+BOOL WINAPI GetSystemFileCacheSize(PSIZE_T mincache, PSIZE_T maxcache, PDWORD flags)
|
||||
+{
|
||||
+ FIXME("stub: %p %p %p\n", mincache, maxcache, flags);
|
||||
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+BOOL WINAPI SetSystemFileCacheSize(SIZE_T mincache, SIZE_T maxcache, DWORD flags)
|
||||
+{
|
||||
+ FIXME("stub: %ld %ld %d\n", mincache, maxcache, flags);
|
||||
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
+ return FALSE;
|
||||
+}
|
||||
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
|
||||
index 2de2119..d08f90c 100644
|
||||
--- a/dlls/kernel32/kernel32.spec
|
||||
+++ b/dlls/kernel32/kernel32.spec
|
||||
@@ -637,6 +637,7 @@
|
||||
@ stdcall GetStringTypeExA(long long str long ptr)
|
||||
@ stdcall GetStringTypeExW(long long wstr long ptr)
|
||||
@ stdcall GetStringTypeW(long wstr long ptr)
|
||||
+@ stdcall GetSystemFileCacheSize(ptr ptr ptr)
|
||||
@ stdcall GetSystemDefaultLCID()
|
||||
@ stdcall GetSystemDefaultLangID()
|
||||
@ stdcall GetSystemDefaultLocaleName(ptr long)
|
||||
@@ -1166,6 +1167,7 @@
|
||||
@ stdcall SetProcessShutdownParameters(long long)
|
||||
@ stdcall SetProcessWorkingSetSize(long long long)
|
||||
@ stdcall SetStdHandle(long long)
|
||||
+@ stdcall SetSystemFileCacheSize(long long long)
|
||||
@ stdcall SetSystemPowerState(long long)
|
||||
@ stdcall SetSystemTime(ptr)
|
||||
@ stdcall SetSystemTimeAdjustment(long long)
|
||||
--
|
||||
1.7.9.5
|
||||
|
@ -1,4 +0,0 @@
|
||||
Author: Austin English
|
||||
Subject: Add stub for [Get|Set]SystemFileCacheSize.
|
||||
Revision: 1
|
||||
Fixes: [35886] Support for [Get|Set]SystemFileCacheSize
|
Loading…
x
Reference in New Issue
Block a user