common

Timestamp:

Jul 7, 2009 12:38:19 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService/common: Differ between crOGL amd64 and x86 DLLs.

File:

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

-              r21246
+              r21323
     GetWindowsDirectory(szWinDir, _MAX_PATH);
     swprintf(szDriversDir, (_MAX_PATH + 32), TEXT("%s\\drivers"), szSysDir);
+#ifdef RT_ARCH_AMD64
+    TCHAR szSysWowDir[_MAX_PATH + 32] = {0};
+    swprintf(szSysWowDir, (_MAX_PATH + 32), TEXT("%s\\SysWow64"), szWinDir);
+#endif
     /* The file information table. */
 …
         { szSysDir, TEXT("VBoxGINA.dll"), },
+ /* On 64-bit we don't yet have the OpenGL DLLs in native format.
+    So just enumerate the 32-bit files in the SYSWOW directory. */
+ #ifdef RT_ARCH_AMD64
+        { szSysWowDir, TEXT("VBoxOGLarrayspu.dll"), },
+        { szSysWowDir, TEXT("VBoxOGLcrutil.dll"), },
+        { szSysWowDir, TEXT("VBoxOGLerrorspu.dll"), },
+        { szSysWowDir, TEXT("VBoxOGLpackspu.dll"), },
+        { szSysWowDir, TEXT("VBoxOGLpassthroughspu.dll"), },
+        { szSysWowDir, TEXT("VBoxOGLfeedbackspu.dll"), },
+        { szSysWowDir, TEXT("VBoxOGL.dll"), },
+ #else
         { szSysDir, TEXT("VBoxOGLarrayspu.dll"), },
         { szSysDir, TEXT("VBoxOGLcrutil.dll"), },
 …
         { szSysDir, TEXT("VBoxOGLpassthroughspu.dll"), },
         { szSysDir, TEXT("VBoxOGLfeedbackspu.dll"), },
+        { szSysDir, TEXT("VBoxOGL.dll"), },
+        { szSysDir, TEXT("VBoxOGL.dll"), },
+ #endif
         { szDriversDir, TEXT("VBoxGuest.sys"), },

Note: See TracChangeset for help on using the changeset viewer.