Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
6c73f739
Commit
6c73f739
authored
Dec 15, 2006
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Dec 15, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Add support for the VK_APPS (Menu) key.
parent
95f26324
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
1 deletion
+25
-1
message.c
dlls/user32/message.c
+6
-0
msg.c
dlls/user32/tests/msg.c
+18
-0
keyboard.c
dlls/winex11.drv/keyboard.c
+1
-1
No files found.
dlls/user32/message.c
View file @
6c73f739
...
...
@@ -1660,6 +1660,12 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter,
SendMessageW
(
msg
->
hwnd
,
WM_APPCOMMAND
,
(
WPARAM
)
msg
->
hwnd
,
MAKELPARAM
(
0
,
(
FAPPCOMMAND_KEY
|
(
msg
->
wParam
-
VK_BROWSER_BACK
+
1
))));
}
}
else
if
(
msg
->
message
==
WM_KEYUP
)
{
/* Handle VK_APPS key by posting a WM_CONTEXTMENU message */
if
(
msg
->
wParam
==
VK_APPS
&&
!
MENU_IsMenuActive
())
PostMessageW
(
msg
->
hwnd
,
WM_CONTEXTMENU
,
(
WPARAM
)
msg
->
hwnd
,
(
LPARAM
)
-
1
);
}
}
if
(
HOOK_CallHooks
(
WH_KEYBOARD
,
remove
?
HC_ACTION
:
HC_NOREMOVE
,
...
...
dlls/user32/tests/msg.c
View file @
6c73f739
...
...
@@ -5288,6 +5288,17 @@ static const struct message WmF1Seq[] = {
{
WM_KEYUP
,
sent
|
wparam
|
lparam
,
VK_F1
,
0xc0000001
},
{
0
}
};
static
const
struct
message
WmVkAppsSeq
[]
=
{
{
HCBT_KEYSKIPPED
,
hook
|
wparam
|
lparam
|
optional
,
VK_APPS
,
1
},
/* XP */
{
WM_KEYDOWN
,
wparam
|
lparam
,
VK_APPS
,
1
},
{
WM_KEYDOWN
,
sent
|
wparam
|
lparam
,
VK_APPS
,
0x00000001
},
{
HCBT_KEYSKIPPED
,
hook
|
wparam
|
lparam
|
optional
,
VK_APPS
,
0xc0000001
},
/* XP */
{
WM_KEYUP
,
wparam
|
lparam
,
VK_APPS
,
0xc0000001
},
{
WM_KEYUP
,
sent
|
wparam
|
lparam
,
VK_APPS
,
0xc0000001
},
{
WM_CONTEXTMENU
,
lparam
,
/*hwnd*/
0
,
(
LPARAM
)
-
1
},
{
WM_CONTEXTMENU
,
sent
|
lparam
,
/*hwnd*/
0
,
(
LPARAM
)
-
1
},
{
0
}
};
static
void
pump_msg_loop
(
HWND
hwnd
,
HACCEL
hAccel
)
{
...
...
@@ -5495,11 +5506,18 @@ static void test_accelerators(void)
pump_msg_loop
(
hwnd
,
0
);
ok_sequence
(
WmAltMouseButton
,
"Alt+MouseButton press/release"
,
FALSE
);
trace
(
"testing VK_F1 press/release
\n
"
);
keybd_event
(
VK_F1
,
0
,
0
,
0
);
keybd_event
(
VK_F1
,
0
,
KEYEVENTF_KEYUP
,
0
);
pump_msg_loop
(
hwnd
,
0
);
ok_sequence
(
WmF1Seq
,
"F1 press/release"
,
TRUE
);
trace
(
"testing VK_APPS press/release
\n
"
);
keybd_event
(
VK_APPS
,
0
,
0
,
0
);
keybd_event
(
VK_APPS
,
0
,
KEYEVENTF_KEYUP
,
0
);
pump_msg_loop
(
hwnd
,
0
);
ok_sequence
(
WmVkAppsSeq
,
"VK_APPS press/release"
,
FALSE
);
DestroyWindow
(
hwnd
);
}
...
...
dlls/winex11.drv/keyboard.c
View file @
6c73f739
...
...
@@ -1001,7 +1001,7 @@ static const WORD nonchar_key_vkey[256] =
VK_DOWN
,
VK_PRIOR
,
VK_NEXT
,
VK_END
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
/* FF58 */
/* misc keys */
VK_SELECT
,
VK_SNAPSHOT
,
VK_EXECUTE
,
VK_INSERT
,
0
,
0
,
0
,
0
,
/* FF60 */
VK_SELECT
,
VK_SNAPSHOT
,
VK_EXECUTE
,
VK_INSERT
,
0
,
0
,
0
,
VK_APPS
,
/* FF60 */
0
,
VK_CANCEL
,
VK_HELP
,
VK_CANCEL
,
0
,
0
,
0
,
0
,
/* FF68 */
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
/* FF70 */
/* keypad keys */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment