Skip to content

[llvm-rc] Allow ALT on non-virtkey accelerators #143374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2025
Merged

[llvm-rc] Allow ALT on non-virtkey accelerators #143374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions llvm/test/tools/llvm-rc/Inputs/tag-accelerators-ascii-alt.rc
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions llvm/test/tools/llvm-rc/Inputs/tag-accelerators.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,6 @@ LANGUAGE 5, 1
"7", 71, VIRTKEY, NOINVERT, CONTROL, SHIFT, ALT
"^j", 72, ASCII
"^j", 73, ASCII, NOINVERT
"A", 15, ASCII, ALT
}

15 changes: 5 additions & 10 deletions llvm/test/tools/llvm-rc/tag-accelerators.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
; ACCELERATORS-NEXT: Version (major): 0
; ACCELERATORS-NEXT: Version (minor): 0
; ACCELERATORS-NEXT: Characteristics: 0
; ACCELERATORS-NEXT: Data size: 592
; ACCELERATORS-NEXT: Data size: 600
; ACCELERATORS-NEXT: Data: (
; ACCELERATORS-NEXT: 0000: 00002A00 00000000 01002A00 01000000 |..*.......*.....|
; ACCELERATORS-NEXT: 0010: 02002A00 02000000 03002A00 03000000 |..*.......*.....|
Expand Down Expand Up @@ -75,7 +75,8 @@
; ACCELERATORS-NEXT: 0210: 15003700 42000000 0F003700 43000000 |..7.B.....7.C...|
; ACCELERATORS-NEXT: 0220: 1B003700 44000000 17003700 45000000 |..7.D.....7.E...|
; ACCELERATORS-NEXT: 0230: 1D003700 46000000 1F003700 47000000 |..7.F.....7.G...|
; ACCELERATORS-NEXT: 0240: 00000A00 48000000 82000A00 49000000 |....H.......I...|
; ACCELERATORS-NEXT: 0240: 00000A00 48000000 02000A00 49000000 |....H.......I...|
; ACCELERATORS-NEXT: 0250: 90004100 0F000000 |..A.....|
; ACCELERATORS-NEXT: )


Expand All @@ -94,19 +95,13 @@
; RUN: not llvm-rc -no-preprocess /FO %t -- %p/Inputs/tag-accelerators-ascii-control.rc 2>&1 | FileCheck %s --check-prefix ASCII2

; ASCII2: llvm-rc: Error in ACCELERATORS statement (ID 2):
; ASCII2-NEXT: Accelerator ID 15: Can only apply ALT, SHIFT or CONTROL to VIRTKEY accelerators
; ASCII2-NEXT: Accelerator ID 15: Can only apply SHIFT or CONTROL to VIRTKEY accelerators


; RUN: not llvm-rc -no-preprocess /FO %t -- %p/Inputs/tag-accelerators-ascii-shift.rc 2>&1 | FileCheck %s --check-prefix ASCII3

; ASCII3: llvm-rc: Error in ACCELERATORS statement (ID 2):
; ASCII3-NEXT: Accelerator ID 15: Can only apply ALT, SHIFT or CONTROL to VIRTKEY accelerators


; RUN: not llvm-rc -no-preprocess /FO %t -- %p/Inputs/tag-accelerators-ascii-alt.rc 2>&1 | FileCheck %s --check-prefix ASCII4

; ASCII4: llvm-rc: Error in ACCELERATORS statement (ID 2):
; ASCII4-NEXT: Accelerator ID 15: Can only apply ALT, SHIFT or CONTROL to VIRTKEY accelerators
; ASCII3-NEXT: Accelerator ID 15: Can only apply SHIFT or CONTROL to VIRTKEY accelerators


; RUN: not llvm-rc -no-preprocess /FO %t -- %p/Inputs/tag-accelerators-bad-key-id.rc 2>&1 | FileCheck %s --check-prefix BADKEYID
Expand Down
4 changes: 2 additions & 2 deletions llvm/tools/llvm-rc/ResourceFileWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,8 +631,8 @@ Error ResourceFileWriter::writeSingleAccelerator(
if (IsASCII && IsVirtKey)
return createAccError("Accelerator can't be both ASCII and VIRTKEY");

if (!IsVirtKey && (Obj.Flags & (Opt::ALT | Opt::SHIFT | Opt::CONTROL)))
return createAccError("Can only apply ALT, SHIFT or CONTROL to VIRTKEY"
if (!IsVirtKey && (Obj.Flags & (Opt::SHIFT | Opt::CONTROL)))
return createAccError("Can only apply SHIFT or CONTROL to VIRTKEY"
" accelerators");

if (Obj.Event.isInt()) {
Expand Down
Loading