From 896b3398f10620b79a93cbb87f3cdc4fe60c6b91 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 31 Oct 2015 17:54:21 +0100 Subject: [PATCH] Added patch for SetConsoleKeyShortcuts stub function. --- README.md | 3 +- debian/changelog | 1 + ...d-SetConsoleKeyShortcuts-stub-resend.patch | 47 +++++++++++++++++++ .../definition | 1 + patches/patchinstall.sh | 19 ++++++++ 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 patches/kernel32-SetConsoleKeyShortcuts/0001-kernel32-add-SetConsoleKeyShortcuts-stub-resend.patch create mode 100644 patches/kernel32-SetConsoleKeyShortcuts/definition diff --git a/README.md b/README.md index ac5d6592..76cf8bab 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/debian/changelog b/debian/changelog index f7766924..b260fa81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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). diff --git a/patches/kernel32-SetConsoleKeyShortcuts/0001-kernel32-add-SetConsoleKeyShortcuts-stub-resend.patch b/patches/kernel32-SetConsoleKeyShortcuts/0001-kernel32-add-SetConsoleKeyShortcuts-stub-resend.patch new file mode 100644 index 00000000..2f4bd5b1 --- /dev/null +++ b/patches/kernel32-SetConsoleKeyShortcuts/0001-kernel32-add-SetConsoleKeyShortcuts-stub-resend.patch @@ -0,0 +1,47 @@ +From 43143be970d430122d341eb08dc2828f9d901978 Mon Sep 17 00:00:00 2001 +From: Austin English +Date: Wed, 28 Oct 2015 10:37:27 -0500 +Subject: kernel32: add SetConsoleKeyShortcuts stub (resend) + +Signed-off-by: Austin English +--- + 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 + diff --git a/patches/kernel32-SetConsoleKeyShortcuts/definition b/patches/kernel32-SetConsoleKeyShortcuts/definition new file mode 100644 index 00000000..feb64145 --- /dev/null +++ b/patches/kernel32-SetConsoleKeyShortcuts/definition @@ -0,0 +1 @@ +Fixes: [35702] Add stub for SetConsoleKeyShortcuts diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 86734600..19eb7c3d 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -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: