[ros-diffs] [gvg] 18436: Merge from trunk. Mike <[e-mail]>:

Merge from trunk. Mike [e-mail]:
Add installation path for VMware 5.5. Fixes bug 907.
Modified:
branches/ros-branch-0_2_8/reactos/subsys/system/vmwinst/vmwinst.c
  _____

Modified:
branches/ros-branch-0_2_8/reactos/subsys/system/vmwinst/vmwinst.c
--- branches/ros-branch-0_2_8/reactos/subsys/system/vmwinst/vmwinst.c
2005-10-14 08:03:14 UTC (rev 18435)
+++ branches/ros-branch-0_2_8/reactos/subsys/system/vmwinst/vmwinst.c
2005-10-14 09:27:30 UTC (rev 18436)
@@ -41,6 +41,7 @@

static WCHAR DestinationDriversPath[MAX_PATH+1];
 static WCHAR CDDrive = L'\0';
+static WCHAR PathToVideoDrivers55[MAX_PATH+1] = L"X:\program
files\VMware\VMware Tools\Drivers\video\winnt2k\32Bit\";
 static WCHAR PathToVideoDrivers45[MAX_PATH+1] = L"X:\program
files\VMware\VMware Tools\Drivers\video\winnt2k\";
 static WCHAR PathToVideoDrivers40[MAX_PATH+1] =
L"X:\video\winnt2k\";
 static WCHAR DestinationPath[MAX_PATH+1];
@@ -223,9 +224,12 @@
     if(GetDriveType(Drive) == DRIVE_CDROM)
     {
 #endif
+      PathToVideoDrivers55[0] = Current;
       PathToVideoDrivers40[0] = Current;
       PathToVideoDrivers45[0] = Current;
-      if(SetCurrentDirectory(PathToVideoDrivers45))
+      if(SetCurrentDirectory(PathToVideoDrivers55))
+        SrcPath = PathToVideoDrivers55;
+      else if(SetCurrentDirectory(PathToVideoDrivers45))
         SrcPath = PathToVideoDrivers45;
       else if(SetCurrentDirectory(PathToVideoDrivers40))
         SrcPath = PathToVideoDrivers40;