Added patch to return a dummy BIOS name in Win32_BIOS record (fixes Wine Staging Bug #528).

This commit is contained in:
Sebastian Lackner 2015-08-27 02:01:33 +02:00
parent c2bac3f03f
commit a81dee672e
5 changed files with 73 additions and 1 deletions

View File

@ -39,9 +39,10 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features included in the next upcoming release [1]:**
**Bug fixes and features included in the next upcoming release [2]:**
* Fix access violation in MSYS2 git when cloning repository
* Return a dummy BIOS name in Win32_BIOS record
**Bug fixes and features in Wine Staging 1.7.50 [242]:**

2
debian/changelog vendored
View File

@ -3,6 +3,8 @@ wine-staging (1.7.51) UNRELEASED; urgency=low
Staging Bug #525).
* Added patch to fix access violation in MSYS2 git when when cloning
repository (fixes Wine Staging Bug #348).
* Added patch to return a dummy BIOS name in Win32_BIOS record (fixes Wine
Staging Bug #528).
* Removed patch to fix bug in wineserver debug_children inheritance (accepted
upstream).
* Removed patch to use helper function for NtWaitForMultipleObjects and

View File

@ -262,6 +262,7 @@ patch_enable_all ()
enable_version_VerQueryValue="$1"
enable_wbemdisp_ISWbemSecurity="$1"
enable_wbemdisp_Timeout="$1"
enable_wbemprox_Bios_Name="$1"
enable_wiaservc_IEnumWIA_DEV_INFO="$1"
enable_wine_inf_Performance="$1"
enable_wine_inf_ProfileList_UserSID="$1"
@ -862,6 +863,9 @@ patch_enable ()
wbemdisp-Timeout)
enable_wbemdisp_Timeout="$2"
;;
wbemprox-Bios_Name)
enable_wbemprox_Bios_Name="$2"
;;
wiaservc-IEnumWIA_DEV_INFO)
enable_wiaservc_IEnumWIA_DEV_INFO="$2"
;;
@ -5069,6 +5073,18 @@ if test "$enable_wbemdisp_Timeout" -eq 1; then
) >> "$patchlist"
fi
# Patchset wbemprox-Bios_Name
# |
# | Modified files:
# | * dlls/wbemprox/builtin.c
# |
if test "$enable_wbemprox_Bios_Name" -eq 1; then
patch_apply wbemprox-Bios_Name/0001-wbemprox-Set-bios-name-in-Win32_BIOS.patch
(
echo '+ { "Michael Müller", "wbemprox: Set bios name in Win32_BIOS.", 1 },';
) >> "$patchlist"
fi
# Patchset wiaservc-IEnumWIA_DEV_INFO
# |
# | This patchset fixes the following Wine bugs:

View File

@ -0,0 +1,52 @@
From d72d7f4a70a9715458b4cbd60c5a951e74770448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 27 Aug 2015 01:55:42 +0200
Subject: wbemprox: Set bios name in Win32_BIOS.
---
dlls/wbemprox/builtin.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 1c960eb..8f51453 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -377,7 +377,8 @@ static const struct column col_bios[] =
{ prop_releasedateW, CIM_DATETIME },
{ prop_serialnumberW, CIM_STRING },
{ prop_smbiosbiosversionW, CIM_STRING },
- { prop_versionW, CIM_STRING|COL_FLAG_KEY }
+ { prop_versionW, CIM_STRING|COL_FLAG_KEY },
+ { prop_nameW, CIM_STRING }
};
static const struct column col_cdromdrive[] =
{
@@ -666,6 +667,8 @@ static const WCHAR bios_smbiosbiosversionW[] =
{'W','i','n','e',0};
static const WCHAR bios_versionW[] =
{'W','I','N','E',' ',' ',' ','-',' ','1',0};
+static const WCHAR bios_nameW[] =
+ {'W','I','N','E',' ','B','I','O','S',0};
static const WCHAR cdromdrive_mediatypeW[] =
{'C','D','-','R','O','M',0};
static const WCHAR cdromdrive_nameW[] =
@@ -765,6 +768,7 @@ struct record_bios
const WCHAR *serialnumber;
const WCHAR *smbiosbiosversion;
const WCHAR *version;
+ const WCHAR *name;
};
struct record_cdromdrive
{
@@ -1041,7 +1045,7 @@ static const struct record_baseboard data_baseboard[] =
static const struct record_bios data_bios[] =
{
{ bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW,
- bios_smbiosbiosversionW, bios_versionW }
+ bios_smbiosbiosversionW, bios_versionW, bios_nameW }
};
static const struct record_computersystemproduct data_compsysproduct[] =
{
--
2.5.0

View File

@ -0,0 +1 @@
Fixes: Return a dummy BIOS name in Win32_BIOS record