Re: [PATCH] Fix WOW64 process system DLL paths

[Simon Marchi <simark@simark.ca>]

On 2020-03-24 1:17 p.m., Hannes Domani via Gdb-patches wrote:
> diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
> index 9c5ea5c046..6f46d3d361 100644
> --- a/gdb/windows-nat.c
> +++ b/gdb/windows-nat.c
> @@ -1993,6 +1993,21 @@ windows_add_all_dlls (void)
>  	return;
>      }
>  
> +#ifdef __x86_64__
> +  char system_dir[__PMAX];
> +  char syswow_dir[__PMAX];
> +  size_t system_dir_len = 0;
> +  size_t syswow_dir_len = 0;
> +  if (wow64_process)
> +    {
> +      GetSystemDirectoryA (system_dir, __PMAX);
> +      GetSystemWow64DirectoryA (syswow_dir, __PMAX);

This functions are documented to possibly fail, so let's check the return value.
If there is not imaginable reason why they would fail, then I using an assertion
is fine.  We should also check that we have passed a large enough buffer.

For example:

  UINT len = GetSystemDirectoryA (system_dir, sizeof (system_dir));

  /* Error check.  */
  gdb_assert (len != 0);

  /* Check that we have passed a large enough buffer.  */
  gdb_assert (len < sizeof (system_dir));


> +      strcat (system_dir, "\\");
> +      strcat (syswow_dir, "\\");
> +      system_dir_len = strlen (system_dir);
> +      syswow_dir_len = strlen (syswow_dir);
> +    }
> +#endif
>    for (i = 1; i < (int) (cb_needed / sizeof (HMODULE)); i++)
>      {
>        MODULEINFO mi;
> @@ -2014,6 +2029,19 @@ windows_add_all_dlls (void)
>  #else
>        name = dll_name;
>  #endif
> +#ifdef __x86_64__
> +      /* Convert the DLL path of WOW64 processes returned by
> +	 GetModuleFileNameEx from the 64bit system directory to the
> +	 32bit syswow64 directory if necessary.  */
> +      if (wow64_process
> +	  && strncasecmp (name, system_dir, system_dir_len) == 0
> +	  && strchr (name + system_dir_len, '\\') == nullptr)
> +	{
> +	  strcpy (syswow_dir + syswow_dir_len, name + system_dir_len);
> +	  strcpy (name, syswow_dir);
> +	  syswow_dir[syswow_dir_len] = 0;
> +	}
> +#endif

Here, I wouldn't mind if you used some std::string a bit more to make
the string less error-prone (even if it involves a bit more copying),
but it's as you wish.

Simon