-
-
Notifications
You must be signed in to change notification settings - Fork 8.7k
[rust] Fix arch misdetection on 32bit Windows environment #17297
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.
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
Open
gplm620
wants to merge
1
commit into
SeleniumHQ:trunk
Choose a base branch
from
gplm620:fix-arch-misdetection-on-32bit
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,7 +83,7 @@ impl ManagerConfig { | |
| _architecture = get_win_os_architecture(); | ||
| } | ||
| } | ||
| if _architecture.contains("32") { | ||
| if _architecture.contains("x86") { | ||
| ARCH_X86.to_string() | ||
| } else if _architecture.contains("ARM") { | ||
| ARCH_ARM64.to_string() | ||
|
Comment on lines
83
to
89
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 2. Wow64 arch misdetected On Windows, ManagerConfig::default now maps any PROCESSOR_ARCHITECTURE containing "x86" to ARCH_X86, so a 32-bit selenium-manager process on 64-bit Windows will be treated as 32-bit and may select win32 artifacts instead of win64. This happens because the code prefers PROCESSOR_ARCHITECTURE and only calls GetNativeSystemInfo when the env var is empty, so it won’t detect the native OS architecture in the common WOW64 case. Agent Prompt
|
||
|
|
@@ -316,8 +316,8 @@ fn get_win_os_architecture() -> String { | |
| GetNativeSystemInfo(&mut system_info); | ||
|
|
||
| match system_info.u.s() { | ||
| si if si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 => "64-bit", | ||
| si if si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL => "32-bit", | ||
| si if si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 => "AMD64", | ||
| si if si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL => "x86", | ||
| si if si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM => "ARM", | ||
| si if si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64 => "ARM64", | ||
| si if si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_IA64 => "Itanium-based", | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1. Windows arch change lacks tests
📘 Rule violation☼ ReliabilityAgent Prompt
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools