Progress

momo5502 · Sep 11, 2024 · 08cc693 · 08cc693
1 parent d8cea9a
commit 08cc693
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/src/windows_emulator/main.cpp b/src/windows_emulator/main.cpp
@@ -318,7 +318,7 @@ namespace
 		context.process_params.access([&](RTL_USER_PROCESS_PARAMETERS& proc_params)
 		{
 			proc_params.Length = sizeof(proc_params);
-			proc_params.Flags = 0x6001; //| 0x80000000; // Prevent CsrClientConnectToServer
+			proc_params.Flags = 0x6001 | 0x80000000; // Prevent CsrClientConnectToServer
 
 			proc_params.ConsoleHandle = CONSOLE_HANDLE.h;
 			proc_params.StandardOutput = STDOUT_HANDLE.h;

diff --git a/src/windows_emulator/syscalls.cpp b/src/windows_emulator/syscalls.cpp
@@ -944,6 +944,44 @@ namespace
 		return STATUS_NOT_SUPPORTED;
 	}
 
+	NTSTATUS handle_NtQueryInformationThread(const syscall_context& c, const uint64_t thread_handle,
+	                                         const uint32_t info_class, const uint64_t thread_information,
+	                                         const uint32_t thread_information_length,
+	                                         const emulator_object<uint32_t> return_length)
+	{
+		if (thread_handle != ~1ULL)
+		{
+			return STATUS_NOT_SUPPORTED;
+		}
+
+		if (info_class == ThreadBasicInformation)
+		{
+			if (return_length)
+			{
+				return_length.write(sizeof(THREAD_BASIC_INFORMATION));
+			}
+
+			if (thread_information_length != sizeof(THREAD_BASIC_INFORMATION))
+			{
+				return STATUS_BUFFER_OVERFLOW;
+			}
+
+			const emulator_object<THREAD_BASIC_INFORMATION> info{c.emu, thread_information};
+			info.access([&](THREAD_BASIC_INFORMATION& i)
+			{
+				i.TebBaseAddress = c.proc.teb.ptr();
+				i.ClientId = c.proc.teb.read().ClientId;
+			});
+
+			return STATUS_SUCCESS;
+		}
+
+		printf("Unsupported thread info class: %X\n", info_class);
+		c.emu.stop();
+
+		return STATUS_NOT_SUPPORTED;
+	}
+
 	NTSTATUS handle_NtSetInformationProcess(const syscall_context& c, const uint64_t process_handle,
 	                                        const uint32_t info_class, const uint64_t /*process_information*/,
 	                                        const uint32_t /*process_information_length*/)
@@ -1239,6 +1277,12 @@ namespace
 		return STATUS_NOT_SUPPORTED;
 	}
 
+	NTSTATUS handle_NtQueryWnfStateNameInformation()
+	{
+		puts("NtQueryWnfStateNameInformation not supported");
+		return STATUS_NOT_SUPPORTED;
+	}
+
 	NTSTATUS handle_NtOpenProcessToken()
 	{
 		puts("NtOpenProcessToken not supported");
@@ -1548,6 +1592,8 @@ syscall_dispatcher::syscall_dispatcher(const exported_symbols& ntdll_exports, co
 	add_handler(NtInitializeNlsFiles);
 	add_handler(NtUnmapViewOfSection);
 	add_handler(NtDuplicateObject);
+	add_handler(NtQueryInformationThread);
+	add_handler(NtQueryWnfStateNameInformation);
 
 #undef add_handler
 }