Skip to content

Commit

Permalink
tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
solidstore committed Aug 10, 2023
1 parent 5cef22f commit 5bf3981
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions src/ext/Http/ca/sslbinding.cpp
Expand Up @@ -193,7 +193,6 @@ extern "C" UINT __stdcall ExecHttpSslBindings(
hr = WcaReadStringFromCaData(&wz, &sczCertificateStore);
ExitOnFailure(hr, "Failed to read CertificateStore from custom action data");

//XX query
hr = WcaBeginUnwrapQuery(&hSslCertQuery, &wz);
ExitOnFailure(hr, "Failed to unwrap ssl certificate query");

Expand All @@ -202,13 +201,13 @@ extern "C" UINT __stdcall ExecHttpSslBindings(
case WCA_TODO_INSTALL:
case WCA_TODO_REINSTALL:
fRemove = heReplace == handleExisting || fRollback;
fAdd = !fRollback /*|| *sczCertificateThumbprint*/;
fAdd = !fRollback;
fFailOnExisting = heFail == handleExisting && !fRollback;
break;

case WCA_TODO_UNINSTALL:
fRemove = !fRollback;
fAdd = fRollback /*&& *sczCertificateThumbprint*/;
fAdd = fRollback;
fFailOnExisting = FALSE;
break;
}
Expand Down
4 changes: 2 additions & 2 deletions src/ext/Http/wixext/HttpTableDefinitions.cs
Expand Up @@ -52,7 +52,7 @@ public static class HttpTableDefinitions
);

public static readonly TableDefinition WixHttpSslCertificate = new TableDefinition(
"Wix4HttpSslCertificate", //XX use existing table?
"Wix4HttpSslCertificate",
HttpSymbolDefinitions.WixHttpCertificate,
new[]
{
Expand All @@ -70,7 +70,7 @@ public static class HttpTableDefinitions
);

public static readonly TableDefinition WixHttpSslCertificateHash = new TableDefinition(
"Wix4HttpSslCertificateHash", //XX use existing table?
"Wix4HttpSslCertificateHash",
HttpSymbolDefinitions.WixHttpCertificateHash,
new[]
{
Expand Down

0 comments on commit 5bf3981

Please sign in to comment.