diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-28 16:43:01 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-29 14:05:34 -0500 |
commit | e78138558fe17d8a91929c87b2a6d0c9a482d78a (patch) | |
tree | 40c0c61217a4b42ab1bf40470923cade6a3a08b0 /src/engine/engine.cpp | |
parent | 14cdda3c489d6b9801f05939044e67b13939b42d (diff) | |
download | wix-e78138558fe17d8a91929c87b2a6d0c9a482d78a.tar.gz wix-e78138558fe17d8a91929c87b2a6d0c9a482d78a.tar.bz2 wix-e78138558fe17d8a91929c87b2a6d0c9a482d78a.zip |
Clean up 32-bit assumptions.
Diffstat (limited to 'src/engine/engine.cpp')
-rw-r--r-- | src/engine/engine.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index e2728d7f..8f024e98 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp | |||
@@ -324,6 +324,7 @@ static HRESULT InitializeEngineState( | |||
324 | LPCWSTR wzParam = NULL; | 324 | LPCWSTR wzParam = NULL; |
325 | HANDLE hSectionFile = hEngineFile; | 325 | HANDLE hSectionFile = hEngineFile; |
326 | HANDLE hSourceEngineFile = INVALID_HANDLE_VALUE; | 326 | HANDLE hSourceEngineFile = INVALID_HANDLE_VALUE; |
327 | DWORD64 qw = 0; | ||
327 | 328 | ||
328 | pEngineState->automaticUpdates = BURN_AU_PAUSE_ACTION_IFELEVATED; | 329 | pEngineState->automaticUpdates = BURN_AU_PAUSE_ACTION_IFELEVATED; |
329 | pEngineState->dwElevatedLoggingTlsId = TLS_OUT_OF_INDEXES; | 330 | pEngineState->dwElevatedLoggingTlsId = TLS_OUT_OF_INDEXES; |
@@ -343,8 +344,10 @@ static HRESULT InitializeEngineState( | |||
343 | ExitOnRootFailure(hr = E_INVALIDARG, "Missing required parameter for switch: %ls", BURN_COMMANDLINE_SWITCH_FILEHANDLE_ATTACHED); | 344 | ExitOnRootFailure(hr = E_INVALIDARG, "Missing required parameter for switch: %ls", BURN_COMMANDLINE_SWITCH_FILEHANDLE_ATTACHED); |
344 | } | 345 | } |
345 | 346 | ||
346 | hr = StrStringToUInt32(wzParam, 0, reinterpret_cast<UINT*>(&hSourceEngineFile)); | 347 | hr = StrStringToUInt64(wzParam, 0, &qw); |
347 | ExitOnFailure(hr, "Failed to parse file handle: '%ls'", (wzParam)); | 348 | ExitOnFailure(hr, "Failed to parse file handle: '%ls'", (wzParam)); |
349 | |||
350 | hSourceEngineFile = (HANDLE)qw; | ||
348 | } | 351 | } |
349 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &pEngineState->argv[i][1], lstrlenW(BURN_COMMANDLINE_SWITCH_FILEHANDLE_SELF), BURN_COMMANDLINE_SWITCH_FILEHANDLE_SELF, lstrlenW(BURN_COMMANDLINE_SWITCH_FILEHANDLE_SELF))) | 352 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &pEngineState->argv[i][1], lstrlenW(BURN_COMMANDLINE_SWITCH_FILEHANDLE_SELF), BURN_COMMANDLINE_SWITCH_FILEHANDLE_SELF, lstrlenW(BURN_COMMANDLINE_SWITCH_FILEHANDLE_SELF))) |
350 | { | 353 | { |
@@ -354,8 +357,10 @@ static HRESULT InitializeEngineState( | |||
354 | ExitOnRootFailure(hr = E_INVALIDARG, "Missing required parameter for switch: %ls", BURN_COMMANDLINE_SWITCH_FILEHANDLE_SELF); | 357 | ExitOnRootFailure(hr = E_INVALIDARG, "Missing required parameter for switch: %ls", BURN_COMMANDLINE_SWITCH_FILEHANDLE_SELF); |
355 | } | 358 | } |
356 | 359 | ||
357 | hr = StrStringToUInt32(wzParam, 0, reinterpret_cast<UINT*>(&hSectionFile)); | 360 | hr = StrStringToUInt64(wzParam, 0, &qw); |
358 | ExitOnFailure(hr, "Failed to parse file handle: '%ls'", (wzParam)); | 361 | ExitOnFailure(hr, "Failed to parse file handle: '%ls'", (wzParam)); |
362 | |||
363 | hSectionFile = (HANDLE)qw; | ||
359 | } | 364 | } |
360 | } | 365 | } |
361 | } | 366 | } |