Simplify WindowEmperor::HandleCommandlineArgs #16592
Merged
Conversation
This file contains 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
lhecker
added
the
Area-CodeHealth
lhecker
commented
Jan 23, 2024
| #include "resource.h" | ||
| #include "NotificationIcon.h" | ||
| #include <til/env.h> |
There was a problem hiding this comment.
There didn't seem to be a system to the newlines between the includes, so I removed them. Let me know if I should revert this.
lhecker
commented
Jan 23, 2024
| // so we can open a new window with the same state. | ||
| STARTUPINFOW si; | ||
| GetStartupInfoW(&si); | ||
| const uint32_t showWindow = WI_IsFlagSet(si.dwFlags, STARTF_USESHOWWINDOW) ? si.wShowWindow : SW_SHOW; |
There was a problem hiding this comment.
FYI There's one slight difference between this implementation and the way nCmdShow is generated. __scrt_get_show_window_mode's default value is SW_SHOWDEFAULT. I believe in our case that difference doesn't really matter though.
This comment was marked as off-topic.
This comment was marked as off-topic.
zadjii-msft
approved these changes
Jan 23, 2024
DHowett
approved these changes
Jan 25, 2024
DHowett
pushed a commit
that referenced
this pull request
Jan 26, 2024
This simplifies the function in two ways: * Passing `nCmdShow` from `wWinMain` alleviates the need to interpret the return value of `GetStartupInfoW`. * `til::env::from_current_environment()` calls `GetEnvironmentStringsW` to get the environment variables, while `to_string()` turns it back. Calling the latter directly alleviates the need for this round-trip. (cherry picked from commit a39ac59) Service-Card-Id: 91643114 Service-Version: 1.18
DHowett
pushed a commit
that referenced
this pull request
Jan 29, 2024
This simplifies the function in two ways: * Passing `nCmdShow` from `wWinMain` alleviates the need to interpret the return value of `GetStartupInfoW`. * `til::env::from_current_environment()` calls `GetEnvironmentStringsW` to get the environment variables, while `to_string()` turns it back. Calling the latter directly alleviates the need for this round-trip. (cherry picked from commit a39ac59) Service-Card-Id: 91643115 Service-Version: 1.19
lhecker
added a commit
that referenced
this pull request
Jan 30, 2024
lhecker
added a commit
that referenced
this pull request
Jan 30, 2024
DHowett
pushed a commit
that referenced
this pull request
Jan 31, 2024
#16592 passes the return value of `GetEnvironmentStringsW` directly to the `hstring` constructor even though the former returns a double-null terminated string and the latter expects a regular one. This PR fixes the issue by using a basic strlen() loop to compute the length ourselves. It's still theoretically beneficial over the previous code, but now it's rather bitter since the code isn't particularly short anymore and so the biggest benefit is gone. Closes #16623 ## Validation Steps Performed * Validated the `env` string in a debugger ✅ It's 1 character shorter than the old `til::env` string. That's fine however, since any `HSTRING` is always null-terminated anyways and so we get an extra null-terminator for free. * `wt powershell` works ✅
DHowett
pushed a commit
that referenced
this pull request
Jan 31, 2024
#16592 passes the return value of `GetEnvironmentStringsW` directly to the `hstring` constructor even though the former returns a double-null terminated string and the latter expects a regular one. This PR fixes the issue by using a basic strlen() loop to compute the length ourselves. It's still theoretically beneficial over the previous code, but now it's rather bitter since the code isn't particularly short anymore and so the biggest benefit is gone. Closes #16623 ## Validation Steps Performed * Validated the `env` string in a debugger ✅ It's 1 character shorter than the old `til::env` string. That's fine however, since any `HSTRING` is always null-terminated anyways and so we get an extra null-terminator for free. * `wt powershell` works ✅ (cherry picked from commit c669afe) Service-Card-Id: 91719861 Service-Version: 1.18
DHowett
pushed a commit
that referenced
this pull request
Jan 31, 2024
#16592 passes the return value of `GetEnvironmentStringsW` directly to the `hstring` constructor even though the former returns a double-null terminated string and the latter expects a regular one. This PR fixes the issue by using a basic strlen() loop to compute the length ourselves. It's still theoretically beneficial over the previous code, but now it's rather bitter since the code isn't particularly short anymore and so the biggest benefit is gone. Closes #16623 ## Validation Steps Performed * Validated the `env` string in a debugger ✅ It's 1 character shorter than the old `til::env` string. That's fine however, since any `HSTRING` is always null-terminated anyways and so we get an extra null-terminator for free. * `wt powershell` works ✅ (cherry picked from commit c669afe) Service-Card-Id: 91719863 Service-Version: 1.20
DHowett
pushed a commit
that referenced
this pull request
Jan 31, 2024
#16592 passes the return value of `GetEnvironmentStringsW` directly to the `hstring` constructor even though the former returns a double-null terminated string and the latter expects a regular one. This PR fixes the issue by using a basic strlen() loop to compute the length ourselves. It's still theoretically beneficial over the previous code, but now it's rather bitter since the code isn't particularly short anymore and so the biggest benefit is gone. Closes #16623 ## Validation Steps Performed * Validated the `env` string in a debugger ✅ It's 1 character shorter than the old `til::env` string. That's fine however, since any `HSTRING` is always null-terminated anyways and so we get an extra null-terminator for free. * `wt powershell` works ✅ (cherry picked from commit c669afe) Service-Card-Id: 91719862 Service-Version: 1.19
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This simplifies the function in two ways:
nCmdShowfromwWinMainalleviates the need to interpretthe return value of
GetStartupInfoW.til::env::from_current_environment()callsGetEnvironmentStringsWto get the environment variables, while
to_string()turns it back.Calling the latter directly alleviates the need for this round-trip.