Rebase against 8c34add3bd747d8ff267974de67880b7eb50bc8d

This commit is contained in:
Alistair Leslie-Hughes
2019-07-06 12:41:27 +10:00
parent 52076762ec
commit eba1e9b28a
17 changed files with 165 additions and 168 deletions

View File

@@ -1,4 +1,4 @@
From 3a10fc7a8048fcab8e9e08b2d4fb3f7cad6ce0d0 Mon Sep 17 00:00:00 2001
From d2e7f4fe7e71d2bba84f26e8055b0e0ca8cd1005 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 32e4225..6ce8b5c 100644
index 834bf92730f..af45f7ff9a9 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -81,6 +81,7 @@
@@ -69,6 +69,7 @@
#include <shobjidl.h>
#include <shlwapi.h>
#include <shellapi.h>
@@ -20,8 +20,8 @@ index 32e4225..6ce8b5c 100644
#include "resource.h"
WINE_DEFAULT_DEBUG_CHANNEL(wineboot);
@@ -265,6 +266,36 @@ static void get_namestring( WCHAR *buf )
for (i = strlenW(buf) - 1; i >= 0 && buf[i] == ' '; i--) buf[i] = 0;
@@ -287,6 +288,36 @@ static void get_namestring( WCHAR *buf )
for (i = lstrlenW(buf) - 1; i >= 0 && buf[i] == ' '; i--) buf[i] = 0;
}
+/* set a serial number for the disk containing windows */
@@ -36,7 +36,7 @@ index 32e4225..6ce8b5c 100644
+ if (GetSystemDirectoryW( path, sizeof(path)/sizeof(path[0]) ) && path[1] == ':')
+ {
+ path[2] = 0;
+ strcatW( path, filename );
+ lstrcatW( path, filename );
+ if (!PathFileExistsW( path ) && RtlGenRandom( &serial, sizeof(serial) ))
+ {
+ WINE_TRACE( "Putting serial number of %08X into file %s\n", serial, wine_dbgstr_w(path) );
@@ -57,7 +57,7 @@ index 32e4225..6ce8b5c 100644
/* create the volatile hardware registry keys */
static void create_hardware_registry_keys(void)
{
@@ -1342,6 +1373,7 @@ int main( int argc, char *argv[] )
@@ -1360,6 +1391,7 @@ int __cdecl main( int argc, char *argv[] )
ResetEvent( event ); /* in case this is a restart */
@@ -66,5 +66,5 @@ index 32e4225..6ce8b5c 100644
create_dynamic_registry_keys();
create_environment_registry_keys();
--
1.9.1
2.20.1