Simplify marshalling of StartupInfo struct used in Jumplist creation.#7580
Merged
adityapatwardhan merged 2 commits intoPowerShell:masterfrom Aug 24, 2018
Merged
Simplify marshalling of StartupInfo struct used in Jumplist creation.#7580adityapatwardhan merged 2 commits intoPowerShell:masterfrom
adityapatwardhan merged 2 commits intoPowerShell:masterfrom
Conversation
1f567a5 to
2cc57f3
Compare
iSazonov
approved these changes
Aug 22, 2018
Collaborator
iSazonov
left a comment
There was a problem hiding this comment.
LGTM with one minor comment.
| internal static extern void GetStartupInfo(out StartUpInfo lpStartupInfo); | ||
|
|
||
| [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] | ||
| [StructLayout(LayoutKind.Sequential)] |
Collaborator
There was a problem hiding this comment.
Please add a comment why we use IntPtr for strings - this help us avoid problems in future.
anmenaga
approved these changes
Aug 23, 2018
adityapatwardhan
approved these changes
Aug 24, 2018
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
PR Summary
#7572
The current code mixes Ansi version of GetStartupInfoA with Unicode marshalling. This leads to a heap corruption that manifests in a crash a few lines down.
This commit simplifies the interop struct, using IntPtr instead of string since we have no usage for the strings. With that change, all fields are blitable, making the marshaller both simpler and faster.
GetStartupInfoA is documented to throw and exception, not set last error, So I changed to
SetLastError = false.GetStartupInfoW does not fail, indicated by the void return type.
I also made the reserved fields private, and all fields readonly.
PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright headerWIP:to the beginning of the title and remove the prefix when the PR is ready.[feature]if the change is significant or affects feature tests