diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-12-26 21:15:06 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-01-11 12:20:07 -0600 |
| commit | 5bab3f6ae97b62bb6e79378010c08a13e48fde5a (patch) | |
| tree | 01d648f19b9523de128686443afd407afc8db84f /src/engine/elevation.cpp | |
| parent | b20a77911c6a2b096f021639e0daadae7430091c (diff) | |
| download | wix-5bab3f6ae97b62bb6e79378010c08a13e48fde5a.tar.gz wix-5bab3f6ae97b62bb6e79378010c08a13e48fde5a.tar.bz2 wix-5bab3f6ae97b62bb6e79378010c08a13e48fde5a.zip | |
Upgrade to latest dutil as first step for x64 and ARM64
Diffstat (limited to 'src/engine/elevation.cpp')
| -rw-r--r-- | src/engine/elevation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/elevation.cpp b/src/engine/elevation.cpp index af5610dc..94418dc3 100644 --- a/src/engine/elevation.cpp +++ b/src/engine/elevation.cpp | |||
| @@ -865,7 +865,7 @@ extern "C" HRESULT ElevationExecuteMsiPackage( | |||
| 865 | hr = BuffWriteString(&pbData, &cbData, pExecuteAction->msiPackage.pPackage->sczId); | 865 | hr = BuffWriteString(&pbData, &cbData, pExecuteAction->msiPackage.pPackage->sczId); |
| 866 | ExitOnFailure(hr, "Failed to write package id to message buffer."); | 866 | ExitOnFailure(hr, "Failed to write package id to message buffer."); |
| 867 | 867 | ||
| 868 | hr = BuffWriteNumber(&pbData, &cbData, (DWORD)hwndParent); | 868 | hr = BuffWritePointer(&pbData, &cbData, (DWORD_PTR)hwndParent); |
| 869 | ExitOnFailure(hr, "Failed to write parent hwnd to message buffer."); | 869 | ExitOnFailure(hr, "Failed to write parent hwnd to message buffer."); |
| 870 | 870 | ||
| 871 | hr = BuffWriteString(&pbData, &cbData, pExecuteAction->msiPackage.sczLogPath); | 871 | hr = BuffWriteString(&pbData, &cbData, pExecuteAction->msiPackage.sczLogPath); |
| @@ -944,7 +944,7 @@ extern "C" HRESULT ElevationExecuteMspPackage( | |||
| 944 | hr = BuffWriteString(&pbData, &cbData, pExecuteAction->mspTarget.pPackage->sczId); | 944 | hr = BuffWriteString(&pbData, &cbData, pExecuteAction->mspTarget.pPackage->sczId); |
| 945 | ExitOnFailure(hr, "Failed to write package id to message buffer."); | 945 | ExitOnFailure(hr, "Failed to write package id to message buffer."); |
| 946 | 946 | ||
| 947 | hr = BuffWriteNumber(&pbData, &cbData, (DWORD)hwndParent); | 947 | hr = BuffWritePointer(&pbData, &cbData, (DWORD_PTR)hwndParent); |
| 948 | ExitOnFailure(hr, "Failed to write parent hwnd to message buffer."); | 948 | ExitOnFailure(hr, "Failed to write parent hwnd to message buffer."); |
| 949 | 949 | ||
| 950 | hr = BuffWriteString(&pbData, &cbData, pExecuteAction->mspTarget.sczTargetProductCode); | 950 | hr = BuffWriteString(&pbData, &cbData, pExecuteAction->mspTarget.sczTargetProductCode); |
| @@ -2322,7 +2322,7 @@ static HRESULT OnExecuteMsiPackage( | |||
| 2322 | hr = PackageFindById(pPackages, sczPackage, &executeAction.msiPackage.pPackage); | 2322 | hr = PackageFindById(pPackages, sczPackage, &executeAction.msiPackage.pPackage); |
| 2323 | ExitOnFailure(hr, "Failed to find package: %ls", sczPackage); | 2323 | ExitOnFailure(hr, "Failed to find package: %ls", sczPackage); |
| 2324 | 2324 | ||
| 2325 | hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&hwndParent); | 2325 | hr = BuffReadPointer(pbData, cbData, &iData, (DWORD_PTR*)&hwndParent); |
| 2326 | ExitOnFailure(hr, "Failed to read parent hwnd."); | 2326 | ExitOnFailure(hr, "Failed to read parent hwnd."); |
| 2327 | 2327 | ||
| 2328 | hr = BuffReadString(pbData, cbData, &iData, &executeAction.msiPackage.sczLogPath); | 2328 | hr = BuffReadString(pbData, cbData, &iData, &executeAction.msiPackage.sczLogPath); |
| @@ -2420,7 +2420,7 @@ static HRESULT OnExecuteMspPackage( | |||
| 2420 | hr = PackageFindById(pPackages, sczPackage, &executeAction.mspTarget.pPackage); | 2420 | hr = PackageFindById(pPackages, sczPackage, &executeAction.mspTarget.pPackage); |
| 2421 | ExitOnFailure(hr, "Failed to find package: %ls", sczPackage); | 2421 | ExitOnFailure(hr, "Failed to find package: %ls", sczPackage); |
| 2422 | 2422 | ||
| 2423 | hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&hwndParent); | 2423 | hr = BuffReadPointer(pbData, cbData, &iData, (DWORD_PTR*)&hwndParent); |
| 2424 | ExitOnFailure(hr, "Failed to read parent hwnd."); | 2424 | ExitOnFailure(hr, "Failed to read parent hwnd."); |
| 2425 | 2425 | ||
| 2426 | executeAction.mspTarget.fPerMachineTarget = TRUE; // we're in the elevated process, clearly we're targeting a per-machine product. | 2426 | executeAction.mspTarget.fPerMachineTarget = TRUE; // we're in the elevated process, clearly we're targeting a per-machine product. |