Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 12:04:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VERSION] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-24 13:10:33 +01:00
parent ff857de1ad
commit 28928748f1
2 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
dll/win32/version/version.c
View file

@ -705,7 +705,12 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h
return (len * 2) + 4; return (len * 2) + 4;
default: 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; return 0;
} }
} }
@ -1124,16 +1129,22 @@ static int testFileExistenceA( char const * path, char const * file, BOOL excl )
fileinfo.cBytes = sizeof(OFSTRUCT); fileinfo.cBytes = sizeof(OFSTRUCT);
if (path)
{
strcpy(filename, path); strcpy(filename, path);
filenamelen = strlen(filename); filenamelen = strlen(filename);
/* Add a trailing \ if necessary */ /* Add a trailing \ if necessary */
if(filenamelen) { if(filenamelen)
{
if(filename[filenamelen - 1] != '\\') if(filename[filenamelen - 1] != '\\')
strcat(filename, "\\"); strcat(filename, "\\");
} }
else /* specify the current directory */ else /* specify the current directory */
strcpy(filename, ".\\"); strcpy(filename, ".\\");
}
else
filename[0] = 0;
/* Create the full pathname */ /* Create the full pathname */
strcat(filename, file); strcat(filename, file);
@ -1223,12 +1234,12 @@ DWORD WINAPI VerFindFileA(
{ {
if(testFileExistenceA(destDir, lpszFilename, FALSE)) curDir = destDir; if(testFileExistenceA(destDir, lpszFilename, FALSE)) curDir = destDir;
else if(lpszAppDir && testFileExistenceA(lpszAppDir, lpszFilename, FALSE)) else if(lpszAppDir && testFileExistenceA(lpszAppDir, lpszFilename, FALSE))
{
curDir = lpszAppDir; curDir = lpszAppDir;
if(!testFileExistenceA(systemDir, lpszFilename, FALSE))
retval |= VFF_CURNEDEST; retval |= VFF_CURNEDEST;
} }
} }
}
else /* not a shared file */ else /* not a shared file */
{ {
destDir = lpszAppDir ? lpszAppDir : ""; destDir = lpszAppDir ? lpszAppDir : "";
@ -1237,15 +1248,17 @@ DWORD WINAPI VerFindFileA(
GetWindowsDirectoryA( winDir, MAX_PATH ); GetWindowsDirectoryA( winDir, MAX_PATH );
if(testFileExistenceA(destDir, lpszFilename, FALSE)) curDir = destDir; if(testFileExistenceA(destDir, lpszFilename, FALSE)) curDir = destDir;
else if(testFileExistenceA(winDir, lpszFilename, FALSE)) else if(testFileExistenceA(winDir, lpszFilename, FALSE))
{
curDir = winDir; curDir = winDir;
retval |= VFF_CURNEDEST;
}
else if(testFileExistenceA(systemDir, lpszFilename, FALSE)) else if(testFileExistenceA(systemDir, lpszFilename, FALSE))
{
curDir = systemDir; curDir = systemDir;
if (lpszAppDir && lpszAppDir[0])
{
if(!testFileExistenceA(lpszAppDir, lpszFilename, FALSE))
retval |= VFF_CURNEDEST; retval |= VFF_CURNEDEST;
} }
else if(testFileExistenceA(NULL, lpszFilename, FALSE))
retval |= VFF_CURNEDEST;
} }
} }

2
media/doc/README.WINE
View file

@ -192,7 +192,7 @@ reactos/dll/win32/urlmon # Synced to WineStaging-3.3
reactos/dll/win32/usp10 # Synced to WineStaging-3.3 reactos/dll/win32/usp10 # Synced to WineStaging-3.3
reactos/dll/win32/uxtheme # Forked reactos/dll/win32/uxtheme # Forked
reactos/dll/win32/vbscript # Synced to WineStaging-3.3 reactos/dll/win32/vbscript # Synced to WineStaging-3.3
reactos/dll/win32/version # Synced to Wine-3.0 reactos/dll/win32/version # Synced to WineStaging-3.3
reactos/dll/win32/vssapi # Synced to WineStaging-2.9 reactos/dll/win32/vssapi # Synced to WineStaging-2.9
reactos/dll/win32/wbemdisp # Synced to Wine-3.0 reactos/dll/win32/wbemdisp # Synced to Wine-3.0
reactos/dll/win32/wbemprox # Synced to Wine-3.0 reactos/dll/win32/wbemprox # Synced to Wine-3.0