[PATCH] kernel32: Add stub for GetFirmwareEnvironmentVariableEx

[Myah Caron]

Signed-off-by: Myah Caron <qsniyg(a)mail.com>
---
Sorry for the resend, I forgot the [PATCH] prefix in the first email
---
 dlls/kernel32/environ.c     | 23 ++++++++++++++++++++++-
 dlls/kernel32/kernel32.spec |  2 ++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c
index 2d80600f78..93ca37fccf 100644
--- a/dlls/kernel32/environ.c
+++ b/dlls/kernel32/environ.c
@@ -67,7 +67,7 @@ void ENV_CopyStartupInformation(void)
     ANSI_STRING         ansi;

     RtlAcquirePebLock();
-
+
     rupp = NtCurrentTeb()->Peb->ProcessParameters;

     startup_infoA.cb                   = sizeof(startup_infoA);
@@ -113,3 +113,24 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b
     SetLastError(ERROR_INVALID_FUNCTION);
     return 0;
 }
+
+/***********************************************************************
+ *              GetFirmwareEnvironmentVariableExA         (KERNEL32.@)
+ */
+DWORD WINAPI GetFirmwareEnvironmentVariableExA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size, PDWORD attributes)
+{
+    FIXME("stub: %s %s %p %u %p\n", debugstr_a(name), debugstr_a(guid), buffer, size, attributes);
+    SetLastError(ERROR_INVALID_FUNCTION);
+    return 0;
+}
+
+
+/***********************************************************************
+ *              GetFirmwareEnvironmentVariableExW         (KERNEL32.@)
+ */
+DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size, PDWORD attributes)
+{
+    FIXME("stub: %s %s %p %u %p\n", debugstr_w(name), debugstr_w(guid), buffer, size, attributes);
+    SetLastError(ERROR_INVALID_FUNCTION);
+    return 0;
+}
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index c9b0c21085..b93d7a7697 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -688,6 +688,8 @@
 @ stdcall GetFinalPathNameByHandleW(long ptr long long)
 @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long)
 @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long)
+@ stdcall GetFirmwareEnvironmentVariableExA(wstr wstr ptr long ptr)
+@ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr)
 @ stdcall -import GetFullPathNameA(str long ptr ptr)
 # @ stub GetFullPathNameTransactedA
 # @ stub GetFullPathNameTransactedW
--
2.25.1

[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=67146

Your paranoid android.


=== debiant (build log) ===

error: patch failed: dlls/kernel32/environ.c:67
Task: Patch failed to apply

=== debiant (build log) ===

error: patch failed: dlls/kernel32/environ.c:67
Task: Patch failed to apply

[Vijay Kiran Kamuju]

Is the patch generated on latest wine git?
On Sun, Mar 15, 2020 at 11:46 AM Myah Caron <qsniyg(a)mail.com> wrote:
> Signed-off-by: Myah Caron <qsniyg(a)mail.com>
> ---
> Sorry for the resend, I forgot the [PATCH] prefix in the first email
> ---
>  dlls/kernel32/environ.c     | 23 ++++++++++++++++++++++-
>  dlls/kernel32/kernel32.spec |  2 ++
>  2 files changed, 24 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c
> index 2d80600f78..93ca37fccf 100644
> --- a/dlls/kernel32/environ.c
> +++ b/dlls/kernel32/environ.c
> @@ -67,7 +67,7 @@ void ENV_CopyStartupInformation(void)
>      ANSI_STRING         ansi;
>
> RtlAcquirePebLock();
> -
> +
>      rupp = NtCurrentTeb()->Peb->ProcessParameters;
>
> startup_infoA.cb                   = sizeof(startup_infoA);
> @@ -113,3 +113,24 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b
>      SetLastError(ERROR_INVALID_FUNCTION);
>      return 0;
>  }
> +
> +/***********************************************************************
> + *              GetFirmwareEnvironmentVariableExA         (KERNEL32.@)
> + */
> +DWORD WINAPI GetFirmwareEnvironmentVariableExA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size, PDWORD attributes)
> +{
> +    FIXME("stub: %s %s %p %u %p\n", debugstr_a(name), debugstr_a(guid), buffer, size, attributes);
> +    SetLastError(ERROR_INVALID_FUNCTION);
> +    return 0;
> +}
> +
> +
> +/***********************************************************************
> + *              GetFirmwareEnvironmentVariableExW         (KERNEL32.@)
> + */
> +DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size, PDWORD attributes)
> +{
> +    FIXME("stub: %s %s %p %u %p\n", debugstr_w(name), debugstr_w(guid), buffer, size, attributes);
> +    SetLastError(ERROR_INVALID_FUNCTION);
> +    return 0;
> +}
> diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
> index c9b0c21085..b93d7a7697 100644
> --- a/dlls/kernel32/kernel32.spec
> +++ b/dlls/kernel32/kernel32.spec
> @@ -688,6 +688,8 @@
>  @ stdcall GetFinalPathNameByHandleW(long ptr long long)
>  @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long)
>  @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long)
> +@ stdcall GetFirmwareEnvironmentVariableExA(wstr wstr ptr long ptr)

Please check spec file entry for GetFirmwareEnvironmentVariableExA,
ansi version does not take wstr
> +@ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr)
>  @ stdcall -import GetFullPathNameA(str long ptr ptr)
>  # @ stub GetFullPathNameTransactedA
>  # @ stub GetFullPathNameTransactedW
> --
> 2.25.1