[PATCH] Fix for bug 48773 adding empty implementation of RtlQueryEnvironmentVariable

[Alon Barzilai]

---
 dlls/ntdll/env.c      | 16 ++++++++++++++++
 dlls/ntdll/ntdll.spec |  1 +
 2 files changed, 17 insertions(+)
 mode change 100644 => 100755 dlls/ntdll/env.c
 mode change 100644 => 100755 dlls/ntdll/ntdll.spec

diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c
old mode 100644
new mode 100755
index 6670786def..a52abf1dbd
--- a/dlls/ntdll/env.c
+++ b/dlls/ntdll/env.c
@@ -976,6 +976,22 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env,
     return nts;
 }
 
+
+/******************************************************************
+ *		RtlQueryEnvironmentVariable   [NTDLL.@]
+ *
+ */
+NTSTATUS WINAPI RtlQueryEnvironmentVariable(PWSTR env,
+                                            PWSTR name,
+                                            size_t name_length,
+                                            PWSTR value,
+                                            size_t value_length,
+                                            PSIZE_T return_length)
+{
+    FIXME("RtlQueryEnvironmentVariable not implemented\n");
+    return STATUS_VARIABLE_NOT_FOUND;
+}
+
 /******************************************************************
  *		RtlSetCurrentEnvironment        [NTDLL.@]
  *
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
old mode 100644
new mode 100755
index 4f5fa8c21d..cbc43259bd
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -860,6 +860,7 @@
 @ stdcall RtlQueryDepthSList(ptr)
 @ stdcall RtlQueryDynamicTimeZoneInformation(ptr)
 @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr)
+@ stdcall RtlQueryEnvironmentVariable(ptr ptr long ptr long ptr)
 @ stdcall RtlQueryHeapInformation(long long ptr long ptr)
 @ stdcall RtlQueryInformationAcl(ptr ptr long long)
 @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr)
-- 
2.17.1

[Nikolay Sivov]

On Mon, Apr 27, 2020 at 9:55 AM Alon Barzilai <alon(a)skylinesoft.com> wrote:
> +
> +/******************************************************************
> + *             RtlQueryEnvironmentVariable   [NTDLL.@]
> + *
> + */
> +NTSTATUS WINAPI RtlQueryEnvironmentVariable(PWSTR env,
> +                                            PWSTR name,
> +                                            size_t name_length,
> +                                            PWSTR value,
> +                                            size_t value_length,
> +                                            PSIZE_T return_length)
> +{
> +    FIXME("RtlQueryEnvironmentVariable not implemented\n");
> +    return STATUS_VARIABLE_NOT_FOUND;
> +}

Hi,

This could be a wrapper over _U function of the same name, you'll need to
pack buffers as UNICODE_STRINGs, and handle returned length.

We have some tests for _U function, additional test could go there as well.

[Nikolay Sivov]

On Mon, Apr 27, 2020 at 12:13 PM Alon Barzilai <alon(a)skylinesoft.com> wrote:
> I can use the current implementation if the RtlQueryEnvironmentVariable_U.
>
> should I submit it as incremental patch or a new patch?

Sure, single patch for implementation together with tests is fine.
> Alon.
>
> On 4/27/2020 10:20 AM, Nikolay Sivov wrote:
>
> On Mon, Apr 27, 2020 at 9:55 AM Alon Barzilai <alon(a)skylinesoft.com>
> wrote:
> > +
> > +/******************************************************************
> > + *             RtlQueryEnvironmentVariable   [NTDLL.@]
> > + *
> > + */
> > +NTSTATUS WINAPI RtlQueryEnvironmentVariable(PWSTR env,
> > +                                            PWSTR name,
> > +                                            size_t name_length,
> > +                                            PWSTR value,
> > +                                            size_t value_length,
> > +                                            PSIZE_T return_length)
> > +{
> > +    FIXME("RtlQueryEnvironmentVariable not implemented\n");
> > +    return STATUS_VARIABLE_NOT_FOUND;
> > +}
>
> Hi,
>
> This could be a wrapper over _U function of the same name, you'll need to
> pack buffers as UNICODE_STRINGs, and handle returned length.
>
> We have some tests for _U function, additional test could go there as
> well.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=70649

Your paranoid android.


=== debiant (build log) ===

The task timed out

=== debiant (build log) ===

The task timed out