[PATCH v18 4/4] kernel32: Implement GetFirmwareEnvironmentVariableExA, GetFirmwareEnvironmentVariableExW, GetFirmwareEnvironmentVariableA, GetFirmwareEnvironmentVariableW.

[Grigory Vasilyev]

From: Grigory Vasilyev

---
 dlls/kernel32/kernel32.spec |  2 +
 dlls/kernel32/process.c     | 96 ++++++++++++++++++++++++++++++++++---
 2 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 7ed8048f5d0..5d3556a2078 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -695,7 +695,9 @@
 @ stdcall -import GetFileType(long)
 @ stdcall -import GetFinalPathNameByHandleA(long ptr long long)
 @ stdcall -import GetFinalPathNameByHandleW(long ptr long long)
+@ stdcall GetFirmwareEnvironmentVariableExA(str str ptr long ptr)
 @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long)
+@ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr)
 @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long)
 @ stdcall GetFirmwareType(ptr)
 @ stdcall -import GetFullPathNameA(str long ptr ptr)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 54c5e58b37d..a0e739b0660 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -718,14 +718,99 @@ WORD WINAPI GetMaximumProcessorGroupCount(void)
     return groups;
 }

+/***********************************************************************
+ *           GetFirmwareEnvironmentVariableExA     (KERNEL32.@)
+ */
+DWORD WINAPI GetFirmwareEnvironmentVariableExA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size, PDWORD attributes)
+{
+    int nsize;
+    GUID vendor = {0};
+    LPWSTR wname;
+    LPWSTR wguid;
+    UNICODE_STRING uname;
+    UNICODE_STRING uguid;
+    DWORD ret_size = size;
+
+    if(!name || !guid || !attributes)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+
+    nsize = MultiByteToWideChar(CP_ACP, 0, guid, -1, NULL, 0);
+
+    if (!(wguid = HeapAlloc(GetProcessHeap(), 0, nsize * sizeof(wguid))))
+    {
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        return 0;
+    }
+
+    MultiByteToWideChar(CP_ACP, 0, guid, -1, wguid, nsize);
+
+    RtlInitUnicodeString(&uguid, wguid);
+
+    if (!set_ntstatus(RtlGUIDFromString(&uguid, &vendor)))
+        return 0;
+
+    nsize = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0);
+
+    if (!(wname = HeapAlloc(GetProcessHeap(), 0, nsize * sizeof(wname))))
+    {
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        return 0;
+    }
+
+    MultiByteToWideChar(CP_ACP, 0, name, -1, wname, nsize);
+
+    RtlInitUnicodeString(&uname, wname);
+
+    if (!set_ntstatus(NtQuerySystemEnvironmentValueEx(&uname, &vendor, buffer,
+                                                      &ret_size, attributes)))
+        ret_size = 0;
+
+    HeapFree(GetProcessHeap(), 0, wname);
+    HeapFree(GetProcessHeap(), 0, wguid);
+
+    return ret_size;
+}
+
 /***********************************************************************
  *           GetFirmwareEnvironmentVariableA     (KERNEL32.@)
  */
 DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size)
 {
-    FIXME("stub: %s %s %p %lu\n", debugstr_a(name), debugstr_a(guid), buffer, size);
-    SetLastError(ERROR_INVALID_FUNCTION);
-    return 0;
+    DWORD attributes;
+    return GetFirmwareEnvironmentVariableExA(name, guid, buffer, size, &attributes);
+}
+
+/***********************************************************************
+ *           GetFirmwareEnvironmentVariableExW     (KERNEL32.@)
+ */
+DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size, PDWORD attributes)
+{
+    GUID vendor = {0};
+    UNICODE_STRING uname;
+    UNICODE_STRING uguid;
+    DWORD ret_size = size;
+
+    if(!name || !guid || !attributes)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+
+    RtlInitUnicodeString(&uguid, guid);
+
+    if (!set_ntstatus(RtlGUIDFromString(&uguid, &vendor)))
+        return 0;
+
+    RtlInitUnicodeString(&uname, name);
+
+    if (!set_ntstatus(NtQuerySystemEnvironmentValueEx(&uname, &vendor, buffer,
+                                                      &ret_size, attributes)))
+        return 0;
+
+    return ret_size;
 }

/***********************************************************************
@@ -733,9 +818,8 @@ DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buf
  */
 DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size)
 {
-    FIXME("stub: %s %s %p %lu\n", debugstr_w(name), debugstr_w(guid), buffer, size);
-    SetLastError(ERROR_INVALID_FUNCTION);
-    return 0;
+    DWORD attributes;
+    return GetFirmwareEnvironmentVariableExW(name, guid, buffer, size, &attributes);
 }

/***********************************************************************