Rebase against 7003ba44892d39ec0f409c793b97a0c5f4ae72d0

patches/wineboot-DriveSerial/0001-wineboot-Assign-a-drive-serial-number-during-prefix-.patch

@@ -1,14 +1,15 @@
-From 43f7ab85737327c3f13ace230f8eba0cf0414441 Mon Sep 17 00:00:00 2001
+From 3a10fc7a8048fcab8e9e08b2d4fb3f7cad6ce0d0 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 25 May 2015 06:07:50 +0200
-Subject: wineboot: Assign a drive serial number during prefix creation/update.
+Subject: [PATCH] wineboot: Assign a drive serial number during prefix
+ creation/update.
 
 ---
  programs/wineboot/wineboot.c | 32 ++++++++++++++++++++++++++++++++
  1 file changed, 32 insertions(+)
 
 diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
-index 4d70ea9..dbabfe4 100644
+index 32e4225..6ce8b5c 100644
 --- a/programs/wineboot/wineboot.c
 +++ b/programs/wineboot/wineboot.c
 @@ -81,6 +81,7 @@
@@ -19,8 +20,8 @@ index 4d70ea9..dbabfe4 100644
  #include "resource.h"
  
  WINE_DEFAULT_DEBUG_CHANNEL(wineboot);
-@@ -165,6 +166,36 @@ static DWORD set_reg_value( HKEY hkey, const WCHAR *name, const WCHAR *value )
-     return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, (strlenW(value) + 1) * sizeof(WCHAR) );
+@@ -265,6 +266,36 @@ static void get_namestring( WCHAR *buf )
+     for (i = strlenW(buf) - 1; i >= 0 && buf[i] == ' '; i--) buf[i] = 0;
  }
  
 +/* set a serial number for the disk containing windows */
@@ -56,7 +57,7 @@ index 4d70ea9..dbabfe4 100644
  /* create the volatile hardware registry keys */
  static void create_hardware_registry_keys(void)
  {
-@@ -1233,6 +1264,7 @@ int main( int argc, char *argv[] )
+@@ -1342,6 +1373,7 @@ int main( int argc, char *argv[] )
  
      ResetEvent( event );  /* in case this is a restart */
  
@@ -65,5 +66,5 @@ index 4d70ea9..dbabfe4 100644
      create_dynamic_registry_keys();
      create_environment_registry_keys();
 -- 
-2.4.0
+1.9.1