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

Timestamp:

Nov 9, 2009 4:05:42 PM (15 years ago)

Author:

vboxsync

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

54616

Message:

NetFltInstall: Fixed installation errors, added todos.

File:

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

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

@@ -55 +55 @@
             if(hr == S_OK)
             {
-                DWORD WinEr;
-                GetFullPathNameW(VBOX_NETFLT_PT_INF, sizeof(PtInf)/sizeof(PtInf[0]), PtInf, NULL);
-                WinEr = GetLastError();
-                if(WinEr == ERROR_SUCCESS)
+                DWORD dwSize;
+                dwSize = GetFullPathNameW(VBOX_NETFLT_PT_INF, sizeof(PtInf)/sizeof(PtInf[0]), PtInf, NULL);
+                if(dwSize > 0)
                 {
-                    GetFullPathNameW(VBOX_NETFLT_MP_INF, sizeof(MpInf)/sizeof(MpInf[0]), MpInf, NULL);
-                    WinEr = GetLastError();
-                    if(WinEr == ERROR_SUCCESS)
+                    /** @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);
+                    if(dwSize > 0)
                     {
+                        /** @todo add size check for (sizeof(MpInf)/sizeof(MpInf[0])) == dwSize (string length in sizeof(MpInf[0])) */
+
                         LPCWSTR aInfs[] = {PtInf, MpInf};
                         hr = VBoxNetCfgWinNetFltInstall(pnc, aInfs, 2);
@@ -78 +80 @@
                     else
                     {
-                        hr =  HRESULT_FROM_WIN32(WinEr);
+                        hr =  HRESULT_FROM_WIN32(GetLastError());
                         wprintf(L"error getting full inf path for VBoxNetFlt_m.inf (0x%x)\n", hr);
                     }
@@ -84 +86 @@
                 else
                 {
-                    hr =  HRESULT_FROM_WIN32(WinEr);
+                    hr =  HRESULT_FROM_WIN32(GetLastError());
                     wprintf(L"error getting full inf path for VBoxNetFlt.inf (0x%x)\n", hr);
                 }