Changeset 40650 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/switcher

Timestamp:

Mar 26, 2012 3:16:14 PM (13 years ago)

Author:

vboxsync

Message:

wined3d/xpdm: better blacklisting

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/switcher/sw_common.c (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/switcher/sw_common.c

@@ -20 +20 @@
 #include "switcher.h"
 
-static char* gsBlackList[] = {"Dwm.exe", "java.exe", "javaw.exe", "javaws.exe"/*, "taskeng.exe"*/, NULL};
+static char* gsBlackListExe[] = {"Dwm.exe", "java.exe", "javaw.exe", "javaws.exe"/*, "taskeng.exe"*/, NULL};
+static char* gsBlackListDll[] = {"awt.dll", "wpfgfx_v0400.dll", "wpfgfx_v0300.dll", NULL};
 
 /* Checks if 3D is enabled for VM and it works on host machine */
@@ -47 +48 @@
 }
 
-BOOL checkOptions(void)
+BOOL checkOptionsDll(void)
+{
+    int i;
+    for (i=0; gsBlackListDll[i]; ++i)
+    {
+        if (GetModuleHandleA(gsBlackListDll[i]))
+            return FALSE;
+    }
+
+    return TRUE;
+}
+
+BOOL checkOptionsExe(void)
 {
     char name[1000];
@@ -69 +82 @@
     }
 
-    for (i=0; gsBlackList[i]; ++i)
+    for (i=0; gsBlackListExe[i]; ++i)
     {
-        if (!stricmp(filename, gsBlackList[i]))
+        if (!stricmp(filename, gsBlackListExe[i]))
             return FALSE;
     }
+
+    return TRUE;
+}
+
+BOOL checkOptions(void)
+{
+    if (!checkOptionsDll())
+        return FALSE;
+
+    if (!checkOptionsExe())
+        return FALSE;
 
     return TRUE;