diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-10-06 16:37:14 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-10-10 11:40:02 -0500 |
| commit | 21a0685ef69e9d634600622b19ea970c6f58ef03 (patch) | |
| tree | 5d37e316803f06d97d4aefd3df8ab45f3f7e7257 /src/libs | |
| parent | 3c11c1389f67824fb1f368cedacbaf566645e56f (diff) | |
| download | wix-21a0685ef69e9d634600622b19ea970c6f58ef03.tar.gz wix-21a0685ef69e9d634600622b19ea970c6f58ef03.tar.bz2 wix-21a0685ef69e9d634600622b19ea970c6f58ef03.zip | |
Add Netfx bundle extension and netfx:DotNetCoreSearch.
Remove built-in .NET Core packages since they update too quickly.
Fixes 6257
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/dutil/WixToolset.DUtil/inc/procutil.h | 3 | ||||
| -rw-r--r-- | src/libs/dutil/WixToolset.DUtil/procutil.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/procutil.h b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h index 6a641a5b..e7e91705 100644 --- a/src/libs/dutil/WixToolset.DUtil/inc/procutil.h +++ b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h | |||
| @@ -62,6 +62,7 @@ HRESULT DAPI ProcExec( | |||
| 62 | __out HANDLE *phProcess | 62 | __out HANDLE *phProcess |
| 63 | ); | 63 | ); |
| 64 | HRESULT DAPI ProcExecute( | 64 | HRESULT DAPI ProcExecute( |
| 65 | __in_z_opt LPCWSTR wzApplicationName, | ||
| 65 | __in_z LPWSTR wzCommand, | 66 | __in_z LPWSTR wzCommand, |
| 66 | __out HANDLE *phProcess, | 67 | __out HANDLE *phProcess, |
| 67 | __out_opt HANDLE *phChildStdIn, | 68 | __out_opt HANDLE *phChildStdIn, |
| @@ -73,7 +74,7 @@ HRESULT DAPI ProcWaitForCompletion( | |||
| 73 | __out_opt DWORD* pdwReturnCode | 74 | __out_opt DWORD* pdwReturnCode |
| 74 | ); | 75 | ); |
| 75 | HRESULT DAPI ProcWaitForIds( | 76 | HRESULT DAPI ProcWaitForIds( |
| 76 | __in_ecount(cProcessIds) const DWORD* pdwProcessIds, | 77 | __in_ecount(cProcessIds) const DWORD rgdwProcessIds[], |
| 77 | __in DWORD cProcessIds, | 78 | __in DWORD cProcessIds, |
| 78 | __in DWORD dwMilliseconds | 79 | __in DWORD dwMilliseconds |
| 79 | ); | 80 | ); |
diff --git a/src/libs/dutil/WixToolset.DUtil/procutil.cpp b/src/libs/dutil/WixToolset.DUtil/procutil.cpp index 376aec6d..f96a1999 100644 --- a/src/libs/dutil/WixToolset.DUtil/procutil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/procutil.cpp | |||
| @@ -375,6 +375,7 @@ LExit: | |||
| 375 | 375 | ||
| 376 | *******************************************************************/ | 376 | *******************************************************************/ |
| 377 | extern "C" HRESULT DAPI ProcExecute( | 377 | extern "C" HRESULT DAPI ProcExecute( |
| 378 | __in_z_opt LPCWSTR wzApplicationName, | ||
| 378 | __in_z LPWSTR wzCommand, | 379 | __in_z LPWSTR wzCommand, |
| 379 | __out HANDLE *phProcess, | 380 | __out HANDLE *phProcess, |
| 380 | __out_opt HANDLE *phChildStdIn, | 381 | __out_opt HANDLE *phChildStdIn, |
| @@ -405,7 +406,7 @@ extern "C" HRESULT DAPI ProcExecute( | |||
| 405 | 406 | ||
| 406 | #pragma prefast(push) | 407 | #pragma prefast(push) |
| 407 | #pragma prefast(disable:25028) | 408 | #pragma prefast(disable:25028) |
| 408 | if (::CreateProcessW(NULL, | 409 | if (::CreateProcessW(wzApplicationName, |
| 409 | wzCommand, // command line | 410 | wzCommand, // command line |
| 410 | NULL, // security info | 411 | NULL, // security info |
| 411 | NULL, // thread info | 412 | NULL, // thread info |