From a941582fa2cb295eb51b5119888b25539b48bc96 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Wed, 4 Jul 2007 10:17:28 +0000 Subject: [PATCH] fixed vmware video driver installation in vmware 6 svn path=/trunk/; revision=27383 --- reactos/base/setup/vmwinst/vmwinst.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/reactos/base/setup/vmwinst/vmwinst.c b/reactos/base/setup/vmwinst/vmwinst.c index 9e67479c95d..bd61f3daa45 100644 --- a/reactos/base/setup/vmwinst/vmwinst.c +++ b/reactos/base/setup/vmwinst/vmwinst.c @@ -49,6 +49,7 @@ static WCHAR PathToVideoDrivers40[MAX_PATH+1] = L"X:\\video\\winnt2k\\"; 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 @@ IsVMwareCDInDrive(WCHAR *Drv) 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 @@ IsVMwareCDInDrive(WCHAR *Drv) } if(FileExists(SrcPath, vmx_fb) && - FileExists(SrcPath, vmx_mode) && + (FileExists(SrcPath, vmx_mode) || FileExists(SrcPath, vmx_mode_v6)) && FileExists(SrcPath, vmx_svga)) { *Drv = Current;