mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Zebediah Figura
parent
0c8991562d
commit
68f87944cf
@ -249,7 +249,6 @@ patch_enable_all ()
|
||||
enable_wine_inf_Directory_ContextMenuHandlers="$1"
|
||||
enable_wine_inf_Dummy_CA_Certificate="$1"
|
||||
enable_wine_inf_Performance="$1"
|
||||
enable_wineboot_DriveSerial="$1"
|
||||
enable_wineboot_HKEY_DYN_DATA="$1"
|
||||
enable_wineboot_ProxySettings="$1"
|
||||
enable_winecfg_Libraries="$1"
|
||||
@ -802,9 +801,6 @@ patch_enable ()
|
||||
wine.inf-Performance)
|
||||
enable_wine_inf_Performance="$2"
|
||||
;;
|
||||
wineboot-DriveSerial)
|
||||
enable_wineboot_DriveSerial="$2"
|
||||
;;
|
||||
wineboot-HKEY_DYN_DATA)
|
||||
enable_wineboot_HKEY_DYN_DATA="$2"
|
||||
;;
|
||||
@ -1301,13 +1297,6 @@ if test "$enable_wined3d_Indexed_Vertex_Blending" -eq 1; then
|
||||
enable_wined3d_SWVP_shaders=1
|
||||
fi
|
||||
|
||||
if test "$enable_wineboot_ProxySettings" -eq 1; then
|
||||
if test "$enable_wineboot_DriveSerial" -gt 1; then
|
||||
abort "Patchset wineboot-DriveSerial disabled, but wineboot-ProxySettings depends on that."
|
||||
fi
|
||||
enable_wineboot_DriveSerial=1
|
||||
fi
|
||||
|
||||
if test "$enable_user32_rawinput_mouse_experimental" -eq 1; then
|
||||
if test "$enable_user32_rawinput_mouse" -gt 1; then
|
||||
abort "Patchset user32-rawinput-mouse disabled, but user32-rawinput-mouse-experimental depends on that."
|
||||
@ -3983,18 +3972,6 @@ if test "$enable_wine_inf_Performance" -eq 1; then
|
||||
patch_apply wine.inf-Performance/0003-advapi32-tests-Add-test-for-perflib-registry-key.patch
|
||||
fi
|
||||
|
||||
# Patchset wineboot-DriveSerial
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#17823] Assign a drive serial number during prefix creation/update
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * programs/wineboot/wineboot.c
|
||||
# |
|
||||
if test "$enable_wineboot_DriveSerial" -eq 1; then
|
||||
patch_apply wineboot-DriveSerial/0001-wineboot-Assign-a-drive-serial-number-during-prefix-.patch
|
||||
fi
|
||||
|
||||
# Patchset wineboot-HKEY_DYN_DATA
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -4009,9 +3986,6 @@ fi
|
||||
|
||||
# Patchset wineboot-ProxySettings
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * wineboot-DriveSerial
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#42024] Create ProxyEnable key on wineprefix update
|
||||
# |
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
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
|
||||
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 21be0f55fb0..b67b60974b4 100644
|
||||
--- a/programs/wineboot/wineboot.c
|
||||
+++ b/programs/wineboot/wineboot.c
|
||||
@@ -76,6 +76,7 @@
|
||||
#include <shlwapi.h>
|
||||
#include <shellapi.h>
|
||||
#include <setupapi.h>
|
||||
+#include <ntsecapi.h>
|
||||
#include <newdev.h>
|
||||
#include "resource.h"
|
||||
|
||||
@@ -580,6 +581,36 @@ done:
|
||||
RegCloseKey( bios_key );
|
||||
}
|
||||
|
||||
+/* set a serial number for the disk containing windows */
|
||||
+static void create_disk_serial_number(void)
|
||||
+{
|
||||
+ static const WCHAR filename[] = {'\\','.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0};
|
||||
+ DWORD serial, written;
|
||||
+ WCHAR path[MAX_PATH];
|
||||
+ char buffer[16];
|
||||
+ HANDLE file;
|
||||
+
|
||||
+ if (GetSystemDirectoryW( path, sizeof(path)/sizeof(path[0]) ) && path[1] == ':')
|
||||
+ {
|
||||
+ path[2] = 0;
|
||||
+ 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) );
|
||||
+ file = CreateFileW( path, GENERIC_WRITE, FILE_SHARE_READ, NULL,
|
||||
+ CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL );
|
||||
+ if (file == INVALID_HANDLE_VALUE)
|
||||
+ WINE_ERR( "wine: failed to create %s.\n", wine_dbgstr_w(path) );
|
||||
+ else
|
||||
+ {
|
||||
+ sprintf( buffer, "%X\n", serial );
|
||||
+ WriteFile( file, buffer, strlen(buffer), &written, NULL );
|
||||
+ CloseHandle( file );
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
/* create the volatile hardware registry keys */
|
||||
static void create_hardware_registry_keys(void)
|
||||
{
|
||||
@@ -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.26.2
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [17823] Assign a drive serial number during prefix creation/update
|
||||
@ -1,4 +1,4 @@
|
||||
From 16060eb72cc435d6073f1e4cd6b73093b16ac972 Mon Sep 17 00:00:00 2001
|
||||
From abf369c95bc4fbaa146f2ababb41a01b03af9057 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Mon, 26 Dec 2016 16:37:40 +0100
|
||||
Subject: [PATCH] wineboot: Initialize proxy settings registry key.
|
||||
@ -22,18 +22,18 @@ index 2552f69990a..769ad7ee511 100644
|
||||
EXTRADLLFLAGS = -mno-cygwin
|
||||
|
||||
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
|
||||
index 8d2050c2f4b..c79bab3a25c 100644
|
||||
index 3dfa39ad7c0..88335a2549e 100644
|
||||
--- a/programs/wineboot/wineboot.c
|
||||
+++ b/programs/wineboot/wineboot.c
|
||||
@@ -78,6 +78,7 @@
|
||||
@@ -77,6 +77,7 @@
|
||||
#include <shlwapi.h>
|
||||
#include <shellapi.h>
|
||||
#include <setupapi.h>
|
||||
#include <ntsecapi.h>
|
||||
+#include <wininet.h>
|
||||
#include <newdev.h>
|
||||
#include "resource.h"
|
||||
|
||||
@@ -933,6 +934,13 @@ static void create_volatile_environment_registry_key(void)
|
||||
@@ -902,6 +903,13 @@ static void create_volatile_environment_registry_key(void)
|
||||
RegCloseKey( hkey );
|
||||
}
|
||||
|
||||
@ -47,7 +47,7 @@ index 8d2050c2f4b..c79bab3a25c 100644
|
||||
/* Performs the rename operations dictated in %SystemRoot%\Wininit.ini.
|
||||
* Returns FALSE if there was an error, or otherwise if all is ok.
|
||||
*/
|
||||
@@ -1742,6 +1750,7 @@ int __cdecl main( int argc, char *argv[] )
|
||||
@@ -1711,6 +1719,7 @@ int __cdecl main( int argc, char *argv[] )
|
||||
if (init || update) update_wineprefix( update );
|
||||
|
||||
create_volatile_environment_registry_key();
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: [42024] Create ProxyEnable key on wineprefix update
|
||||
Depends: wineboot-DriveSerial
|
||||
|
||||
Loading…
Reference in New Issue
Block a user