diff options
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/sceutil.cpp')
-rw-r--r-- | src/libs/dutil/WixToolset.DUtil/sceutil.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/sceutil.cpp b/src/libs/dutil/WixToolset.DUtil/sceutil.cpp index cdb1623b..4eede74f 100644 --- a/src/libs/dutil/WixToolset.DUtil/sceutil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/sceutil.cpp | |||
@@ -1491,11 +1491,8 @@ static HRESULT CreateSqlCe( | |||
1491 | // If that failed, fallback to loading from current path | 1491 | // If that failed, fallback to loading from current path |
1492 | if (NULL == *phSqlCeDll) | 1492 | if (NULL == *phSqlCeDll) |
1493 | { | 1493 | { |
1494 | hr = DirGetCurrent(&sczDirectory); | 1494 | hr = PathGetFullPathName(wzSqlCeDllPath, &sczDllFullPath, NULL, NULL); |
1495 | ExitOnFailure(hr, "Failed to get current directory"); | 1495 | ExitOnFailure(hr, "Failed to get full path for DLL"); |
1496 | |||
1497 | hr = PathConcat(sczDirectory, wzSqlCeDllPath, &sczDllFullPath); | ||
1498 | ExitOnFailure(hr, "Failed to concatenate current directory and DLL filename"); | ||
1499 | 1496 | ||
1500 | *phSqlCeDll = ::LoadLibraryW(sczDllFullPath); | 1497 | *phSqlCeDll = ::LoadLibraryW(sczDllFullPath); |
1501 | ExitOnNullWithLastError(*phSqlCeDll, hr, "Failed to open Sql CE DLL: %ls", sczDllFullPath); | 1498 | ExitOnNullWithLastError(*phSqlCeDll, hr, "Failed to open Sql CE DLL: %ls", sczDllFullPath); |