Rebase against 4c6aa8b2fa1678c39aa5a89d9b26cfc4002e744e

This commit is contained in:
Alistair Leslie-Hughes
2019-08-14 08:28:13 +10:00
parent ca09e8918c
commit 35a5f7db93
13 changed files with 124 additions and 854 deletions

View File

@@ -1,4 +1,4 @@
From 58c943a9d3ffc3bd9feae35682710d408448d78a Mon Sep 17 00:00:00 2001
From 01a8461f482a7383463e2953ec4088bc6805e817 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 25 May 2015 06:07:50 +0200
Subject: [PATCH] wineboot: Assign a drive serial number during prefix
@@ -9,7 +9,7 @@ Subject: [PATCH] wineboot: Assign a drive serial number during prefix
1 file changed, 32 insertions(+)
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 5190dcc701..6e54bff187 100644
index 75c1a6a28b..6473820592 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -70,6 +70,7 @@
@@ -20,9 +20,9 @@ index 5190dcc701..6e54bff187 100644
#include <newdev.h>
#include "resource.h"
@@ -293,6 +294,36 @@ static void get_namestring( WCHAR *buf )
for (i = lstrlenW(buf) - 1; i >= 0 && buf[i] == ' '; i--) buf[i] = 0;
}
@@ -298,6 +299,36 @@ static void get_namestring( WCHAR *buf ) { }
#endif /* __i386__ || __x86_64__ */
+/* set a serial number for the disk containing windows */
+static void create_disk_serial_number(void)
@@ -57,7 +57,7 @@ index 5190dcc701..6e54bff187 100644
/* create the volatile hardware registry keys */
static void create_hardware_registry_keys(void)
{
@@ -1420,6 +1451,7 @@ int __cdecl main( int argc, char *argv[] )
@@ -1425,6 +1456,7 @@ int __cdecl main( int argc, char *argv[] )
ResetEvent( event ); /* in case this is a restart */