[NETSH] Create a root helper object

The root helper object is required to load ifmon.dll from WinXP.

Author: EricKohl

base/applications/network/netsh/helper.c

@@ -214,9 +214,6 @@ LoadHelperDll(
         goto done;
     }
 
-//    if (pEntry->Attributes.pfnStart)
-//        pEntry->Attributes.pfnStart(NULL, 0);
-
     if (bRegister)
         RegisterHelperDll(pEntry);
 
@@ -244,6 +241,24 @@ LoadHelperDll(
 }
 
 
+DWORD
+CreateRootHelper(VOID)
+{
+    PHELPER_ENTRY pHelper;
+
+    pHelper = (PHELPER_ENTRY)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HELPER_ENTRY));
+    if (pHelper == NULL)
+        return ERROR_OUTOFMEMORY;
+
+    /* FIXME: More to initialize here? */
+
+    pHelperListHead = pHelper;
+    pHelperListTail = pHelper;
+
+    return ERROR_SUCCESS;
+}
+
+
 VOID
 LoadHelpers(VOID)
 {
@@ -389,6 +404,11 @@ RegisterHelper(
         goto done;
     }
 
+    DPRINT("Guid: %lx\n", pHelperAttributes->guidHelper.Data1);
+    DPRINT("dwVersion: %lu\n", pHelperAttributes->dwVersion);
+    DPRINT("pfnStart: %p\n", pHelperAttributes->pfnStart);
+    DPRINT("pfnStop: %p\n", pHelperAttributes->pfnStop);
+
     CopyMemory(&pHelper->Attributes, pHelperAttributes, sizeof(NS_HELPER_ATTRIBUTES));
     pHelper->pDllEntry = pCurrentDll;
     DPRINT("pHelper->pDllEntry: %p\n", pHelper->pDllEntry);
@@ -413,7 +433,7 @@ RegisterHelper(
         pParentHelper = FindHelper(pguidParentHelper, pHelperListHead);
         if (pParentHelper == NULL)
         {
-            DPRINT("Parent helper not found!\n");
+            DPRINT("Parent helper %lx not found!\n", pguidParentHelper->Data1);
             return ERROR_INVALID_PARAMETER;
         }
 
@@ -543,6 +563,7 @@ PrintHelpers(
     PCONTEXT_ENTRY pContext;
     WCHAR szIndent[22];
     DWORD i;
+    GUID RootGuid = NETSH_ROOT_GUID;
 
     for (i = 0; i < min(dwLevel, 10) * 2; i++)
         szIndent[i] = L' ';
@@ -551,28 +572,37 @@ PrintHelpers(
     pHelper = pHelperListHead;
     while (pHelper != NULL)
     {
-        pContext = FindContextByGuid(&pHelper->Attributes.guidHelper);
-        if (pContext)
+        DPRINT("Helper GUID: %lx\n", pHelper->Attributes.guidHelper.Data1);
+
+        if (!IsEqualGUID(&pHelper->Attributes.guidHelper, &RootGuid))
         {
-            ConPrintf(StdOut,
-                      L"{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}  %-16s  %s%s\n",
-                      pHelper->Attributes.guidHelper.Data1,
-                      pHelper->Attributes.guidHelper.Data2,
-                      pHelper->Attributes.guidHelper.Data3,
-                      pHelper->Attributes.guidHelper.Data4[0],
-                      pHelper->Attributes.guidHelper.Data4[1],
-                      pHelper->Attributes.guidHelper.Data4[2],
-                      pHelper->Attributes.guidHelper.Data4[3],
-                      pHelper->Attributes.guidHelper.Data4[4],
-                      pHelper->Attributes.guidHelper.Data4[5],
-                      pHelper->Attributes.guidHelper.Data4[6],
-                      pHelper->Attributes.guidHelper.Data4[7],
-                      pHelper->pDllEntry->pszShortName,
-                      szIndent,
-                      pContext->pszContextName);
+
+            pContext = FindContextByGuid(&pHelper->Attributes.guidHelper);
+            DPRINT("pContext: %p\n", pContext);
+            if (pContext)
+            {
+                ConPrintf(StdOut,
+                          L"{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}  %-16s  %s%s\n",
+                          pHelper->Attributes.guidHelper.Data1,
+                          pHelper->Attributes.guidHelper.Data2,
+                          pHelper->Attributes.guidHelper.Data3,
+                          pHelper->Attributes.guidHelper.Data4[0],
+                          pHelper->Attributes.guidHelper.Data4[1],
+                          pHelper->Attributes.guidHelper.Data4[2],
+                          pHelper->Attributes.guidHelper.Data4[3],
+                          pHelper->Attributes.guidHelper.Data4[4],
+                          pHelper->Attributes.guidHelper.Data4[5],
+                          pHelper->Attributes.guidHelper.Data4[6],
+                          pHelper->Attributes.guidHelper.Data4[7],
+                          pHelper->pDllEntry->pszShortName,
+                          szIndent,
+                          pContext->pszContextName);
+            }
+
+            dwLevel++;
         }
 
-        PrintHelpers(pHelper->pSubHelperHead, dwLevel + 1);
+        PrintHelpers(pHelper->pSubHelperHead, dwLevel);
 
         pHelper = pHelper->pNext;
     }

base/applications/network/netsh/netsh.c

@@ -66,6 +66,7 @@ wmain(
     ConInitStdStreams();
 
     /* FIXME: Init code goes here */
+    CreateRootHelper();
     CreateRootContext();
     LoadHelpers();
 

base/applications/network/netsh/netsh.spec

@@ -14,6 +14,8 @@
 @ stdcall MatchEnumTag(ptr wstr long ptr ptr)
 @ stub MatchTagsInCmdLine
 @ stdcall MatchToken(wstr wstr)
+@ stub NsGetFriendlyNameFromIfName
+@ stub NsGetIfNameFromFriendlyName
 @ stdcall PreprocessCommand(ptr ptr long long ptr long long long ptr)
 @ varargs PrintError(ptr long)
 @ stub PrintErrorLog

base/applications/network/netsh/precomp.h

@@ -178,6 +178,10 @@ HelpSubcontexts(
 #endif
 
 /* helper.c */
+
+DWORD
+CreateRootHelper(VOID);
+
 VOID
 LoadHelpers(VOID);
 

sdk/include/psdk/netsh.h

@@ -5,6 +5,16 @@
 extern "C" {
 #endif
 
+typedef enum _NS_REQS
+{
+    NS_REQ_ZERO = 0,
+    NS_REQ_PRESENT = 1,
+    NS_REQ_ALLOW_MULTIPLE = 2,
+    NS_REQ_ONE_OR_MORE = 3
+} NS_REQS;
+
+#define NETSH_ROOT_GUID          {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}}
+
 typedef
 DWORD
 (WINAPI *PGET_RESOURCE_STRING_FN)(
@@ -164,7 +174,7 @@ MatchToken(
 DWORD
 WINAPI
 PreprocessCommand(
-    _In_ HANDLE hModule,
+    _In_opt_ HANDLE hModule,
     _Inout_ LPWSTR *ppwcArguments,
     _In_ DWORD dwCurrentIndex,
     _In_ DWORD dwArgCount,