Add exists option to ProductSearch Result for matching other search types #641
Conversation
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
|
CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅ |
|
I have read the CLA Document and I hereby sign the CLA |
wixbot
added a commit
to wixtoolset/.github
that referenced
this pull request
May 26, 2025
|
Please open an issue so it can go through triage for approval. |
robmen
requested changes
Jun 18, 2025
| @@ -1237,6 +1243,7 @@ static HRESULT MsiProductSearch( | |||
| case BURN_MSI_PRODUCT_SEARCH_TYPE_LANGUAGE: | |||
| type = BURN_VARIANT_TYPE_STRING; | |||
| break; | |||
| case BURN_MSI_PRODUCT_SEARCH_TYPE_EXISTS: __fallthrough; | |||
There was a problem hiding this comment.
Rather than fall through here and check the type again below (line 1255), we should just set the value appropriately in this case.
There was a problem hiding this comment.
The value is in this stage string format?
src/burn/engine/search.cpp
Outdated
| @@ -1245,6 +1252,11 @@ static HRESULT MsiProductSearch( | |||
| hr = BVariantChangeType(&value, type); | |||
| ExitOnFailure(hr, "Failed to change value type."); | |||
|
|
|||
| if (BURN_MSI_PRODUCT_SEARCH_TYPE_EXISTS == pSearch->MsiProductSearch.Type) | |||
| { | |||
| value.llValue = value.llValue == INSTALLSTATE_ABSENT ? 0 : 1; | |||
There was a problem hiding this comment.
I'd like to see parens around the ternary condition:
value.llValue = (value.llValue == INSTALLSTATE_ABSENT) ? 0 : 1;
And moved up to the correct case. :)
There was a problem hiding this comment.
Isn't the value before BVariantChangeType string type?
metsma
force-pushed
the
ProductSearchExists
branch
from
118c8b6 to
a5496b4
Compare
(e.g. FileSearch, DirectorySearch, RegistrySearch) Signed-off-by: Raul Metsma <raul@metsma.ee>
metsma
force-pushed
the
ProductSearchExists
branch
from
a5496b4 to
17b965b
Compare
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.
(e.g. FileSearch, DirectorySearch, RegistrySearch)
Closes wixtoolset/issues#9079
Signed-off-by: Raul Metsma raul@metsma.ee