summaryrefslogtreecommitdiff
path: root/src/libs/dutil/WixToolset.DUtil/cabutil.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/cabutil.cpp')
-rw-r--r--src/libs/dutil/WixToolset.DUtil/cabutil.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/cabutil.cpp b/src/libs/dutil/WixToolset.DUtil/cabutil.cpp
index 5d77e483..f3629d57 100644
--- a/src/libs/dutil/WixToolset.DUtil/cabutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/cabutil.cpp
@@ -106,7 +106,7 @@ static HANDLE OpenFileWithRetry(
106 __in LPCWSTR wzPath, 106 __in LPCWSTR wzPath,
107 __in DWORD dwDesiredAccess, 107 __in DWORD dwDesiredAccess,
108 __in DWORD dwCreationDisposition 108 __in DWORD dwCreationDisposition
109) 109 )
110{ 110{
111 HANDLE hFile = INVALID_HANDLE_VALUE; 111 HANDLE hFile = INVALID_HANDLE_VALUE;
112 112
@@ -286,7 +286,7 @@ static HRESULT DAPI CabOperation(
286 // 286 //
287 // split the cabinet full path into directory and filename and convert to multi-byte (ick!) 287 // split the cabinet full path into directory and filename and convert to multi-byte (ick!)
288 // 288 //
289 pwz = FileFromPath(sczCabinet); 289 pwz = PathFile(sczCabinet);
290 CabExitOnNull(pwz, hr, E_INVALIDARG, "failed to process cabinet path: %ls", wzCabinet); 290 CabExitOnNull(pwz, hr, E_INVALIDARG, "failed to process cabinet path: %ls", wzCabinet);
291 291
292 if (!::WideCharToMultiByte(CP_UTF8, 0, pwz, -1, szCabFile, countof(szCabFile), NULL, NULL)) 292 if (!::WideCharToMultiByte(CP_UTF8, 0, pwz, -1, szCabFile, countof(szCabFile), NULL, NULL))