[PATCH 1/2] ntdll/tests: Refactor RtlSetEnvironmentVariable() tests.

Dmitry Timoshkov dmitry at baikal.ru
Wed Apr 21 14:14:17 CDT 2021


Gijs Vermeulen <gijsvrm at gmail.com> wrote:

> diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c
> index 63a9a0e463c..eed8ae38c14 100644
> --- a/dlls/ntdll/tests/env.c
> +++ b/dlls/ntdll/tests/env.c
> @@ -24,12 +24,8 @@
>  
>  static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPDWORD reslen,
>                                                     LPCSTR src, DWORD srclen );
> -static NTSTATUS (WINAPI *pRtlCreateEnvironment)(BOOLEAN, PWSTR*);
> -static NTSTATUS (WINAPI *pRtlDestroyEnvironment)(PWSTR);
>  static NTSTATUS (WINAPI *pRtlQueryEnvironmentVariable_U)(PWSTR, PUNICODE_STRING, PUNICODE_STRING);
>  static NTSTATUS (WINAPI* pRtlQueryEnvironmentVariable)(WCHAR*, WCHAR*, SIZE_T, WCHAR*, SIZE_T, SIZE_T*);
> -static void     (WINAPI *pRtlSetCurrentEnvironment)(PWSTR, PWSTR*);
> -static NTSTATUS (WINAPI *pRtlSetEnvironmentVariable)(PWSTR*, PUNICODE_STRING, PUNICODE_STRING);
>  static NTSTATUS (WINAPI *pRtlExpandEnvironmentStrings_U)(LPWSTR, PUNICODE_STRING, PUNICODE_STRING, PULONG);
>  static NTSTATUS (WINAPI *pRtlCreateProcessParameters)(RTL_USER_PROCESS_PARAMETERS**,
>                                                        const UNICODE_STRING*, const UNICODE_STRING*,

Removing dynamic loading of ntdll APIs will unnecessarily break building
the tests with older PSDK versions, in particular Windows 7/8 ones. I'm
occasionally use Windows 7 to test things, I'd appreciate if building
under that platform keeps working.

-- 
Dmitry.



More information about the wine-devel mailing list