Rebase against bf83d755d987fec552cd1dce30638c31c49ab760.

This commit is contained in:
Zebediah Figura
2020-05-29 19:13:43 -05:00
parent 4e692b5301
commit 06877e55b1
22 changed files with 785 additions and 1065 deletions

View File

@@ -1,4 +1,4 @@
From c7d08fae58702256a3034521632553740f590750 Mon Sep 17 00:00:00 2001
From 738b377c97704144b9e750c284155d0c7ac7bd4a 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,10 +9,10 @@ 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 e1dbe6630..f8b0c4d74 100644
index 21be0f55fb0..b67b60974b4 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -71,6 +71,7 @@
@@ -76,6 +76,7 @@
#include <shlwapi.h>
#include <shellapi.h>
#include <setupapi.h>
@@ -20,7 +20,7 @@ index e1dbe6630..f8b0c4d74 100644
#include <newdev.h>
#include "resource.h"
@@ -537,6 +538,36 @@ done:
@@ -580,6 +581,36 @@ done:
RegCloseKey( bios_key );
}
@@ -57,14 +57,14 @@ index e1dbe6630..f8b0c4d74 100644
/* create the volatile hardware registry keys */
static void create_hardware_registry_keys(void)
{
@@ -1694,6 +1725,7 @@ int __cdecl main( int argc, char *argv[] )
@@ -1590,6 +1621,7 @@ int __cdecl main( int argc, char *argv[] )
ResetEvent( event ); /* in case this is a restart */
create_user_shared_data();
+ create_disk_serial_number();
create_hardware_registry_keys();
create_dynamic_registry_keys();
create_environment_registry_keys();
--
2.25.0
2.26.2