From: Bernhard <besentv@gmail.com>
Subject: Re: [PATCH] netprofm: Fix connection_GetAdapterId return wrong GUID.
Message-Id: <CAAWc_o+ryoiiHSJpHhUENZ5KtfOD+aof5h_8meZUp3yQyhb0bw@mail.gmail.com>
Date: Wed, 24 Feb 2021 20:27:19 +0100
In-Reply-To: <20210208220355.225975-1-besentv@gmail.com>
References: <20210208220355.225975-1-besentv@gmail.com>

Hey everyone,

I submitted this recently and just wanted to ask for an official
feedback/review on this patch.
I'm not really familiar with the Wine codebase, so good advice is
appreciated.

Greetings
Bernhard

On Mon, Feb 8, 2021 at 11:03 PM Bernhard Kölbl <besentv@gmail.com> wrote:

> The index of a network interface is not a valid GUID.
> AdapterName holds the correct GUID and should be used instead.
>
> Signed-off-by: Bernhard Kölbl <besentv@gmail.com>
> ---
>  dlls/netprofm/Makefile.in |  2 +-
>  dlls/netprofm/list.c      | 12 ++++++++----
>  2 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in
> index d57d1d60c45..3d1d225d3df 100644
> --- 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
> index f9b9e2ea312..b37d7e2943e 100644
> --- a/dlls/netprofm/list.c
> +++ b/dlls/netprofm/list.c
> @@ -1587,9 +1587,10 @@ static HRESULT WINAPI connection_GetAdapterId(
>  {
>      struct connection *connection = impl_from_INetworkConnection( iface );
>
> -    FIXME( "%p, %p\n", iface, pgdAdapterId );
> -
>      *pgdAdapterId = connection->id;
> +
> +    TRACE("Iface: %p, AdapterId %s\n", iface,
> wine_dbgstr_guid(pgdAdapterId));
> +
>      return S_OK;
>  }
>
> @@ -1736,8 +1737,11 @@ static void init_networks( struct list_manager *mgr
> )
>      {
>          struct network *network;
>          struct connection *connection;
> -
> -        id.Data1 = aa->u.s.IfIndex;
> +        OLECHAR adapter_guid_string[39];
> +
> +        /* Convert AdapterName (a GUID string) to a GUID struct */
> +        MultiByteToWideChar(CP_ACP, 0, aa->AdapterName, -1,
> adapter_guid_string, 39);
> +        if(CLSIDFromString(adapter_guid_string, &id)) goto done;
>
>          /* assume a one-to-one mapping between networks and connections */
>          if (!(network = create_network( &id ))) goto done;
> --
> 2.30.0
>
>

<div dir="ltr">Hey everyone,<div><br></div><div>I submitted this recently and just wanted to ask for an official feedback/review on this patch.</div><div>I&#39;m not really familiar with the Wine codebase, so good advice is appreciated.</div><div><br></div><div>Greetings</div><div>Bernhard</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Feb 8, 2021 at 11:03 PM Bernhard Kölbl &lt;<a href="mailto:besentv@gmail.com">besentv@gmail.com</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The index of a network interface is not a valid GUID.<br>
AdapterName holds the correct GUID and should be used instead.<br>
<br>
Signed-off-by: Bernhard Kölbl &lt;<a href="mailto:besentv@gmail.com" target="_blank">besentv@gmail.com</a>&gt;<br>
---<br>
 dlls/netprofm/Makefile.in |  2 +-<br>
 dlls/netprofm/list.c      | 12 ++++++++----<br>
 2 files changed, 9 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in<br>
index d57d1d60c45..3d1d225d3df 100644<br>
--- a/dlls/netprofm/Makefile.in<br>
+++ b/dlls/netprofm/Makefile.in<br>
@@ -1,5 +1,5 @@<br>
 MODULE    = netprofm.dll<br>
-IMPORTS   = iphlpapi<br>
+IMPORTS   = iphlpapi ole32<br>
<br>
 EXTRADLLFLAGS = -mno-cygwin<br>
<br>
diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c<br>
index f9b9e2ea312..b37d7e2943e 100644<br>
--- a/dlls/netprofm/list.c<br>
+++ b/dlls/netprofm/list.c<br>
@@ -1587,9 +1587,10 @@ static HRESULT WINAPI connection_GetAdapterId(<br>
 {<br>
     struct connection *connection = impl_from_INetworkConnection( iface );<br>
<br>
-    FIXME( &quot;%p, %p\n&quot;, iface, pgdAdapterId );<br>
-<br>
     *pgdAdapterId = connection-&gt;id;<br>
+<br>
+    TRACE(&quot;Iface: %p, AdapterId %s\n&quot;, iface, wine_dbgstr_guid(pgdAdapterId));<br>
+<br>
     return S_OK;<br>
 }<br>
<br>
@@ -1736,8 +1737,11 @@ static void init_networks( struct list_manager *mgr )<br>
     {<br>
         struct network *network;<br>
         struct connection *connection;<br>
-<br>
-        id.Data1 = aa-&gt;u.s.IfIndex;<br>
+        OLECHAR adapter_guid_string[39];<br>
+        <br>
+        /* Convert AdapterName (a GUID string) to a GUID struct */<br>
+        MultiByteToWideChar(CP_ACP, 0, aa-&gt;AdapterName, -1, adapter_guid_string, 39);<br>
+        if(CLSIDFromString(adapter_guid_string, &amp;id)) goto done;<br>
<br>
         /* assume a one-to-one mapping between networks and connections */<br>
         if (!(network = create_network( &amp;id ))) goto done;<br>
-- <br>
2.30.0<br>
<br>
</blockquote></div>