mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against c715127536a78166e58b165c390a57b704899d29.
This commit is contained in:
Sebastian Lackner
parent
1d24dc8141
commit
637b89cefa
@ -61,8 +61,8 @@ for more details.*
|
||||
* Add stub for D3DXFrameFind ([Wine Bug #38334](https://bugs.winehq.org/show_bug.cgi?id=38334))
|
||||
* Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
|
||||
* Add stub for SetCoalescableTimer ([Wine Bug #39509](https://bugs.winehq.org/show_bug.cgi?id=39509))
|
||||
* Add stub for SetConsoleKeyShortcuts ([Wine Bug #35702](https://bugs.winehq.org/show_bug.cgi?id=35702))
|
||||
* Add stub for SfcGetNextProtectedFile ([Wine Bug #38097](https://bugs.winehq.org/show_bug.cgi?id=38097))
|
||||
* ~~Add stub for SetConsoleKeyShortcuts~~ ([Wine Bug #35702](https://bugs.winehq.org/show_bug.cgi?id=35702))
|
||||
* ~~Add stub for SfcGetNextProtectedFile~~ ([Wine Bug #38097](https://bugs.winehq.org/show_bug.cgi?id=38097))
|
||||
* Add stub for ntoskrnl.ExAcquireResourceExclusiveLite
|
||||
* Add stub for ntoskrnl.ExDeleteResourceLite
|
||||
* Add stub for ntoskrnl.ExReleaseResourceForThread
|
||||
|
||||
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -8,6 +8,8 @@ wine-staging (1.7.55) UNRELEASED; urgency=low
|
||||
* Removed patch to implement kernel32.GetConsoleFontSize (accepted upstream).
|
||||
* Removed patch to zero out returned stats when IEnumSTATSTG::Next reaches end
|
||||
of enumeration (accepted upstream).
|
||||
* Removed patch for SfcGetNextProtectedFile stub function (accepted upstream).
|
||||
* Removed patch for SetConsoleKeyShortcuts stub function (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 01 Nov 2015 01:06:20 +0100
|
||||
|
||||
wine-staging (1.7.54) unstable; urgency=low
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
From 8249417355479b858302aa7f8b319c248a65a0b1 Mon Sep 17 00:00:00 2001
|
||||
From: Austin English <austinenglish@gmail.com>
|
||||
Date: Wed, 28 Oct 2015 10:37:27 -0500
|
||||
Subject: kernel32: add SetConsoleKeyShortcuts stub (resend)
|
||||
|
||||
Signed-off-by: Austin English <austinenglish@gmail.com>
|
||||
---
|
||||
dlls/kernel32/console.c | 9 +++++++++
|
||||
dlls/kernel32/kernel32.spec | 2 +-
|
||||
2 files changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
|
||||
index b1f8814..1e07d02 100644
|
||||
--- a/dlls/kernel32/console.c
|
||||
+++ b/dlls/kernel32/console.c
|
||||
@@ -3239,6 +3239,15 @@ DWORD WINAPI GetNumberOfConsoleFonts(void)
|
||||
return 1;
|
||||
}
|
||||
|
||||
+
|
||||
+BOOL WINAPI SetConsoleKeyShortcuts(BOOL set, BYTE keys, void *unknown1, DWORD unknown2)
|
||||
+{
|
||||
+ FIXME(": (%u %u %p %u) stub!\n", set, keys, unknown1, unknown2);
|
||||
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+
|
||||
BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FONT_INFO fontinfo)
|
||||
{
|
||||
BOOL ret;
|
||||
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
|
||||
index 9b2a131..8d7d699 100644
|
||||
--- a/dlls/kernel32/kernel32.spec
|
||||
+++ b/dlls/kernel32/kernel32.spec
|
||||
@@ -1350,7 +1350,7 @@
|
||||
@ stdcall SetConsoleIcon(ptr)
|
||||
@ stdcall SetConsoleInputExeNameA(ptr)
|
||||
@ stdcall SetConsoleInputExeNameW(ptr)
|
||||
-@ stub SetConsoleKeyShortcuts
|
||||
+@ stdcall SetConsoleKeyShortcuts(long long ptr long)
|
||||
@ stub SetConsoleLocalEUDC
|
||||
@ stub SetConsoleMaximumWindowSize
|
||||
@ stub SetConsoleMenuClose
|
||||
--
|
||||
2.6.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [35702] Add stub for SetConsoleKeyShortcuts
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "8f443077416fd820375b1bc0d1276286d23348fc"
|
||||
echo "c715127536a78166e58b165c390a57b704899d29"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -159,7 +159,6 @@ patch_enable_all ()
|
||||
enable_kernel32_Named_Pipe="$1"
|
||||
enable_kernel32_NeedCurrentDirectoryForExePath="$1"
|
||||
enable_kernel32_Profile="$1"
|
||||
enable_kernel32_SetConsoleKeyShortcuts="$1"
|
||||
enable_kernel32_SetFileCompletionNotificationModes="$1"
|
||||
enable_kernel32_SetFileInformationByHandle="$1"
|
||||
enable_kernel32_TimezoneInformation_Registry="$1"
|
||||
@ -577,9 +576,6 @@ patch_enable ()
|
||||
kernel32-Profile)
|
||||
enable_kernel32_Profile="$2"
|
||||
;;
|
||||
kernel32-SetConsoleKeyShortcuts)
|
||||
enable_kernel32_SetConsoleKeyShortcuts="$2"
|
||||
;;
|
||||
kernel32-SetFileCompletionNotificationModes)
|
||||
enable_kernel32_SetFileCompletionNotificationModes="$2"
|
||||
;;
|
||||
@ -3542,21 +3538,6 @@ if test "$enable_kernel32_Profile" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetConsoleKeyShortcuts
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#35702] Add stub for SetConsoleKeyShortcuts
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/kernel32/console.c, dlls/kernel32/kernel32.spec
|
||||
# |
|
||||
if test "$enable_kernel32_SetConsoleKeyShortcuts" -eq 1; then
|
||||
patch_apply kernel32-SetConsoleKeyShortcuts/0001-kernel32-add-SetConsoleKeyShortcuts-stub-resend.patch
|
||||
(
|
||||
echo '+ { "Austin English", "kernel32: add SetConsoleKeyShortcuts stub.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileCompletionNotificationModes
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -5015,16 +4996,13 @@ fi
|
||||
|
||||
# Patchset sfc-SfcGetNextProtectedFile
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38097] Add stub for SfcGetNextProtectedFile
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/sfc/sfc.spec, dlls/sfc_os/sfc_os.c, dlls/sfc_os/sfc_os.spec
|
||||
# | * dlls/sfc_os/sfc_os.c
|
||||
# |
|
||||
if test "$enable_sfc_SfcGetNextProtectedFile" -eq 1; then
|
||||
patch_apply sfc-SfcGetNextProtectedFile/0001-sfc_os-Implement-SfcGetNextProtectedFile.patch
|
||||
patch_apply sfc-SfcGetNextProtectedFile/0001-sfc_os-Set-an-error-code-in-SfcGetNextProtectedFile-.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "sfc_os: Implement SfcGetNextProtectedFile.", 1 },';
|
||||
echo '+ { "Michael Müller", "sfc_os: Set an error code in SfcGetNextProtectedFile stub.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
From b8ea046850c5c8e6b0a40d1414ca2ec7623266b7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 31 Oct 2015 16:41:46 +0100
|
||||
Subject: sfc_os: Implement SfcGetNextProtectedFile.
|
||||
|
||||
---
|
||||
dlls/sfc/sfc.spec | 2 +-
|
||||
dlls/sfc_os/sfc_os.c | 11 +++++++++++
|
||||
dlls/sfc_os/sfc_os.spec | 2 +-
|
||||
3 files changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec
|
||||
index 04307d2..bdd66db 100644
|
||||
--- a/dlls/sfc/sfc.spec
|
||||
+++ b/dlls/sfc/sfc.spec
|
||||
@@ -7,7 +7,7 @@
|
||||
7 stub @
|
||||
8 stub @
|
||||
9 stub @
|
||||
-@ stub SfcGetNextProtectedFile
|
||||
+@ stdcall SfcGetNextProtectedFile(long ptr) sfc_os.SfcGetNextProtectedFile
|
||||
@ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected
|
||||
@ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected
|
||||
@ stub SfcWLEventLogoff
|
||||
diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c
|
||||
index 5805342..fab4094 100644
|
||||
--- a/dlls/sfc_os/sfc_os.c
|
||||
+++ b/dlls/sfc_os/sfc_os.c
|
||||
@@ -123,3 +123,14 @@ BOOL WINAPI SfcIsKeyProtected(HKEY hKey, LPCWSTR lpSubKey, REGSAM samDesired)
|
||||
SetLastError(ERROR_FILE_NOT_FOUND);
|
||||
return FALSE;
|
||||
}
|
||||
+
|
||||
+/******************************************************************
|
||||
+ * SfcGetNextProtectedFile [sfc_os.@]
|
||||
+ */
|
||||
+BOOL WINAPI SfcGetNextProtectedFile(HANDLE rpc, PROTECTED_FILE_DATA *data)
|
||||
+{
|
||||
+ FIXME("(%p, %p) stub\n", rpc, data);
|
||||
+
|
||||
+ SetLastError(ERROR_NO_MORE_FILES);
|
||||
+ return FALSE;
|
||||
+}
|
||||
diff --git a/dlls/sfc_os/sfc_os.spec b/dlls/sfc_os/sfc_os.spec
|
||||
index 1edcb83..6b216e0 100644
|
||||
--- a/dlls/sfc_os/sfc_os.spec
|
||||
+++ b/dlls/sfc_os/sfc_os.spec
|
||||
@@ -1,3 +1,3 @@
|
||||
-@ stub SfcGetNextProtectedFile
|
||||
+@ stdcall SfcGetNextProtectedFile(long ptr)
|
||||
@ stdcall SfcIsFileProtected(ptr wstr)
|
||||
@ stdcall SfcIsKeyProtected(long wstr long)
|
||||
--
|
||||
2.6.1
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From 91bd7aea87eea74498a3ea39fbc095cbdbbd1a6d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Tue, 3 Nov 2015 17:36:54 +0100
|
||||
Subject: sfc_os: Set an error code in SfcGetNextProtectedFile stub.
|
||||
|
||||
---
|
||||
dlls/sfc_os/sfc_os.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c
|
||||
index 9df38f8..f76b3a2 100644
|
||||
--- a/dlls/sfc_os/sfc_os.c
|
||||
+++ b/dlls/sfc_os/sfc_os.c
|
||||
@@ -54,6 +54,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||
BOOL WINAPI SfcGetNextProtectedFile(HANDLE handle, PROTECTED_FILE_DATA *data)
|
||||
{
|
||||
FIXME("%p %p\n", handle, data);
|
||||
+
|
||||
+ SetLastError(ERROR_NO_MORE_FILES);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [38097] Add stub for SfcGetNextProtectedFile
|
||||
Loading…
Reference in New Issue
Block a user