You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against b253bd65658fe7dde8e50d7f7e6930cd215282df.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 01a8461f482a7383463e2953ec4088bc6805e817 Mon Sep 17 00:00:00 2001
|
||||
From c7d08fae58702256a3034521632553740f590750 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 75c1a6a28b..6473820592 100644
|
||||
index e1dbe6630..f8b0c4d74 100644
|
||||
--- a/programs/wineboot/wineboot.c
|
||||
+++ b/programs/wineboot/wineboot.c
|
||||
@@ -70,6 +70,7 @@
|
||||
@@ -71,6 +71,7 @@
|
||||
#include <shlwapi.h>
|
||||
#include <shellapi.h>
|
||||
#include <setupapi.h>
|
||||
@@ -20,9 +20,9 @@ index 75c1a6a28b..6473820592 100644
|
||||
#include <newdev.h>
|
||||
#include "resource.h"
|
||||
|
||||
@@ -298,6 +299,36 @@ static void get_namestring( WCHAR *buf ) { }
|
||||
|
||||
#endif /* __i386__ || __x86_64__ */
|
||||
@@ -537,6 +538,36 @@ done:
|
||||
RegCloseKey( bios_key );
|
||||
}
|
||||
|
||||
+/* set a serial number for the disk containing windows */
|
||||
+static void create_disk_serial_number(void)
|
||||
@@ -57,7 +57,7 @@ index 75c1a6a28b..6473820592 100644
|
||||
/* create the volatile hardware registry keys */
|
||||
static void create_hardware_registry_keys(void)
|
||||
{
|
||||
@@ -1425,6 +1456,7 @@ int __cdecl main( int argc, char *argv[] )
|
||||
@@ -1694,6 +1725,7 @@ int __cdecl main( int argc, char *argv[] )
|
||||
|
||||
ResetEvent( event ); /* in case this is a restart */
|
||||
|
||||
@@ -66,5 +66,5 @@ index 75c1a6a28b..6473820592 100644
|
||||
create_dynamic_registry_keys();
|
||||
create_environment_registry_keys();
|
||||
--
|
||||
2.17.1
|
||||
2.25.0
|
||||
|
||||
|
Reference in New Issue
Block a user