[ros-diffs] [akhaldi] 71728: [VERSION] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sat Jul  2 12:58:50 2016
New Revision: 71728

URL: http://svn.reactos.org/svn/reactos?rev=71728&view=rev
Log:
[VERSION] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/reactos/dll/win32/version/version.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/version/version.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/version.c...
==============================================================================
--- trunk/reactos/dll/win32/version/version.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/version/version.c	[iso-8859-1] Sat Jul  2 12:58:50 2016
@@ -694,7 +694,12 @@
         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 @@

fileinfo.cBytes = sizeof(OFSTRUCT);

-    strcpy(filename, path);
-    filenamelen = strlen(filename);
-
-    /* Add a trailing \ if necessary */
-    if(filenamelen) {
-	if(filename[filenamelen - 1] != '\')
-	    strcat(filename, "\");
-    }
-    else /* specify the current directory */
-	strcpy(filename, ".\");
+    if (path)
+    {
+        strcpy(filename, path);
+        filenamelen = strlen(filename);
+
+        /* Add a trailing \ if necessary */
+        if(filenamelen)
+        {
+            if(filename[filenamelen - 1] != '\')
+                strcat(filename, "\");
+        }
+        else /* specify the current directory */
+            strcpy(filename, ".\");
+    }
+    else
+        filename[0] = 0;

/* Create the full pathname */
     strcat(filename, file);
@@ -1208,10 +1219,10 @@
         {
             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 @@
             GetWindowsDirectoryA( winDir, MAX_PATH );
             if(testFileExistenceA(destDir, lpszFilename, FALSE)) curDir = destDir;
             else if(testFileExistenceA(winDir, lpszFilename, FALSE))
+                curDir = winDir;
+            else if(testFileExistenceA(systemDir, lpszFilename, FALSE))
+                curDir = systemDir;
+
+            if (lpszAppDir && lpszAppDir[0])
             {
-                curDir = winDir;
+                if(!testFileExistenceA(lpszAppDir, lpszFilename, FALSE))
+                    retval |= VFF_CURNEDEST;
+            }
+            else if(testFileExistenceA(NULL, lpszFilename, FALSE))
                 retval |= VFF_CURNEDEST;
-            }
-            else if(testFileExistenceA(systemDir, lpszFilename, FALSE))
-            {
-                curDir = systemDir;
-                retval |= VFF_CURNEDEST;
-            }
         }
     }

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Jul  2 12:58:50 2016
@@ -196,7 +196,7 @@
 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