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

WIXBUG:4510 #140

Merged
merged 1 commit into from Sep 1, 2014

Conversation

Projects
None yet
3 participants
@barnson
Member

barnson commented Aug 23, 2014

Empty the post-reboot resume command line when recreating it.

WIXBUG:4510
Empty the post-reboot resume command line when recreating it.
@@ -845,6 +845,9 @@ extern "C" HRESULT CoreRecreateCommandLine(
LPWSTR scz = NULL;
LPCWSTR wzRelationTypeCommandLine = CoreRelationTypeToCommandLineString(relationType);
hr = StrAllocString(psczCommandLine, L"", 0);

This comment has been minimized.

@rseanhall

rseanhall Aug 30, 2014

Member

Looks good. I don't think it matters, but it used to be possible for psczCommand to never be allocated and this changes that.

@rseanhall

rseanhall Aug 30, 2014

Member

Looks good. I don't think it matters, but it used to be possible for psczCommand to never be allocated and this changes that.

This comment has been minimized.

@robmen

robmen Aug 30, 2014

Member

Just curious, what about ReleaseNullStr() here?

@robmen

robmen Aug 30, 2014

Member

Just curious, what about ReleaseNullStr() here?

This comment has been minimized.

@barnson

barnson Aug 30, 2014

Member

StrAllocConcat requires an allocated string, so I figured reusing an existing block that probably would be about the same size would be better than forcing new allocations. But I'm not wrapped up in it. :)

@barnson

barnson Aug 30, 2014

Member

StrAllocConcat requires an allocated string, so I figured reusing an existing block that probably would be about the same size would be better than forcing new allocations. But I'm not wrapped up in it. :)

@robmen robmen merged commit 9f9e6ce into wixtoolset:develop Sep 1, 2014

robmen added a commit that referenced this pull request Sep 1, 2014

@barnson barnson deleted the barnson:bug4510 branch May 8, 2015

@barnson barnson restored the barnson:bug4510 branch Feb 12, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment