netprofm: Fix connection_GetAdapterId returning incorrect network ada…

…pter GUID.
besentv · Feb 6, 2021 · a717949 · a717949
1 parent 4f1b297
commit a717949
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = netprofm.dll
-IMPORTS   = iphlpapi
+IMPORTS   = iphlpapi ole32
 
 EXTRADLLFLAGS = -mno-cygwin
 

diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c
@@ -1586,10 +1586,15 @@ static HRESULT WINAPI connection_GetAdapterId(
     GUID *pgdAdapterId )
 {
     struct connection *connection = impl_from_INetworkConnection( iface );
-
-    FIXME( "%p, %p\n", iface, pgdAdapterId );
+    LPOLESTR adapterIdStr;
 
     *pgdAdapterId = connection->id;
+
+    /*Debug*/
+    StringFromCLSID(pgdAdapterId, &adapterIdStr);
+    FIXME("Iface: %p, AdapterId %ls\n", iface, adapterIdStr);
+    heap_free(adapterIdStr);
+
     return S_OK;
 }
 
@@ -1737,7 +1742,10 @@ static void init_networks( struct list_manager *mgr )
         struct network *network;
         struct connection *connection;
 
-        id.Data1 = aa->u.s.IfIndex;
+        /*Convert adapter name (GUID string) to GUID struct*/
+        OLECHAR adapterGuidString[39];
+        MultiByteToWideChar(CP_ACP, 0, aa->AdapterName, -1, adapterGuidString, 39);
+        if(CLSIDFromString(adapterGuidString, &id)) goto done;
 
         /* assume a one-to-one mapping between networks and connections */
         if (!(network = create_network( &id ))) goto done;