applied patch #1081497 - Fix for LibraryLocal to allow DLL's with a UNC path
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3818 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
eb24f3cb99
commit
aea5022f96
2 changed files with 3 additions and 3 deletions
|
@ -51,7 +51,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
|
||||||
|
|
||||||
filepath.append(filename);
|
filepath.append(filename);
|
||||||
|
|
||||||
} else if (filename.substr(0, 1).compare("\\") == 0) {
|
} else if ((filename.substr(0, 1).compare("\\") == 0) && (filename.substr(1, 1).compare("\\") != 0)) {
|
||||||
|
|
||||||
// Path is relative to current root
|
// Path is relative to current root
|
||||||
|
|
||||||
|
@ -108,7 +108,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
|
||||||
DWORD versionsize;
|
DWORD versionsize;
|
||||||
DWORD temp;
|
DWORD temp;
|
||||||
|
|
||||||
versionsize = GetFileVersionInfoSize(filepath.c_str(), &temp);
|
versionsize = GetFileVersionInfoSize((char*)filepath.c_str(), &temp);
|
||||||
|
|
||||||
if (versionsize)
|
if (versionsize)
|
||||||
{
|
{
|
||||||
|
@ -122,7 +122,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
|
||||||
UINT uLen;
|
UINT uLen;
|
||||||
VS_FIXEDFILEINFO *pvsf;
|
VS_FIXEDFILEINFO *pvsf;
|
||||||
|
|
||||||
if (GetFileVersionInfo(filepath.c_str(), 0, versionsize, buf) && VerQueryValue(buf, "\\", (void**)&pvsf,&uLen))
|
if (GetFileVersionInfo((char*)filepath.c_str(), 0, versionsize, buf) && VerQueryValue(buf, "\\", (void**)&pvsf,&uLen))
|
||||||
{
|
{
|
||||||
high = pvsf->dwFileVersionMS;
|
high = pvsf->dwFileVersionMS;
|
||||||
low = pvsf->dwFileVersionLS;
|
low = pvsf->dwFileVersionLS;
|
||||||
|
|
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue