Changeset 25072 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Nov 28, 2009 8:14:17 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

55425

Message:

NetFltInstall.cpp: proposal for making it work when the current directory != executable directory.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/NetFltInstall.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/NetFltInstall.cpp

@@ -36 +36 @@
 }
 
+/** Wrapper aroung GetfullPathNameW that will try an alternative INF location.
+ *  
+ * The default location is the current directory.  If not found there, the 
+ * alternative locatoin is the executable directory.  If not found there either, 
+ * the first alternative is present to the caller. 
+ */ 
+static DWORD MyGetfullPathNameW(LPCWSTR pwszName, size_t cchFull, LPWSTR pwszFull)
+{
+#ifdef DEBUG_bird  /** @todo make this default behavior after 3.1. */
+    LPWSTR pwszFilePart;
+    DWORD dwSize = GetFullPathNameW(pwszName, cchFull, pwszFull, &pwszFilePart);
+    if(dwSize <= 0)
+        return dwSize;
+
+    /* if it doesn't exist, see if the file exists in the same directory as the executable. */
+    if (GetFileAttributesW(pwszFull) == INVALID_FILE_ATTRIBUTES)
+    {
+        WCHAR wsz[512];
+        DWORD cch = GetModuleFileNameW(GetModuleHandle(NULL), &wsz[0], sizeof(wsz) / sizeof(wsz[0]));
+        if(cch > 0)
+        {
+            while(cch > 0 && wsz[cch - 1] != '/' && wsz[cch - 1] != '\\' && wsz[cch - 1] != ':')
+                cch--;
+            unsigned i = 0;
+            while(cch < sizeof(wsz) / sizeof(wsz[0]))
+            {
+                wsz[cch] = pwszFilePart[i++];
+                if(!wsz[cch])
+                {
+                    dwSize = GetFullPathNameW(wsz, cchFull, pwszFull, NULL);
+                    if(   dwSize > 0 
+                       && GetFileAttributesW(pwszFull) != INVALID_FILE_ATTRIBUTES)
+                        return dwSize;
+                    break;
+                }
+                cch++;
+            }
+        }
+    }
+
+    /* fallback */
+#endif
+    return GetFullPathNameW(pwszName, cchFull, pwszFull, NULL);
+}
+
 static int InstallNetFlt()
 {
@@ -56 +101 @@
             {
                 DWORD dwSize;
-                dwSize = GetFullPathNameW(VBOX_NETFLT_PT_INF, sizeof(PtInf)/sizeof(PtInf[0]), PtInf, NULL);
+                dwSize = MyGetfullPathNameW(VBOX_NETFLT_PT_INF, sizeof(PtInf)/sizeof(PtInf[0]), PtInf);
                 if(dwSize > 0)
                 {
                     /** @todo add size check for (sizeof(PtInf)/sizeof(PtInf[0])) == dwSize (string length in sizeof(PtInf[0])) */
 
-                    dwSize = GetFullPathNameW(VBOX_NETFLT_MP_INF, sizeof(MpInf)/sizeof(MpInf[0]), MpInf, NULL);
+                    dwSize = MyGetfullPathNameW(VBOX_NETFLT_MP_INF, sizeof(MpInf)/sizeof(MpInf[0]), MpInf);
                     if(dwSize > 0)
                     {