wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Minor style improvements in multiple patches.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-06-11 19:19:47 +02:00
parent 2672e6b4c5
commit 531ca00756
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/wineboot-MachineGuid/0001-wineboot-Create-MachineGuid-registry-value.patch
View File

@@ -1,12 +1,12 @@
From bfd906bdc1ca3af99ed62166a8ed2dbc4335e56d Mon Sep 17 00:00:00 2001
From 0c883377270217830a782ba89958c39b25f81da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 3 May 2015 18:47:30 +0200
Subject: wineboot: Create MachineGuid registry value.
---
programs/wineboot/Makefile.in | 2 +-
programs/wineboot/wineboot.c | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
programs/wineboot/wineboot.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in
index f6da0f9..525abde 100644
@@ -22,10 +22,10 @@ index f6da0f9..525abde 100644
C_SRCS = \
shutdown.c \
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index a20b4e1..3b6abe4 100644
index 4d70ea9..24bc872 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -354,6 +354,40 @@ static void create_environment_registry_keys( void )
@@ -361,6 +361,38 @@ static void create_environment_registry_keys( void )
RegCloseKey( env_key );
}
@@ -52,11 +52,9 @@ index a20b4e1..3b6abe4 100644
+ if (RegQueryValueExW( crypt_key, MachineGuidW, NULL, NULL, NULL, NULL ))
+ {
+ UuidCreate( &uuid );
+ wsprintfW(buffer, formatW, uuid.Data1, uuid.Data2,
+ uuid.Data3, uuid.Data4[0], uuid.Data4[1],
+ uuid.Data4[2], uuid.Data4[3], uuid.Data4[4],
+ uuid.Data4[5], uuid.Data4[6], uuid.Data4[7]);
+
+ wsprintfW( buffer, formatW, uuid.Data1, uuid.Data2, uuid.Data3,
+ uuid.Data4[0], uuid.Data4[1], uuid.Data4[2], uuid.Data4[3],
+ uuid.Data4[4], uuid.Data4[5], uuid.Data4[6], uuid.Data4[7] );
+ RegSetValueExW( crypt_key, MachineGuidW, 0, REG_SZ, (BYTE *)buffer, sizeof(buffer) );
+ }
+
@@ -66,7 +64,7 @@ index a20b4e1..3b6abe4 100644
static void create_volatile_environment_registry_key(void)
{
static const WCHAR VolatileEnvW[] = {'V','o','l','a','t','i','l','e',' ','E','n','v','i','r','o','n','m','e','n','t',0};
@@ -1229,6 +1263,7 @@ int main( int argc, char *argv[] )
@@ -1236,6 +1268,7 @@ int main( int argc, char *argv[] )
create_hardware_registry_keys();
create_dynamic_registry_keys();
create_environment_registry_keys();
@@ -75,5 +73,5 @@ index a20b4e1..3b6abe4 100644
pendingRename();
--
2.3.5
2.4.2