[ros-diffs] [cwittich] 27383: fixed vmware video driver installation in vmware 6

[cwittich at svn.reactos.org]

Author: cwittich
Date: Wed Jul  4 14:17:28 2007
New Revision: 27383

URL: http://svn.reactos.org/svn/reactos?rev=27383&view=rev
Log:
fixed vmware video driver installation in vmware 6

Modified:
    trunk/reactos/base/setup/vmwinst/vmwinst.c

Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst.c?rev=27383&r1=27382&r2=27383&view=diff
==============================================================================
--- trunk/reactos/base/setup/vmwinst/vmwinst.c (original)
+++ trunk/reactos/base/setup/vmwinst/vmwinst.c Wed Jul  4 14:17:28 2007
@@ -49,6 +49,7 @@
 static WCHAR DestinationPath[MAX_PATH+1];
 static WCHAR *vmx_fb = L"vmx_fb.dll";
 static WCHAR *vmx_mode = L"vmx_mode.dll";
+static WCHAR *vmx_mode_v6 = L"vmx mode.dll";
 static WCHAR *vmx_svga = L"vmx_svga.sys";
 
 static WCHAR *SrcPath = PathToVideoDrivers45;
@@ -171,7 +172,7 @@
       PathToVideoDrivers45[0] = Current;
       if(SetCurrentDirectory(PathToVideoDrivers60))
         SrcPath = PathToVideoDrivers60;
-      if(SetCurrentDirectory(PathToVideoDrivers55))
+      else if(SetCurrentDirectory(PathToVideoDrivers55))
         SrcPath = PathToVideoDrivers55;
       else if(SetCurrentDirectory(PathToVideoDrivers45))
         SrcPath = PathToVideoDrivers45;
@@ -184,7 +185,7 @@
       }
 
       if(FileExists(SrcPath, vmx_fb) &&
-         FileExists(SrcPath, vmx_mode) &&
+         (FileExists(SrcPath, vmx_mode) || FileExists(SrcPath, vmx_mode_v6)) &&
          FileExists(SrcPath, vmx_svga))
       {
         *Drv = Current;