summaryrefslogtreecommitdiff
path: root/src/libs/dutil/WixToolset.DUtil/cabcutil.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/cabcutil.cpp')
-rw-r--r--src/libs/dutil/WixToolset.DUtil/cabcutil.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/cabcutil.cpp b/src/libs/dutil/WixToolset.DUtil/cabcutil.cpp
index 9cc45a83..d1edc54d 100644
--- a/src/libs/dutil/WixToolset.DUtil/cabcutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/cabcutil.cpp
@@ -503,7 +503,7 @@ extern "C" HRESULT DAPI CabCFinish(
503 } 503 }
504 else 504 else
505 { 505 {
506 LPCWSTR pwzTemp = FileFromPath(fileInfo.wzSourcePath); 506 LPCWSTR pwzTemp = PathFile(fileInfo.wzSourcePath);
507 hr = StrAnsiAllocString(&pszFileToken, pwzTemp, 0, CP_ACP); 507 hr = StrAnsiAllocString(&pszFileToken, pwzTemp, 0, CP_ACP);
508 CabcExitOnFailure(hr, "failed to convert file name to ANSI: %ls", pwzTemp); 508 CabcExitOnFailure(hr, "failed to convert file name to ANSI: %ls", pwzTemp);
509 } 509 }
@@ -538,7 +538,7 @@ extern "C" HRESULT DAPI CabCFinish(
538 } 538 }
539 else 539 else
540 { 540 {
541 LPCWSTR pwzTemp = FileFromPath(fileInfo.wzSourcePath); 541 LPCWSTR pwzTemp = PathFile(fileInfo.wzSourcePath);
542 hr = StrAnsiAllocString(&pszFileToken, pwzTemp, 0, CP_ACP); 542 hr = StrAnsiAllocString(&pszFileToken, pwzTemp, 0, CP_ACP);
543 CabcExitOnFailure(hr, "failed to convert duplicate file name to ANSI: %ls", pwzTemp); 543 CabcExitOnFailure(hr, "failed to convert duplicate file name to ANSI: %ls", pwzTemp);
544 } 544 }
@@ -1386,7 +1386,7 @@ static __callback BOOL DIAMONDAPI CabCGetNextCabinet(
1386 if (pccab->iCab == 1) 1386 if (pccab->iCab == 1)
1387 { 1387 {
1388 pcd->wzFirstCabinetName[0] = '\0'; 1388 pcd->wzFirstCabinetName[0] = '\0';
1389 LPCWSTR pwzCabinetName = FileFromPath(pcd->wzCabinetPath); 1389 LPCWSTR pwzCabinetName = PathFile(pcd->wzCabinetPath);
1390 size_t len = wcsnlen(pwzCabinetName, sizeof(pwzCabinetName)); 1390 size_t len = wcsnlen(pwzCabinetName, sizeof(pwzCabinetName));
1391 if (len > 4) 1391 if (len > 4)
1392 { 1392 {
@@ -1439,7 +1439,7 @@ static __callback BOOL DIAMONDAPI CabCGetNextCabinet(
1439 else 1439 else
1440 { 1440 {
1441 LPCWSTR wzSourcePath = pcd->prgFiles[0].pwzSourcePath; 1441 LPCWSTR wzSourcePath = pcd->prgFiles[0].pwzSourcePath;
1442 pwzFileToken = FileFromPath(wzSourcePath); 1442 pwzFileToken = PathFile(wzSourcePath);
1443 } 1443 }
1444 1444
1445 // The call back to Binder to Add File Transfer for new Cab and add new Cab to Media table 1445 // The call back to Binder to Add File Transfer for new Cab and add new Cab to Media table