[PATCH v18 5/5] kernelbase: Implement RegLoadAppKey.

[Santino Mazza]

From: Santino Mazza

---
 dlls/advapi32/tests/registry.c |  6 +--
 dlls/kernelbase/registry.c     | 71 ++++++++++++++++++++++++++++------
 2 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index 55a8074f1b7..e2024ec8899 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -1652,7 +1652,7 @@ static void test_reg_load_app_key(void)
     ok(appkey != NULL, "got a null key\n");

ret = RegSetValueExA(appkey, "testkey", 0, REG_BINARY, test_data, sizeof(test_data));
-    todo_wine ok(ret == ERROR_SUCCESS, "couldn't set key value %lx\n", ret);
+    ok(ret == ERROR_SUCCESS, "couldn't set key value %lx\n", ret);
     RegCloseKey(appkey);

wait_file_available(hivefilepath);
@@ -1665,9 +1665,9 @@ static void test_reg_load_app_key(void)
     size = sizeof(test_data);
     memset(output, 0xff, sizeof(output));
     ret = RegGetValueA(appkey, NULL, "testkey", RRF_RT_REG_BINARY, NULL, output, &size);
-    todo_wine ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret);
+    ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret);
     ok(size == sizeof(test_data), "size doesn't match %ld != %ld\n", size, (DWORD)sizeof(test_data));
-    todo_wine ok(!memcmp(test_data, output, sizeof(test_data)), "output is not what expected\n");
+    ok(!memcmp(test_data, output, sizeof(test_data)), "output is not what expected\n");

RegCloseKey(appkey);

diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c
index 91462d80e06..ac4dd97776a 100644
--- a/dlls/kernelbase/registry.c
+++ b/dlls/kernelbase/registry.c
@@ -3080,35 +3080,82 @@ cleanup:
     return ret;
 }

+static void generate_string_uuid(WCHAR *out, DWORD out_size)
+{
+    UUID uuid;
+    ULONG *ptr = (ULONG*)&uuid;
+    LARGE_INTEGER ft;
+    ULONG seed;
+    int i;
+
+    NtQuerySystemTime(&ft);
+    seed = ft.LowPart;
+    for (i = 0; i < sizeof(UUID)/sizeof(ULONG); i++, ptr++)
+        *ptr = RtlUniform(&seed);
+
+    uuid.Data3 &= 0x0fff;
+    uuid.Data3 |= (4 << 12);
+    uuid.Data4[0] &= 0x3f;
+    uuid.Data4[0] |= 0x80;
+
+    swprintf(out, out_size, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", uuid.Data1,
+            uuid.Data2, uuid.Data3, uuid.Data4[0], uuid.Data4[1], uuid.Data4[2], uuid.Data4[3],
+            uuid.Data4[4], uuid.Data4[5], uuid.Data4[6], uuid.Data4[7]);
+}

/******************************************************************************
  * RegLoadAppKeyA (kernelbase.@)
  *
  */
-LSTATUS WINAPI RegLoadAppKeyA(const char *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
+LSTATUS WINAPI RegLoadAppKeyA(const char *filename, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
 {
-    FIXME("%s %p %lu %lu %lu: stub\n", wine_dbgstr_a(file), result, sam, options, reserved);
-
-    if (!file || reserved)
-        return ERROR_INVALID_PARAMETER;
+    UNICODE_STRING filenameW;
+    LSTATUS status;
+    TRACE("%s %p %lu %lu %lu\n", wine_dbgstr_a(filename), result, sam, options, reserved);

-    *result = (HKEY)0xdeadbeef;
-    return ERROR_SUCCESS;
+    RtlCreateUnicodeStringFromAsciiz(&filenameW, filename);
+    status = RegLoadAppKeyW(filenameW.Buffer, result, sam, options, reserved);
+    RtlFreeUnicodeString(&filenameW);
+    return status;
 }

/******************************************************************************
  * RegLoadAppKeyW (kernelbase.@)
  *
  */
-LSTATUS WINAPI RegLoadAppKeyW(const WCHAR *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
+LSTATUS WINAPI RegLoadAppKeyW(const WCHAR *filename, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
 {
-    FIXME("%s %p %lu %lu %lu: stub\n", wine_dbgstr_w(file), result, sam, options, reserved);
+    NTSTATUS status;
+    WCHAR application_root[13] = L"\REGISTRY\A\";
+    WCHAR rootguid_str[39];
+    WCHAR *destkey_path_tmp;
+    UNICODE_STRING destkey_path, filenameW;
+    OBJECT_ATTRIBUTES destkey, file;

-    if (!file || reserved)
+    TRACE("%s %p %lu %lu %lu\n", wine_dbgstr_w(filename), result, sam, options, reserved);
+
+    if (!filename || reserved)
         return ERROR_INVALID_PARAMETER;

-    *result = (HKEY)0xdeadbeef;
-    return ERROR_SUCCESS;
+    InitializeObjectAttributes(&destkey, &destkey_path, 0, 0, 0);
+    RtlDosPathNameToNtPathName_U(filename, &filenameW, NULL, NULL);
+    InitializeObjectAttributes(&file, &filenameW, 0, 0, 0);
+
+    generate_string_uuid(rootguid_str, sizeof(rootguid_str));
+
+    destkey_path_tmp = heap_alloc_zero(sizeof(application_root) + sizeof(rootguid_str));
+    wcscat(destkey_path_tmp, application_root);
+    wcscat(destkey_path_tmp, rootguid_str);
+
+    RtlCreateUnicodeString(&destkey_path, destkey_path_tmp);
+    heap_free(destkey_path_tmp);
+
+    status = NtLoadKeyEx(&destkey, &file, REG_APP_HIVE, 0, 0, sam, (HANDLE *)result, 0);
+
+    RtlFreeUnicodeString(&destkey_path);
+    RtlFreeUnicodeString(&filenameW);
+
+    return RtlNtStatusToDosError(status);
 }