mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch for SetConsoleKeyShortcuts stub function.
This commit is contained in:
parent
9ad85e9d6f
commit
896b3398f1
@ -34,9 +34,10 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
-----------------------------------
|
||||
|
||||
**Bug fixes and features included in the next upcoming release [9]:**
|
||||
**Bug fixes and features included in the next upcoming release [10]:**
|
||||
|
||||
* 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))
|
||||
* Do not allow interruption of system APC in server_select ([Wine Bug #14697](https://bugs.winehq.org/show_bug.cgi?id=14697))
|
||||
* Fix multiple issues in widl typelib generation
|
||||
|
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -21,6 +21,7 @@ wine-staging (1.7.54) UNRELEASED; urgency=low
|
||||
* Added patch to zero out returned stats when IEnumSTATSTG::Next reaches end
|
||||
of enumeration.
|
||||
* Added patch to fix multiple issues in widl typelib generation.
|
||||
* Added patch for SetConsoleKeyShortcuts stub function.
|
||||
* Removed patch to implement kernel32.GetPhysicallyInstalledSystemMemory
|
||||
(accepted upstream).
|
||||
* Partially removed patches for ws2_32 TransmitFile (accepted upstream).
|
||||
|
@ -0,0 +1,47 @@
|
||||
From 43143be970d430122d341eb08dc2828f9d901978 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 c32dc49..aa89e65 100644
|
||||
--- a/dlls/kernel32/console.c
|
||||
+++ b/dlls/kernel32/console.c
|
||||
@@ -3234,6 +3234,15 @@ BOOL WINAPI SetConsoleIcon(HICON icon)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+
|
||||
+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 d7eab83..793f616 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
patches/kernel32-SetConsoleKeyShortcuts/definition
Normal file
1
patches/kernel32-SetConsoleKeyShortcuts/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [35702] Add stub for SetConsoleKeyShortcuts
|
@ -159,6 +159,7 @@ 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,6 +578,9 @@ patch_enable ()
|
||||
kernel32-Profile)
|
||||
enable_kernel32_Profile="$2"
|
||||
;;
|
||||
kernel32-SetConsoleKeyShortcuts)
|
||||
enable_kernel32_SetConsoleKeyShortcuts="$2"
|
||||
;;
|
||||
kernel32-SetFileCompletionNotificationModes)
|
||||
enable_kernel32_SetFileCompletionNotificationModes="$2"
|
||||
;;
|
||||
@ -3546,6 +3550,21 @@ 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:
|
||||
|
Loading…
Reference in New Issue
Block a user