X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=src%2Flibcaptive%2Fcm%2Frtlfunc.c;h=5b3a26f6a1c20f1aa4e0120dd3b42f264cd1d5b7;hb=a2dd38f86df22c46ae18f3ad7d9850eaacb02b92;hp=8c3a332f422ba51ee883b081408bb579a9edab8d;hpb=9358e19ef1b0017284880c131ce04b10d1edaec3;p=captive.git

diff --git a/src/libcaptive/cm/rtlfunc.c b/src/libcaptive/cm/rtlfunc.c
index 8c3a332..5b3a26f 100644
--- a/src/libcaptive/cm/rtlfunc.c
+++ b/src/libcaptive/cm/rtlfunc.c
@@ -22,6 +22,7 @@
 #include "reactos/ddk/kefuncs.h"	/* self */
 #include <glib/gmessages.h>
 #include "captive/unicode.h"
+#include "captive/macros.h"
 
 
 /**
@@ -41,16 +42,36 @@
  * Returns: %STATUS_OBJECT_NAME_NOT_FOUND or %STATUS_SUCCESS if some result returned.
  */
 NTSTATUS RtlQueryRegistryValues
-		(IN ULONG RelativeTo,IN PWSTR Path,IN PRTL_QUERY_REGISTRY_TABLE QueryTable,IN PVOID Context,IN PVOID Environment) 
+		(IN ULONG RelativeTo,IN PCWSTR Path,IN PRTL_QUERY_REGISTRY_TABLE QueryTable,IN PVOID Context,IN PVOID Environment) 
 {
 const WCHAR *Path__captive_filesystem_Parameters_ucs2=
 		captive_utf8_to_UnicodeString_alloca("\\captive\\filesystem\\Parameters")->Buffer;
 const WCHAR *QueryTable_WritingSupport_Name_ucs2=
 		captive_utf8_to_UnicodeString_alloca("WritingSupport")->Buffer;
+const WCHAR *QueryTable_CSDVersion_Name_ucs2=
+		captive_utf8_to_UnicodeString_alloca("CSDVersion")->Buffer;
+const gchar *RelativeTo_table[]={
+		"RTL_REGISTRY_ABSOLUTE",
+		"RTL_REGISTRY_SERVICES",
+		"RTL_REGISTRY_CONTROL",
+		"RTL_REGISTRY_WINDOWS_NT",
+		"RTL_REGISTRY_DEVICEMAP",
+		"RTL_REGISTRY_USER",
+		"RTL_REGISTRY_ENUM",
+		};
+UNICODE_STRING Path_UnicodeString;
 
 	g_return_val_if_fail(Path!=NULL,STATUS_INVALID_PARAMETER);
 	g_return_val_if_fail(QueryTable!=NULL,STATUS_INVALID_PARAMETER);
-	
+
+	Path_UnicodeString.Length=captive_ucs2_strlen(Path)*sizeof(*Path_UnicodeString.Buffer);
+	Path_UnicodeString.MaximumLength=Path_UnicodeString.Length+sizeof(*Path_UnicodeString.Buffer);
+	Path_UnicodeString.Buffer=(/* de-const */ PWSTR)Path;
+	g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"%s: RelativeTo=%s,Path=%s",G_STRLOC,
+			(RelativeTo>=0 && RelativeTo<G_N_ELEMENTS(RelativeTo_table)
+					? RelativeTo_table[RelativeTo] : captive_printf_alloca("%lu",(unsigned long)RelativeTo)),
+					captive_UnicodeString_to_utf8_alloca(&Path_UnicodeString));
+
 	if (RelativeTo==RTL_REGISTRY_ABSOLUTE
 			&& captive_ucs2_compare(Path,Path__captive_filesystem_Parameters_ucs2)
 			&& QueryTable[0].Name!=NULL
@@ -62,5 +83,18 @@ const WCHAR *QueryTable_WritingSupport_Name_ucs2=
 		return STATUS_SUCCESS;
 		}
 
+	if (RelativeTo==RTL_REGISTRY_WINDOWS_NT
+			&& *Path==0
+			&& QueryTable[0].Name!=NULL
+					&& captive_ucs2_compare(QueryTable[0].Name,QueryTable_CSDVersion_Name_ucs2)
+			&& QueryTable[0].Flags==RTL_QUERY_REGISTRY_DIRECT
+			&& QueryTable[0].EntryContext!=NULL
+			&& QueryTable[1].Name==NULL) {
+		RtlCopyUnicodeString(
+				(UNICODE_STRING *)QueryTable->EntryContext,	/* DestinationString */
+				captive_utf8_to_UnicodeString_alloca("Service Pack 1"));	/* SourceString */
+		return STATUS_SUCCESS;
+		}
+
 	return STATUS_OBJECT_NAME_NOT_FOUND;
 }