mirror of
https://github.com/reactos/reactos.git
synced 2024-06-30 01:42:30 +00:00
[VERSION] Sync with Wine Staging 1.9.11. CORE-11368
svn path=/trunk/; revision=71728
This commit is contained in:
parent
b9122a338a
commit
487d9a6aed
|
@ -694,7 +694,12 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h
|
|||
return (len * 2) + 4;
|
||||
|
||||
default:
|
||||
SetLastError( lzfd == HFILE_ERROR ? ofs.nErrCode : ERROR_RESOURCE_DATA_NOT_FOUND );
|
||||
if (lzfd == HFILE_ERROR)
|
||||
SetLastError(ofs.nErrCode);
|
||||
else if (GetVersion() & 0x80000000)
|
||||
SetLastError(ERROR_FILE_NOT_FOUND);
|
||||
else
|
||||
SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
@ -1109,16 +1114,22 @@ static int testFileExistenceA( char const * path, char const * file, BOOL excl )
|
|||
|
||||
fileinfo.cBytes = sizeof(OFSTRUCT);
|
||||
|
||||
strcpy(filename, path);
|
||||
filenamelen = strlen(filename);
|
||||
if (path)
|
||||
{
|
||||
strcpy(filename, path);
|
||||
filenamelen = strlen(filename);
|
||||
|
||||
/* Add a trailing \ if necessary */
|
||||
if(filenamelen) {
|
||||
if(filename[filenamelen - 1] != '\\')
|
||||
strcat(filename, "\\");
|
||||
/* Add a trailing \ if necessary */
|
||||
if(filenamelen)
|
||||
{
|
||||
if(filename[filenamelen - 1] != '\\')
|
||||
strcat(filename, "\\");
|
||||
}
|
||||
else /* specify the current directory */
|
||||
strcpy(filename, ".\\");
|
||||
}
|
||||
else /* specify the current directory */
|
||||
strcpy(filename, ".\\");
|
||||
else
|
||||
filename[0] = 0;
|
||||
|
||||
/* Create the full pathname */
|
||||
strcat(filename, file);
|
||||
|
@ -1208,10 +1219,10 @@ DWORD WINAPI VerFindFileA(
|
|||
{
|
||||
if(testFileExistenceA(destDir, lpszFilename, FALSE)) curDir = destDir;
|
||||
else if(lpszAppDir && testFileExistenceA(lpszAppDir, lpszFilename, FALSE))
|
||||
{
|
||||
curDir = lpszAppDir;
|
||||
|
||||
if(!testFileExistenceA(systemDir, lpszFilename, FALSE))
|
||||
retval |= VFF_CURNEDEST;
|
||||
}
|
||||
}
|
||||
}
|
||||
else /* not a shared file */
|
||||
|
@ -1222,15 +1233,17 @@ DWORD WINAPI VerFindFileA(
|
|||
GetWindowsDirectoryA( winDir, MAX_PATH );
|
||||
if(testFileExistenceA(destDir, lpszFilename, FALSE)) curDir = destDir;
|
||||
else if(testFileExistenceA(winDir, lpszFilename, FALSE))
|
||||
{
|
||||
curDir = winDir;
|
||||
retval |= VFF_CURNEDEST;
|
||||
}
|
||||
else if(testFileExistenceA(systemDir, lpszFilename, FALSE))
|
||||
{
|
||||
curDir = systemDir;
|
||||
retval |= VFF_CURNEDEST;
|
||||
|
||||
if (lpszAppDir && lpszAppDir[0])
|
||||
{
|
||||
if(!testFileExistenceA(lpszAppDir, lpszFilename, FALSE))
|
||||
retval |= VFF_CURNEDEST;
|
||||
}
|
||||
else if(testFileExistenceA(NULL, lpszFilename, FALSE))
|
||||
retval |= VFF_CURNEDEST;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -196,7 +196,7 @@ reactos/dll/win32/urlmon # Synced to WineStaging-1.9.4
|
|||
reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11
|
||||
reactos/dll/win32/uxtheme # Forked
|
||||
reactos/dll/win32/vbscript # Synced to WineStaging-1.9.4
|
||||
reactos/dll/win32/version # Synced to WineStaging-1.9.4
|
||||
reactos/dll/win32/version # Synced to WineStaging-1.9.11
|
||||
reactos/dll/win32/vssapi # Synced to WineStaging-1.9.4
|
||||
reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.4
|
||||
reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.4
|
||||
|
|
Loading…
Reference in a new issue