mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Added patch to allow NULL pointer as keystate argument in ToUnicodeEx.
This commit is contained in:
Sebastian Lackner
parent
9f091b033c
commit
4ad22c8418
@ -39,11 +39,12 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
-----------------------------------
|
||||
|
||||
**Bug fixes and features included in the next upcoming release [20]:**
|
||||
**Bug fixes and features included in the next upcoming release [21]:**
|
||||
|
||||
* Add stub fltmgr.sys (filter manager driver) ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583))
|
||||
* Add stub for ntoskrnl.PsRemoveLoadImageNotifyRoutine
|
||||
* Add stubs for Power[Set|Clear]Request
|
||||
* Allow NULL pointer as keystate argument in ToUnicodeEx ([Wine Bug #38353](https://bugs.winehq.org/show_bug.cgi?id=38353))
|
||||
* Allow to open files/directories without any access rights in order to query attributes
|
||||
* Avoid spam of FIXME messages for PsLookupProcessByProcessId stub ([Wine Bug #36821](https://bugs.winehq.org/show_bug.cgi?id=36821))
|
||||
* Don't return an error in WS_select when EINTR happens during timeout
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -22,6 +22,7 @@ wine-staging (1.7.40) UNRELEASED; urgency=low
|
||||
* Added patch to allow to open files/directories without any access rights in order to query attributes.
|
||||
* Added patch to implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces and fix some bugs.
|
||||
* Added patch to ignore unsupported job object restrictions.
|
||||
* Added patch to allow NULL pointer as keystate argument in ToUnicodeEx.
|
||||
* Removed patch to fix regression causing black screen on startup (accepted upstream).
|
||||
* Removed patch to fix edge cases in TOOLTIPS_GetTipText (fixed upstream).
|
||||
* Removed patch for IConnectionPoint/INetworkListManagerEvents stub interface (accepted upstream).
|
||||
|
||||
@ -235,6 +235,7 @@ patch_enable_all ()
|
||||
enable_winex11_CandidateWindowPos="$1"
|
||||
enable_winex11_Clipboard_HTML="$1"
|
||||
enable_winex11_Thread_Data="$1"
|
||||
enable_winex11_ToUnicodeEx="$1"
|
||||
enable_winex11_Window_Groups="$1"
|
||||
enable_winex11_Window_Style="$1"
|
||||
enable_winex11_XEMBED="$1"
|
||||
@ -774,6 +775,9 @@ patch_enable ()
|
||||
winex11-Thread_Data)
|
||||
enable_winex11_Thread_Data="$2"
|
||||
;;
|
||||
winex11-ToUnicodeEx)
|
||||
enable_winex11_ToUnicodeEx="$2"
|
||||
;;
|
||||
winex11-Window_Groups)
|
||||
enable_winex11_Window_Groups="$2"
|
||||
;;
|
||||
@ -4710,6 +4714,21 @@ if test "$enable_winex11_Thread_Data" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winex11-ToUnicodeEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38353] Allow NULL pointer as keystate argument in ToUnicodeEx
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/winex11.drv/keyboard.c
|
||||
# |
|
||||
if test "$enable_winex11_ToUnicodeEx" -eq 1; then
|
||||
patch_apply winex11-ToUnicodeEx/0001-winex11-Allow-NULL-pointer-as-keystate-in-X11DRV_ToU.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "winex11: Allow NULL pointer as keystate in X11DRV_ToUnicodeEx.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winex11-Window_Groups
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -0,0 +1,88 @@
|
||||
From e9507c2b46cd5ca8de228abffcbb3d1505a4d331 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 4 Apr 2015 22:29:58 +0200
|
||||
Subject: winex11: Allow NULL pointer as keystate in X11DRV_ToUnicodeEx.
|
||||
|
||||
---
|
||||
dlls/winex11.drv/keyboard.c | 45 ++++++++++++++++++++++++---------------------
|
||||
1 file changed, 24 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
|
||||
index 1323e19..5737f40 100644
|
||||
--- a/dlls/winex11.drv/keyboard.c
|
||||
+++ b/dlls/winex11.drv/keyboard.c
|
||||
@@ -2463,7 +2463,7 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
|
||||
if (!match_x11_keyboard_layout(hkl))
|
||||
FIXME_(key)("keyboard layout %p is not supported\n", hkl);
|
||||
|
||||
- if ((lpKeyState[VK_MENU] & 0x80) && (lpKeyState[VK_CONTROL] & 0x80))
|
||||
+ if (lpKeyState && (lpKeyState[VK_MENU] & 0x80) && (lpKeyState[VK_CONTROL] & 0x80))
|
||||
{
|
||||
TRACE_(key)("Ctrl+Alt+[key] won't generate a character\n");
|
||||
return 0;
|
||||
@@ -2486,25 +2486,28 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
|
||||
|
||||
EnterCriticalSection( &kbd_section );
|
||||
|
||||
- if (lpKeyState[VK_SHIFT] & 0x80)
|
||||
+ if (lpKeyState)
|
||||
{
|
||||
- TRACE_(key)("ShiftMask = %04x\n", ShiftMask);
|
||||
- e.state |= ShiftMask;
|
||||
- }
|
||||
- if (lpKeyState[VK_CAPITAL] & 0x01)
|
||||
- {
|
||||
- TRACE_(key)("LockMask = %04x\n", LockMask);
|
||||
- e.state |= LockMask;
|
||||
- }
|
||||
- if (lpKeyState[VK_CONTROL] & 0x80)
|
||||
- {
|
||||
- TRACE_(key)("ControlMask = %04x\n", ControlMask);
|
||||
- e.state |= ControlMask;
|
||||
- }
|
||||
- if (lpKeyState[VK_NUMLOCK] & 0x01)
|
||||
- {
|
||||
- TRACE_(key)("NumLockMask = %04x\n", NumLockMask);
|
||||
- e.state |= NumLockMask;
|
||||
+ if (lpKeyState[VK_SHIFT] & 0x80)
|
||||
+ {
|
||||
+ TRACE_(key)("ShiftMask = %04x\n", ShiftMask);
|
||||
+ e.state |= ShiftMask;
|
||||
+ }
|
||||
+ if (lpKeyState[VK_CAPITAL] & 0x01)
|
||||
+ {
|
||||
+ TRACE_(key)("LockMask = %04x\n", LockMask);
|
||||
+ e.state |= LockMask;
|
||||
+ }
|
||||
+ if (lpKeyState[VK_CONTROL] & 0x80)
|
||||
+ {
|
||||
+ TRACE_(key)("ControlMask = %04x\n", ControlMask);
|
||||
+ e.state |= ControlMask;
|
||||
+ }
|
||||
+ if (lpKeyState[VK_NUMLOCK] & 0x01)
|
||||
+ {
|
||||
+ TRACE_(key)("NumLockMask = %04x\n", NumLockMask);
|
||||
+ e.state |= NumLockMask;
|
||||
+ }
|
||||
}
|
||||
|
||||
/* Restore saved AltGr state */
|
||||
@@ -2680,13 +2683,13 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
|
||||
lpChar[0] = 0;
|
||||
ret = 0;
|
||||
}
|
||||
- else if((lpKeyState[VK_SHIFT] & 0x80) /* Shift is pressed */
|
||||
+ else if (lpKeyState && (lpKeyState[VK_SHIFT] & 0x80) /* Shift is pressed */
|
||||
&& (keysym == XK_KP_Decimal))
|
||||
{
|
||||
lpChar[0] = 0;
|
||||
ret = 0;
|
||||
}
|
||||
- else if((lpKeyState[VK_CONTROL] & 0x80) /* Control is pressed */
|
||||
+ else if (lpKeyState && (lpKeyState[VK_CONTROL] & 0x80) /* Control is pressed */
|
||||
&& (keysym == XK_Return || keysym == XK_KP_Enter))
|
||||
{
|
||||
lpChar[0] = '\n';
|
||||
--
|
||||
2.3.3
|
||||
|
||||
1
patches/winex11-ToUnicodeEx/definition
Normal file
1
patches/winex11-ToUnicodeEx/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [38353] Allow NULL pointer as keystate argument in ToUnicodeEx
|
||||
Loading…
x
Reference in New Issue
Block a user